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/04/01 23:57:49 UTC
[01/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Repository: incubator-juneau-website
Updated Branches:
refs/heads/asf-site 8911fe650 -> 5aed2f482
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCall.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCall.html b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCall.html
index d2c5027..56bbe90 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCall.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCall.html
@@ -31,1343 +31,1456 @@
<span class="sourceLineNo">023</span>import org.apache.http.client.*;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import org.apache.http.client.config.*;<a name="line.24"></a>
<span class="sourceLineNo">025</span>import org.apache.http.client.methods.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.http.impl.client.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.http.util.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.*;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.juneau.encoders.*;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.juneau.internal.*;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.juneau.parser.*;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.juneau.parser.ParseException;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.juneau.serializer.*;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.juneau.utils.*;<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> * Represents a connection to a remote REST resource.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <p><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * Instances of this class are created by the various {@code doX()} methods on the {@link RestClient} class.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <p><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * This class uses only Java standard APIs. Requests can be built up using a fluent interface with method chaining, like so...<a name="line.41"></a>
-<span class="sourceLineNo">042</span> *<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <p class='bcode'><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * RestClient client = <jk>new</jk> RestClient();<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * RestCall c = client.doPost(<jsf>URL</jsf>).setInput(o).setHeader(x,y);<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * MyBean b = c.getResponse(MyBean.<jk>class</jk>);<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * </p><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * <p><a name="line.48"></a>
-<span class="sourceLineNo">049</span> * The actual connection and request/response transaction occurs when calling one of the <code>getResponseXXX()</code> methods.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> *<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <h5 class='section'>Additional information:</h5><a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <ul><a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <li><a class="doclink" href="package-summary.html#RestClient">org.apache.juneau.rest.client &gt; REST client API</a> for more information and code examples.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * </ul><a name="line.54"></a>
-<span class="sourceLineNo">055</span> */<a name="line.55"></a>
-<span class="sourceLineNo">056</span>@SuppressWarnings("hiding")<a name="line.56"></a>
-<span class="sourceLineNo">057</span>public final class RestCall {<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> private final RestClient client; // The client that created this call.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> private final HttpRequestBase request; // The request.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> private HttpResponse response; // The response.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> private List<RestCallInterceptor> interceptors = new ArrayList<RestCallInterceptor>(); // Used for intercepting and altering requests.<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> private boolean isConnected = false; // connect() has been called.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> private boolean allowRedirectsOnPosts;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> private int retries = 1;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> private int redirectOnPostsTries = 5;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> private long retryInterval = -1;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> private RetryOn retryOn;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> private boolean ignoreErrors;<a name="line.70"></a>
-<span class="sourceLineNo">071</span> private boolean byLines = false;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> private TeeWriter writers = new TeeWriter();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> private StringWriter capturedResponseWriter;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> private String capturedResponse;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> private TeeOutputStream outputStreams = new TeeOutputStream();<a name="line.75"></a>
-<span class="sourceLineNo">076</span> private boolean isClosed = false;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> private boolean isFailed = false;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> private Object input;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> private Serializer serializer;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private Parser parser;<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> /**<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * Constructs a REST call with the specified method name.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> *<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * @param client The client that created this request.<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * @param request The wrapped Apache HTTP client request object.<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * @throws RestCallException If an exception or non-200 response code occurred during the connection attempt.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> */<a name="line.88"></a>
-<span class="sourceLineNo">089</span> protected RestCall(RestClient client, HttpRequestBase request) throws RestCallException {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> this.client = client;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> this.request = request;<a name="line.91"></a>
-<span class="sourceLineNo">092</span> for (RestCallInterceptor i : this.client.interceptors)<a name="line.92"></a>
-<span class="sourceLineNo">093</span> interceptor(i);<a name="line.93"></a>
-<span class="sourceLineNo">094</span> this.retryOn = client.retryOn;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> this.retries = client.retries;<a name="line.95"></a>
-<span class="sourceLineNo">096</span> this.retryInterval = client.retryInterval;<a name="line.96"></a>
-<span class="sourceLineNo">097</span> this.serializer = client.serializer;<a name="line.97"></a>
-<span class="sourceLineNo">098</span> this.parser = client.parser;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> /**<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * Sets the input for this REST call.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> *<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * @param input The input to be sent to the REST resource (only valid for PUT and POST) requests. <br><a name="line.104"></a>
-<span class="sourceLineNo">105</span> * Can be of the following types:<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * <ul class='spaced-list'><a name="line.106"></a>
-<span class="sourceLineNo">107</span> * <li>{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * <li>{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * <li>{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * <li>{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * </ul><a name="line.111"></a>
-<span class="sourceLineNo">112</span> * @return This object (for method chaining).<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * @throws RestCallException If a retry was attempted, but the entity was not repeatable.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> */<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public RestCall input(final Object input) throws RestCallException {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> this.input = input;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> return this;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * Specifies the serializer to use on this call.<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * <p><a name="line.122"></a>
-<span class="sourceLineNo">123</span> * Overrides the serializer specified on the {@link RestClient}.<a name="line.123"></a>
-<span class="sourceLineNo">124</span> *<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * @param serializer The serializer used to serialize POJOs to the body of the HTTP request.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * @return This object (for method chaining).<a name="line.126"></a>
-<span class="sourceLineNo">127</span> */<a name="line.127"></a>
-<span class="sourceLineNo">128</span> public RestCall serializer(Serializer serializer) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> this.serializer = serializer;<a name="line.129"></a>
-<span class="sourceLineNo">130</span> return this;<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> /**<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * Specifies the parser to use on this call.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * <p><a name="line.135"></a>
-<span class="sourceLineNo">136</span> * Overrides the parser specified on the {@link RestClient}.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> *<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * @param parser The parser used to parse POJOs from the body of the HTTP response.<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * @return This object (for method chaining).<a name="line.139"></a>
-<span class="sourceLineNo">140</span> */<a name="line.140"></a>
-<span class="sourceLineNo">141</span> public RestCall parser(Parser parser) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> this.parser = parser;<a name="line.142"></a>
-<span class="sourceLineNo">143</span> return this;<a name="line.143"></a>
-<span class="sourceLineNo">144</span> }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> //--------------------------------------------------------------------------------<a name="line.147"></a>
-<span class="sourceLineNo">148</span> // HTTP headers<a name="line.148"></a>
-<span class="sourceLineNo">149</span> //--------------------------------------------------------------------------------<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> /**<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * Convenience method for setting a header value on the request.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * <p><a name="line.153"></a>
-<span class="sourceLineNo">154</span> * Equivalent to calling <code>restCall.getRequest().setHeader(name, value.toString())</code>.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> *<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * @param name The header name.<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * @param value The header value.<a name="line.157"></a>
+<span class="sourceLineNo">026</span>import org.apache.http.client.utils.*;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.http.impl.client.*;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.http.util.*;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.juneau.*;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.juneau.encoders.*;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.juneau.internal.*;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.juneau.parser.*;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.juneau.parser.ParseException;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.juneau.serializer.*;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.juneau.utils.*;<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> * Represents a connection to a remote REST resource.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * <p><a name="line.39"></a>
+<span class="sourceLineNo">040</span> * Instances of this class are created by the various {@code doX()} methods on the {@link RestClient} class.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <p><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * This class uses only Java standard APIs. Requests can be built up using a fluent interface with method chaining, like so...<a name="line.42"></a>
+<span class="sourceLineNo">043</span> *<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <p class='bcode'><a name="line.44"></a>
+<span class="sourceLineNo">045</span> * RestClient client = <jk>new</jk> RestClient();<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * RestCall c = client.doPost(<jsf>URL</jsf>).setInput(o).setHeader(x,y);<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * MyBean b = c.getResponse(MyBean.<jk>class</jk>);<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * </p><a name="line.48"></a>
+<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
+<span class="sourceLineNo">050</span> * The actual connection and request/response transaction occurs when calling one of the <code>getResponseXXX()</code> methods.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> *<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * <h5 class='section'>Additional information:</h5><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * <ul><a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <li><a class="doclink" href="package-summary.html#RestClient">org.apache.juneau.rest.client &gt; REST client API</a> for more information and code examples.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * </ul><a name="line.55"></a>
+<span class="sourceLineNo">056</span> */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>@SuppressWarnings("hiding")<a name="line.57"></a>
+<span class="sourceLineNo">058</span>public final class RestCall {<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span> private final RestClient client; // The client that created this call.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> private final HttpRequestBase request; // The request.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> private HttpResponse response; // The response.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> private List<RestCallInterceptor> interceptors = new ArrayList<RestCallInterceptor>(); // Used for intercepting and altering requests.<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> private boolean isConnected = false; // connect() has been called.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> private boolean allowRedirectsOnPosts;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private int retries = 1;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> private int redirectOnPostsTries = 5;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> private long retryInterval = -1;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> private RetryOn retryOn;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private boolean ignoreErrors;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> private boolean byLines = false;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> private TeeWriter writers = new TeeWriter();<a name="line.73"></a>
+<span class="sourceLineNo">074</span> private StringWriter capturedResponseWriter;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> private String capturedResponse;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> private TeeOutputStream outputStreams = new TeeOutputStream();<a name="line.76"></a>
+<span class="sourceLineNo">077</span> private boolean isClosed = false;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> private boolean isFailed = false;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> private Object input;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> private Serializer serializer;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private Parser parser;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> private URIBuilder uriBuilder;<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span> /**<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * Constructs a REST call with the specified method name.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> *<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * @param client The client that created this request.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * @param request The wrapped Apache HTTP client request object.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * @param uri The URI for this call.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * @throws RestCallException If an exception or non-200 response code occurred during the connection attempt.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> */<a name="line.91"></a>
+<span class="sourceLineNo">092</span> protected RestCall(RestClient client, HttpRequestBase request, URI uri) throws RestCallException {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> this.client = client;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> this.request = request;<a name="line.94"></a>
+<span class="sourceLineNo">095</span> for (RestCallInterceptor i : this.client.interceptors)<a name="line.95"></a>
+<span class="sourceLineNo">096</span> interceptor(i);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> this.retryOn = client.retryOn;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> this.retries = client.retries;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> this.retryInterval = client.retryInterval;<a name="line.99"></a>
+<span class="sourceLineNo">100</span> this.serializer = client.serializer;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> this.parser = client.parser;<a name="line.101"></a>
+<span class="sourceLineNo">102</span> uriBuilder = new URIBuilder(uri);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> /**<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * Sets the URI for this call.<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * <p><a name="line.107"></a>
+<span class="sourceLineNo">108</span> * Can be any of the following types:<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <ul><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * <li>{@link URI}<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * <li>{@link URL}<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * <li>{@link URIBuilder}<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * <li>Anything else converted to a string using {@link Object#toString()}.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * </ul><a name="line.114"></a>
+<span class="sourceLineNo">115</span> * Relative URL strings will be interpreted as relative to the root URL defined on the client.<a name="line.115"></a>
+<span class="sourceLineNo">116</span> *<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * @param uri The URI to use for this call.<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * This overrides the URI passed in from the client.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * @return This object (for method chaining).<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * @throws RestCallException<a name="line.120"></a>
+<span class="sourceLineNo">121</span> */<a name="line.121"></a>
+<span class="sourceLineNo">122</span> public RestCall uri(Object uri) throws RestCallException {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> try {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> if (uri != null)<a name="line.124"></a>
+<span class="sourceLineNo">125</span> uriBuilder = new URIBuilder(client.toURI(uri));<a name="line.125"></a>
+<span class="sourceLineNo">126</span> return this;<a name="line.126"></a>
+<span class="sourceLineNo">127</span> } catch (URISyntaxException e) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> throw new RestCallException(e);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * Sets the URI scheme.<a name="line.133"></a>
+<span class="sourceLineNo">134</span> *<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * @param scheme The new URI host.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * @return This object (for method chaining).<a name="line.136"></a>
+<span class="sourceLineNo">137</span> */<a name="line.137"></a>
+<span class="sourceLineNo">138</span> public RestCall scheme(String scheme) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> uriBuilder.setScheme(scheme);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> return this;<a name="line.140"></a>
+<span class="sourceLineNo">141</span> }<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> * Sets the URI host.<a name="line.144"></a>
+<span class="sourceLineNo">145</span> *<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * @param host The new URI host.<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * @return This object (for method chaining).<a name="line.147"></a>
+<span class="sourceLineNo">148</span> */<a name="line.148"></a>
+<span class="sourceLineNo">149</span> public RestCall host(String host) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> uriBuilder.setHost(host);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> return this;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span> /**<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * Sets the URI port.<a name="line.155"></a>
+<span class="sourceLineNo">156</span> *<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * @param port The new URI port.<a name="line.157"></a>
<span class="sourceLineNo">158</span> * @return This object (for method chaining).<a name="line.158"></a>
<span class="sourceLineNo">159</span> */<a name="line.159"></a>
-<span class="sourceLineNo">160</span> public RestCall header(String name, Object value) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> request.setHeader(name, value.toString());<a name="line.161"></a>
+<span class="sourceLineNo">160</span> public RestCall port(int port) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> uriBuilder.setPort(port);<a name="line.161"></a>
<span class="sourceLineNo">162</span> return this;<a name="line.162"></a>
<span class="sourceLineNo">163</span> }<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">166</span> * Sets the value for the <code>Accept</code> request header.<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * <p><a name="line.167"></a>
-<span class="sourceLineNo">168</span> * This overrides the media type specified on the parser, but is overridden by calling <code>header(<js>"Accept"</js>, value);</code><a name="line.168"></a>
-<span class="sourceLineNo">169</span> *<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * @param value The new header value.<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * @return This object (for method chaining).<a name="line.171"></a>
+<span class="sourceLineNo">166</span> * Adds a parameter to the URI query.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> *<a name="line.167"></a>
+<span class="sourceLineNo">168</span> * @param name The parameter name.<a name="line.168"></a>
+<span class="sourceLineNo">169</span> * @param value The parameter value converted to a string using UON notation.<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * @return This object (for method chaining).<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * @throws RestCallException<a name="line.171"></a>
<span class="sourceLineNo">172</span> */<a name="line.172"></a>
-<span class="sourceLineNo">173</span> public RestCall accept(Object value) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return header("Accept", value);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> /**<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * Sets the value for the <code>Accept-Charset</code> request header.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * <p><a name="line.179"></a>
-<span class="sourceLineNo">180</span> * This is a shortcut for calling <code>header(<js>"Accept-Charset"</js>, value);</code><a name="line.180"></a>
-<span class="sourceLineNo">181</span> *<a name="line.181"></a>
-<span class="sourceLineNo">182</span> * @param value The new header value.<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * @return This object (for method chaining).<a name="line.183"></a>
-<span class="sourceLineNo">184</span> */<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public RestCall acceptCharset(Object value) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> return header("Accept-Charset", value);<a name="line.186"></a>
+<span class="sourceLineNo">173</span> public RestCall param(String name, Object value) throws RestCallException {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> uriBuilder.addParameter(name, client.getUrlEncodingSerializer().serializeUrlPart(value));<a name="line.174"></a>
+<span class="sourceLineNo">175</span> return this;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * Sets a custom URI query.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> *<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * @param query The new URI query string.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * @return This object (for method chaining).<a name="line.182"></a>
+<span class="sourceLineNo">183</span> */<a name="line.183"></a>
+<span class="sourceLineNo">184</span> public RestCall query(String query) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> uriBuilder.setCustomQuery(query);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> return this;<a name="line.186"></a>
<span class="sourceLineNo">187</span> }<a name="line.187"></a>
<span class="sourceLineNo">188</span><a name="line.188"></a>
<span class="sourceLineNo">189</span> /**<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * Sets the value for the <code>Accept-Encoding</code> request header.<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * <p><a name="line.191"></a>
-<span class="sourceLineNo">192</span> * This is a shortcut for calling <code>header(<js>"Accept-Encoding"</js>, value);</code><a name="line.192"></a>
-<span class="sourceLineNo">193</span> *<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * @param value The new header value.<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * @return This object (for method chaining).<a name="line.195"></a>
-<span class="sourceLineNo">196</span> */<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public RestCall acceptEncoding(Object value) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> return header("Accept-Encoding", value);<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> /**<a name="line.201"></a>
-<span class="sourceLineNo">202</span> * Sets the value for the <code>Accept-Language</code> request header.<a name="line.202"></a>
-<span class="sourceLineNo">203</span> * <p><a name="line.203"></a>
-<span class="sourceLineNo">204</span> * This is a shortcut for calling <code>header(<js>"Accept-Language"</js>, value);</code><a name="line.204"></a>
-<span class="sourceLineNo">205</span> *<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * @param value The new header value.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * @return This object (for method chaining).<a name="line.207"></a>
-<span class="sourceLineNo">208</span> */<a name="line.208"></a>
-<span class="sourceLineNo">209</span> public RestCall acceptLanguage(Object value) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return header("Accept-Language", value);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> /**<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * Sets the value for the <code>Authorization</code> request header.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * <p><a name="line.215"></a>
-<span class="sourceLineNo">216</span> * This is a shortcut for calling <code>header(<js>"Authorization"</js>, value);</code><a name="line.216"></a>
-<span class="sourceLineNo">217</span> *<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * @param value The new header value.<a name="line.218"></a>
-<span class="sourceLineNo">219</span> * @return This object (for method chaining).<a name="line.219"></a>
-<span class="sourceLineNo">220</span> */<a name="line.220"></a>
-<span class="sourceLineNo">221</span> public RestCall authorization(Object value) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return header("Authorization", value);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> /**<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * Sets the value for the <code>Cache-Control</code> request header.<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * <p><a name="line.227"></a>
-<span class="sourceLineNo">228</span> * This is a shortcut for calling <code>header(<js>"Cache-Control"</js>, value);</code><a name="line.228"></a>
-<span class="sourceLineNo">229</span> *<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * @param value The new header value.<a name="line.230"></a>
-<span class="sourceLineNo">231</span> * @return This object (for method chaining).<a name="line.231"></a>
-<span class="sourceLineNo">232</span> */<a name="line.232"></a>
-<span class="sourceLineNo">233</span> public RestCall cacheControl(Object value) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> return header("Cache-Control", value);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> /**<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * Sets the value for the <code>Connection</code> request header.<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * <p><a name="line.239"></a>
-<span class="sourceLineNo">240</span> * This is a shortcut for calling <code>header(<js>"Connection"</js>, value);</code><a name="line.240"></a>
-<span class="sourceLineNo">241</span> *<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * @param value The new header value.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * @return This object (for method chaining).<a name="line.243"></a>
-<span class="sourceLineNo">244</span> */<a name="line.244"></a>
-<span class="sourceLineNo">245</span> public RestCall connection(Object value) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> return header("Connection", value);<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> /**<a name="line.249"></a>
-<span class="sourceLineNo">250</span> * Sets the value for the <code>Content-Length</code> request header.<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * <p><a name="line.251"></a>
-<span class="sourceLineNo">252</span> * This is a shortcut for calling <code>header(<js>"Content-Length"</js>, value);</code><a name="line.252"></a>
-<span class="sourceLineNo">253</span> *<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * @param value The new header value.<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * @return This object (for method chaining).<a name="line.255"></a>
-<span class="sourceLineNo">256</span> */<a name="line.256"></a>
-<span class="sourceLineNo">257</span> public RestCall contentLength(Object value) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> return header("Content-Length", value);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> /**<a name="line.261"></a>
-<span class="sourceLineNo">262</span> * Sets the value for the <code>Content-Type</code> request header.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> * <p><a name="line.263"></a>
-<span class="sourceLineNo">264</span> * This overrides the media type specified on the serializer, but is overridden by calling <code>header(<js>"Content-Type"</js>, value);</code><a name="line.264"></a>
-<span class="sourceLineNo">265</span> *<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * @param value The new header value.<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * @return This object (for method chaining).<a name="line.267"></a>
-<span class="sourceLineNo">268</span> */<a name="line.268"></a>
-<span class="sourceLineNo">269</span> public RestCall contentType(Object value) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> return header("Content-Type", value);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> /**<a name="line.273"></a>
-<span class="sourceLineNo">274</span> * Sets the value for the <code>Date</code> request header.<a name="line.274"></a>
-<span class="sourceLineNo">275</span> * <p><a name="line.275"></a>
-<span class="sourceLineNo">276</span> * This is a shortcut for calling <code>header(<js>"Date"</js>, value);</code><a name="line.276"></a>
-<span class="sourceLineNo">277</span> *<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * @param value The new header value.<a name="line.278"></a>
-<span class="sourceLineNo">279</span> * @return This object (for method chaining).<a name="line.279"></a>
-<span class="sourceLineNo">280</span> */<a name="line.280"></a>
-<span class="sourceLineNo">281</span> public RestCall date(Object value) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> return header("Date", value);<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> /**<a name="line.285"></a>
-<span class="sourceLineNo">286</span> * Sets the value for the <code>Expect</code> request header.<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * <p><a name="line.287"></a>
-<span class="sourceLineNo">288</span> * This is a shortcut for calling <code>header(<js>"Expect"</js>, value);</code><a name="line.288"></a>
-<span class="sourceLineNo">289</span> *<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * @param value The new header value.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * @return This object (for method chaining).<a name="line.291"></a>
-<span class="sourceLineNo">292</span> */<a name="line.292"></a>
-<span class="sourceLineNo">293</span> public RestCall expect(Object value) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> return header("Expect", value);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span> /**<a name="line.297"></a>
-<span class="sourceLineNo">298</span> * Sets the value for the <code>Forwarded</code> request header.<a name="line.298"></a>
-<span class="sourceLineNo">299</span> * <p><a name="line.299"></a>
-<span class="sourceLineNo">300</span> * This is a shortcut for calling <code>header(<js>"Forwarded"</js>, value);</code><a name="line.300"></a>
-<span class="sourceLineNo">301</span> *<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * @param value The new header value.<a name="line.302"></a>
-<span class="sourceLineNo">303</span> * @return This object (for method chaining).<a name="line.303"></a>
-<span class="sourceLineNo">304</span> */<a name="line.304"></a>
-<span class="sourceLineNo">305</span> public RestCall forwarded(Object value) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return header("Forwarded", value);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> }<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span> /**<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * Sets the value for the <code>From</code> request header.<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * <p><a name="line.311"></a>
-<span class="sourceLineNo">312</span> * This is a shortcut for calling <code>header(<js>"From"</js>, value);</code><a name="line.312"></a>
-<span class="sourceLineNo">313</span> *<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * @param value The new header value.<a name="line.314"></a>
-<span class="sourceLineNo">315</span> * @return This object (for method chaining).<a name="line.315"></a>
-<span class="sourceLineNo">316</span> */<a name="line.316"></a>
-<span class="sourceLineNo">317</span> public RestCall from(Object value) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> return header("From", value);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span> /**<a name="line.321"></a>
-<span class="sourceLineNo">322</span> * Sets the value for the <code>Host</code> request header.<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * <p><a name="line.323"></a>
-<span class="sourceLineNo">324</span> * This is a shortcut for calling <code>header(<js>"Host"</js>, value);</code><a name="line.324"></a>
-<span class="sourceLineNo">325</span> *<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * @param value The new header value.<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * @return This object (for method chaining).<a name="line.327"></a>
-<span class="sourceLineNo">328</span> */<a name="line.328"></a>
-<span class="sourceLineNo">329</span> public RestCall host(Object value) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> return header("Host", value);<a name="line.330"></a>
-<span class="sourceLineNo">331</span> }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span> /**<a name="line.333"></a>
-<span class="sourceLineNo">334</span> * Sets the value for the <code>If-Match</code> request header.<a name="line.334"></a>
-<span class="sourceLineNo">335</span> * <p><a name="line.335"></a>
-<span class="sourceLineNo">336</span> * This is a shortcut for calling <code>header(<js>"If-Match"</js>, value);</code><a name="line.336"></a>
-<span class="sourceLineNo">337</span> *<a name="line.337"></a>
-<span class="sourceLineNo">338</span> * @param value The new header value.<a name="line.338"></a>
-<span class="sourceLineNo">339</span> * @return This object (for method chaining).<a name="line.339"></a>
-<span class="sourceLineNo">340</span> */<a name="line.340"></a>
-<span class="sourceLineNo">341</span> public RestCall ifMatch(Object value) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> return header("If-Match", value);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span> /**<a name="line.345"></a>
-<span class="sourceLineNo">346</span> * Sets the value for the <code>If-Modified-Since</code> request header.<a name="line.346"></a>
-<span class="sourceLineNo">347</span> * <p><a name="line.347"></a>
-<span class="sourceLineNo">348</span> * This is a shortcut for calling <code>header(<js>"If-Modified-Since"</js>, value);</code><a name="line.348"></a>
-<span class="sourceLineNo">349</span> *<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * @param value The new header value.<a name="line.350"></a>
-<span class="sourceLineNo">351</span> * @return This object (for method chaining).<a name="line.351"></a>
-<span class="sourceLineNo">352</span> */<a name="line.352"></a>
-<span class="sourceLineNo">353</span> public RestCall ifModifiedSince(Object value) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> return header("If-Modified-Since", value);<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> /**<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * Sets the value for the <code>If-None-Match</code> request header.<a name="line.358"></a>
-<span class="sourceLineNo">359</span> * <p><a name="line.359"></a>
-<span class="sourceLineNo">360</span> * This is a shortcut for calling <code>header(<js>"If-None-Match"</js>, value);</code><a name="line.360"></a>
-<span class="sourceLineNo">361</span> *<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * @param value The new header value.<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * @return This object (for method chaining).<a name="line.363"></a>
-<span class="sourceLineNo">364</span> */<a name="line.364"></a>
-<span class="sourceLineNo">365</span> public RestCall ifNoneMatch(Object value) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> return header("If-None-Match", value);<a name="line.366"></a>
-<span class="sourceLineNo">367</span> }<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span> /**<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * Sets the value for the <code>If-Range</code> request header.<a name="line.370"></a>
-<span class="sourceLineNo">371</span> * <p><a name="line.371"></a>
-<span class="sourceLineNo">372</span> * This is a shortcut for calling <code>header(<js>"If-Range"</js>, value);</code><a name="line.372"></a>
-<span class="sourceLineNo">373</span> *<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * @param value The new header value.<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * @return This object (for method chaining).<a name="line.375"></a>
-<span class="sourceLineNo">376</span> */<a name="line.376"></a>
-<span class="sourceLineNo">377</span> public RestCall ifRange(Object value) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> return header("If-Range", value);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span> /**<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * Sets the value for the <code>If-Unmodified-Since</code> request header.<a name="line.382"></a>
-<span class="sourceLineNo">383</span> * <p><a name="line.383"></a>
-<span class="sourceLineNo">384</span> * This is a shortcut for calling <code>header(<js>"If-Unmodified-Since"</js>, value);</code><a name="line.384"></a>
-<span class="sourceLineNo">385</span> *<a name="line.385"></a>
-<span class="sourceLineNo">386</span> * @param value The new header value.<a name="line.386"></a>
-<span class="sourceLineNo">387</span> * @return This object (for method chaining).<a name="line.387"></a>
-<span class="sourceLineNo">388</span> */<a name="line.388"></a>
-<span class="sourceLineNo">389</span> public RestCall ifUnmodifiedSince(Object value) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> return header("If-Unmodified-Since", value);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span> /**<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * Sets the value for the <code>Max-Forwards</code> request header.<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * <p><a name="line.395"></a>
-<span class="sourceLineNo">396</span> * This is a shortcut for calling <code>header(<js>"Max-Forwards"</js>, value);</code><a name="line.396"></a>
-<span class="sourceLineNo">397</span> *<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * @param value The new header value.<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * @return This object (for method chaining).<a name="line.399"></a>
-<span class="sourceLineNo">400</span> */<a name="line.400"></a>
-<span class="sourceLineNo">401</span> public RestCall maxForwards(Object value) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> return header("If-Unmodified-Since", value);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> }<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span> /**<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * Sets the value for the <code>Origin</code> request header.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> * <p><a name="line.407"></a>
-<span class="sourceLineNo">408</span> * This is a shortcut for calling <code>header(<js>"Origin"</js>, value);</code><a name="line.408"></a>
-<span class="sourceLineNo">409</span> *<a name="line.409"></a>
-<span class="sourceLineNo">410</span> * @param value The new header value.<a name="line.410"></a>
-<span class="sourceLineNo">411</span> * @return This object (for method chaining).<a name="line.411"></a>
-<span class="sourceLineNo">412</span> */<a name="line.412"></a>
-<span class="sourceLineNo">413</span> public RestCall origin(Object value) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> return header("If-Unmodified-Since", value);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span> /**<a name="line.417"></a>
-<span class="sourceLineNo">418</span> * Sets the value for the <code>Pragma</code> request header.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * <p><a name="line.419"></a>
-<span class="sourceLineNo">420</span> * This is a shortcut for calling <code>header(<js>"Pragma"</js>, value);</code><a name="line.420"></a>
-<span class="sourceLineNo">421</span> *<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * @param value The new header value.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * @return This object (for method chaining).<a name="line.423"></a>
-<span class="sourceLineNo">424</span> */<a name="line.424"></a>
-<span class="sourceLineNo">425</span> public RestCall pragma(Object value) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> return header("Pragma", value);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span> /**<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * Sets the value for the <code>Proxy-Authorization</code> request header.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * <p><a name="line.431"></a>
-<span class="sourceLineNo">432</span> * This is a shortcut for calling <code>header(<js>"Proxy-Authorization"</js>, value);</code><a name="line.432"></a>
-<span class="sourceLineNo">433</span> *<a name="line.433"></a>
-<span class="sourceLineNo">434</span> * @param value The new header value.<a name="line.434"></a>
-<span class="sourceLineNo">435</span> * @return This object (for method chaining).<a name="line.435"></a>
-<span class="sourceLineNo">436</span> */<a name="line.436"></a>
-<span class="sourceLineNo">437</span> public RestCall proxyAuthorization(Object value) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> return header("Proxy-Authorization", value);<a name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span> /**<a name="line.441"></a>
-<span class="sourceLineNo">442</span> * Sets the value for the <code>Range</code> request header.<a name="line.442"></a>
-<span class="sourceLineNo">443</span> * <p><a name="line.443"></a>
-<span class="sourceLineNo">444</span> * This is a shortcut for calling <code>header(<js>"Range"</js>, value);</code><a name="line.444"></a>
-<span class="sourceLineNo">445</span> *<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * @param value The new header value.<a name="line.446"></a>
-<span class="sourceLineNo">447</span> * @return This object (for method chaining).<a name="line.447"></a>
-<span class="sourceLineNo">448</span> */<a name="line.448"></a>
-<span class="sourceLineNo">449</span> public RestCall range(Object value) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> return header("Range", value);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span> /**<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * Sets the value for the <code>Referer</code> request header.<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * <p><a name="line.455"></a>
-<span class="sourceLineNo">456</span> * This is a shortcut for calling <code>header(<js>"Referer"</js>, value);</code><a name="line.456"></a>
-<span class="sourceLineNo">457</span> *<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @param value The new header value.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * @return This object (for method chaining).<a name="line.459"></a>
-<span class="sourceLineNo">460</span> */<a name="line.460"></a>
-<span class="sourceLineNo">461</span> public RestCall referer(Object value) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> return header("Referer", value);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> /**<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * Sets the value for the <code>TE</code> request header.<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * <p><a name="line.467"></a>
-<span class="sourceLineNo">468</span> * This is a shortcut for calling <code>header(<js>"TE"</js>, value);</code><a name="line.468"></a>
-<span class="sourceLineNo">469</span> *<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * @param value The new header value.<a name="line.470"></a>
-<span class="sourceLineNo">471</span> * @return This object (for method chaining).<a name="line.471"></a>
-<span class="sourceLineNo">472</span> */<a name="line.472"></a>
-<span class="sourceLineNo">473</span> public RestCall te(Object value) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span> return header("TE", value);<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span><a name="line.476"></a>
-<span class="sourceLineNo">477</span> /**<a name="line.477"></a>
-<span class="sourceLineNo">478</span> * Sets the value for the <code>User-Agent</code> request header.<a name="line.478"></a>
-<span class="sourceLineNo">479</span> * <p><a name="line.479"></a>
-<span class="sourceLineNo">480</span> * This is a shortcut for calling <code>header(<js>"User-Agent"</js>, value);</code><a name="line.480"></a>
-<span class="sourceLineNo">481</span> *<a name="line.481"></a>
-<span class="sourceLineNo">482</span> * @param value The new header value.<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * @return This object (for method chaining).<a name="line.483"></a>
-<span class="sourceLineNo">484</span> */<a name="line.484"></a>
-<span class="sourceLineNo">485</span> public RestCall userAgent(Object value) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> return header("User-Agent", value);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> }<a name="line.487"></a>
-<span class="sourceLineNo">488</span><a name="line.488"></a>
-<span class="sourceLineNo">489</span> /**<a name="line.489"></a>
-<span class="sourceLineNo">490</span> * Sets the value for the <code>Upgrade</code> request header.<a name="line.490"></a>
-<span class="sourceLineNo">491</span> * <p><a name="line.491"></a>
-<span class="sourceLineNo">492</span> * This is a shortcut for calling <code>header(<js>"Upgrade"</js>, value);</code><a name="line.492"></a>
-<span class="sourceLineNo">493</span> *<a name="line.493"></a>
-<span class="sourceLineNo">494</span> * @param value The new header value.<a name="line.494"></a>
-<span class="sourceLineNo">495</span> * @return This object (for method chaining).<a name="line.495"></a>
-<span class="sourceLineNo">496</span> */<a name="line.496"></a>
-<span class="sourceLineNo">497</span> public RestCall upgrade(Object value) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> return header("Upgrade", value);<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> /**<a name="line.501"></a>
-<span class="sourceLineNo">502</span> * Sets the value for the <code>Via</code> request header.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> * <p><a name="line.503"></a>
-<span class="sourceLineNo">504</span> * This is a shortcut for calling <code>header(<js>"Via"</js>, value);</code><a name="line.504"></a>
-<span class="sourceLineNo">505</span> *<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * @param value The new header value.<a name="line.506"></a>
-<span class="sourceLineNo">507</span> * @return This object (for method chaining).<a name="line.507"></a>
-<span class="sourceLineNo">508</span> */<a name="line.508"></a>
-<span class="sourceLineNo">509</span> public RestCall via(Object value) {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> return header("Via", value);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> }<a name="line.511"></a>
-<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span> /**<a name="line.513"></a>
-<span class="sourceLineNo">514</span> * Sets the value for the <code>Warning</code> request header.<a name="line.514"></a>
-<span class="sourceLineNo">515</span> * <p><a name="line.515"></a>
-<span class="sourceLineNo">516</span> * This is a shortcut for calling <code>header(<js>"Warning"</js>, value);</code><a name="line.516"></a>
-<span class="sourceLineNo">517</span> *<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * @param value The new header value.<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * @return This object (for method chaining).<a name="line.519"></a>
-<span class="sourceLineNo">520</span> */<a name="line.520"></a>
-<span class="sourceLineNo">521</span> public RestCall warning(Object value) {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> return header("Warning", value);<a name="line.522"></a>
-<span class="sourceLineNo">523</span> }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> /**<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * Sets the client version by setting the value for the <js>"X-Client-Version"</js> header.<a name="line.526"></a>
-<span class="sourceLineNo">527</span> *<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * @param version The version string (e.g. <js>"1.2.3"</js>)<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * @return This object (for method chaining).<a name="line.529"></a>
-<span class="sourceLineNo">530</span> */<a name="line.530"></a>
-<span class="sourceLineNo">531</span> public RestCall clientVersion(String version) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span> return header("X-Client-Version", version);<a name="line.532"></a>
-<span class="sourceLineNo">533</span> }<a name="line.533"></a>
-<span class="sourceLineNo">534</span><a name="line.534"></a>
-<span class="sourceLineNo">535</span> /**<a name="line.535"></a>
-<span class="sourceLineNo">536</span> * Make this call retryable if an error response (>=400) is received.<a name="line.536"></a>
-<span class="sourceLineNo">537</span> *<a name="line.537"></a>
-<span class="sourceLineNo">538</span> * @param retries The number of retries to attempt.<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * @param interval The time in milliseconds between attempts.<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * @param retryOn Optional object used for determining whether a retry should be attempted.<a name="line.540"></a>
-<span class="sourceLineNo">541</span> * If <jk>null</jk>, uses {@link RetryOn#DEFAULT}.<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * @return This object (for method chaining).<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * @throws RestCallException If current entity is not repeatable.<a name="line.543"></a>
-<span class="sourceLineNo">544</span> */<a name="line.544"></a>
-<span class="sourceLineNo">545</span> public RestCall retryable(int retries, long interval, RetryOn retryOn) throws RestCallException {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (request instanceof HttpEntityEnclosingRequestBase) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> if (input != null && input instanceof HttpEntity) {<a name="line.547"></a>
-<span class="sourceLineNo">548</span> HttpEntity e = (HttpEntity)input;<a name="line.548"></a>
-<span class="sourceLineNo">549</span> if (e != null && ! e.isRepeatable())<a name="line.549"></a>
-<span class="sourceLineNo">550</span> throw new RestCallException("Attempt to make call retryable, but entity is not repeatable.");<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span> this.retries = retries;<a name="line.553"></a>
-<span class="sourceLineNo">554</span> this.retryInterval = interval;<a name="line.554"></a>
-<span class="sourceLineNo">555</span> this.retryOn = (retryOn == null ? RetryOn.DEFAULT : retryOn);<a name="line.555"></a>
-<span class="sourceLineNo">556</span> return this;<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> }<a name="line.558"></a>
-<span class="sourceLineNo">559</span><a name="line.559"></a>
-<span class="sourceLineNo">560</span> /**<a name="line.560"></a>
-<span class="sourceLineNo">561</span> * For this call, allow automatic redirects when a 302 or 307 occurs when<a name="line.561"></a>
-<span class="sourceLineNo">562</span> * performing a POST.<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * <p><a name="line.563"></a>
-<span class="sourceLineNo">564</span> * Note that this can be inefficient since the POST body needs to be serialized<a name="line.564"></a>
-<span class="sourceLineNo">565</span> * twice.<a name="line.565"></a>
-<span class="sourceLineNo">566</span> * The preferred approach if possible is to use the {@link LaxRedirectStrategy} strategy<a name="line.566"></a>
-<span class="sourceLineNo">567</span> * on the underlying HTTP client. However, this method is provided if you don't<a name="line.567"></a>
-<span class="sourceLineNo">568</span> * have access to the underlying client.<a name="line.568"></a>
-<span class="sourceLineNo">569</span> *<a name="line.569"></a>
-<span class="sourceLineNo">570</span> * @param b Redirect flag.<a name="line.570"></a>
-<span class="sourceLineNo">571</span> * @return This object (for method chaining).<a name="line.571"></a>
-<span class="sourceLineNo">572</span> */<a name="line.572"></a>
-<span class="sourceLineNo">573</span> public RestCall allowRedirectsOnPosts(boolean b) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span> this.allowRedirectsOnPosts = b;<a name="line.574"></a>
-<span class="sourceLineNo">575</span> return this;<a name="line.575"></a>
-<span class="sourceLineNo">576</span> }<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> /**<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * Specify the number of redirects to follow before throwing an exception.<a name="line.579"></a>
+<span class="sourceLineNo">190</span> * Sets the URI user info.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> *<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * @param userInfo The new URI user info.<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * @return This object (for method chaining).<a name="line.193"></a>
+<span class="sourceLineNo">194</span> */<a name="line.194"></a>
+<span class="sourceLineNo">195</span> public RestCall userInfo(String userInfo) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> uriBuilder.setUserInfo(userInfo);<a name="line.196"></a>
+<span class="sourceLineNo">197</span> return this;<a name="line.197"></a>
+<span class="sourceLineNo">198</span> }<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> * Sets the URI user info.<a name="line.201"></a>
+<span class="sourceLineNo">202</span> *<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * @param username The new URI username.<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * @param password The new URI password.<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * @return This object (for method chaining).<a name="line.205"></a>
+<span class="sourceLineNo">206</span> */<a name="line.206"></a>
+<span class="sourceLineNo">207</span> public RestCall userInfo(String username, String password) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> uriBuilder.setUserInfo(username, password);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> return this;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span> /**<a name="line.212"></a>
+<span class="sourceLineNo">213</span> * Sets the input for this REST call.<a name="line.213"></a>
+<span class="sourceLineNo">214</span> *<a name="line.214"></a>
+<span class="sourceLineNo">215</span> * @param input The input to be sent to the REST resource (only valid for PUT and POST) requests. <br><a name="line.215"></a>
+<span class="sourceLineNo">216</span> * Can be of the following types:<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * <ul class='spaced-list'><a name="line.217"></a>
+<span class="sourceLineNo">218</span> * <li>{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * <li>{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.<a name="line.219"></a>
+<span class="sourceLineNo">220</span> * <li>{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * <li>{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * </ul><a name="line.222"></a>
+<span class="sourceLineNo">223</span> * @return This object (for method chaining).<a name="line.223"></a>
+<span class="sourceLineNo">224</span> * @throws RestCallException If a retry was attempted, but the entity was not repeatable.<a name="line.224"></a>
+<span class="sourceLineNo">225</span> */<a name="line.225"></a>
+<span class="sourceLineNo">226</span> public RestCall input(final Object input) throws RestCallException {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> this.input = input;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> return this;<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span> /**<a name="line.231"></a>
+<span class="sourceLineNo">232</span> * Specifies the serializer to use on this call.<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * <p><a name="line.233"></a>
+<span class="sourceLineNo">234</span> * Overrides the serializer specified on the {@link RestClient}.<a name="line.234"></a>
+<span class="sourceLineNo">235</span> *<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * @param serializer The serializer used to serialize POJOs to the body of the HTTP request.<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * @return This object (for method chaining).<a name="line.237"></a>
+<span class="sourceLineNo">238</span> */<a name="line.238"></a>
+<span class="sourceLineNo">239</span> public RestCall serializer(Serializer serializer) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> this.serializer = serializer;<a name="line.240"></a>
+<span class="sourceLineNo">241</span> return this;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span> /**<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * Specifies the parser to use on this call.<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * <p><a name="line.246"></a>
+<span class="sourceLineNo">247</span> * Overrides the parser specified on the {@link RestClient}.<a name="line.247"></a>
+<span class="sourceLineNo">248</span> *<a name="line.248"></a>
+<span class="sourceLineNo">249</span> * @param parser The parser used to parse POJOs from the body of the HTTP response.<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * @return This object (for method chaining).<a name="line.250"></a>
+<span class="sourceLineNo">251</span> */<a name="line.251"></a>
+<span class="sourceLineNo">252</span> public RestCall parser(Parser parser) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> this.parser = parser;<a name="line.253"></a>
+<span class="sourceLineNo">254</span> return this;<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> //--------------------------------------------------------------------------------<a name="line.258"></a>
+<span class="sourceLineNo">259</span> // HTTP headers<a name="line.259"></a>
+<span class="sourceLineNo">260</span> //--------------------------------------------------------------------------------<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> /**<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * Convenience method for setting a header value on the request.<a name="line.263"></a>
+<span class="sourceLineNo">264</span> * <p><a name="line.264"></a>
+<span class="sourceLineNo">265</span> * Equivalent to calling <code>restCall.getRequest().setHeader(name, value.toString())</code>.<a name="line.265"></a>
+<span class="sourceLineNo">266</span> *<a name="line.266"></a>
+<span class="sourceLineNo">267</span> * @param name The header name.<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * @param value The header value.<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * @return This object (for method chaining).<a name="line.269"></a>
+<span class="sourceLineNo">270</span> */<a name="line.270"></a>
+<span class="sourceLineNo">271</span> public RestCall header(String name, Object value) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> request.setHeader(name, value.toString());<a name="line.272"></a>
+<span class="sourceLineNo">273</span> return this;<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> /**<a name="line.276"></a>
+<span class="sourceLineNo">277</span> * Sets the value for the <code>Accept</code> request header.<a name="line.277"></a>
+<span class="sourceLineNo">278</span> * <p><a name="line.278"></a>
+<span class="sourceLineNo">279</span> * This overrides the media type specified on the parser, but is overridden by calling <code>header(<js>"Accept"</js>, value);</code><a name="line.279"></a>
+<span class="sourceLineNo">280</span> *<a name="line.280"></a>
+<span class="sourceLineNo">281</span> * @param value The new header value.<a name="line.281"></a>
+<span class="sourceLineNo">282</span> * @return This object (for method chaining).<a name="line.282"></a>
+<span class="sourceLineNo">283</span> */<a name="line.283"></a>
+<span class="sourceLineNo">284</span> public RestCall accept(Object value) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> return header("Accept", value);<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> /**<a name="line.288"></a>
+<span class="sourceLineNo">289</span> * Sets the value for the <code>Accept-Charset</code> request header.<a name="line.289"></a>
+<span class="sourceLineNo">290</span> * <p><a name="line.290"></a>
+<span class="sourceLineNo">291</span> * This is a shortcut for calling <code>header(<js>"Accept-Charset"</js>, value);</code><a name="line.291"></a>
+<span class="sourceLineNo">292</span> *<a name="line.292"></a>
+<span class="sourceLineNo">293</span> * @param value The new header value.<a name="line.293"></a>
+<span class="sourceLineNo">294</span> * @return This object (for method chaining).<a name="line.294"></a>
+<span class="sourceLineNo">295</span> */<a name="line.295"></a>
+<span class="sourceLineNo">296</span> public RestCall acceptCharset(Object value) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> return header("Accept-Charset", value);<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span> /**<a name="line.300"></a>
+<span class="sourceLineNo">301</span> * Sets the value for the <code>Accept-Encoding</code> request header.<a name="line.301"></a>
+<span class="sourceLineNo">302</span> * <p><a name="line.302"></a>
+<span class="sourceLineNo">303</span> * This is a shortcut for calling <code>header(<js>"Accept-Encoding"</js>, value);</code><a name="line.303"></a>
+<span class="sourceLineNo">304</span> *<a name="line.304"></a>
+<span class="sourceLineNo">305</span> * @param value The new header value.<a name="line.305"></a>
+<span class="sourceLineNo">306</span> * @return This object (for method chaining).<a name="line.306"></a>
+<span class="sourceLineNo">307</span> */<a name="line.307"></a>
+<span class="sourceLineNo">308</span> public RestCall acceptEncoding(Object value) {<a name="line.308"></a>
+<span class="sourceLineNo">309</span> return header("Accept-Encoding", value);<a name="line.309"></a>
+<span class="sourceLineNo">310</span> }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span> /**<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * Sets the value for the <code>Accept-Language</code> request header.<a name="line.313"></a>
+<span class="sourceLineNo">314</span> * <p><a name="line.314"></a>
+<span class="sourceLineNo">315</span> * This is a shortcut for calling <code>header(<js>"Accept-Language"</js>, value);</code><a name="line.315"></a>
+<span class="sourceLineNo">316</span> *<a name="line.316"></a>
+<span class="sourceLineNo">317</span> * @param value The new header value.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * @return This object (for method chaining).<a name="line.318"></a>
+<span class="sourceLineNo">319</span> */<a name="line.319"></a>
+<span class="sourceLineNo">320</span> public RestCall acceptLanguage(Object value) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> return header("Accept-Language", value);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span> /**<a name="line.324"></a>
+<span class="sourceLineNo">325</span> * Sets the value for the <code>Authorization</code> request header.<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * <p><a name="line.326"></a>
+<span class="sourceLineNo">327</span> * This is a shortcut for calling <code>header(<js>"Authorization"</js>, value);</code><a name="line.327"></a>
+<span class="sourceLineNo">328</span> *<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * @param value The new header value.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * @return This object (for method chaining).<a name="line.330"></a>
+<span class="sourceLineNo">331</span> */<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public RestCall authorization(Object value) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> return header("Authorization", value);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span> /**<a name="line.336"></a>
+<span class="sourceLineNo">337</span> * Sets the value for the <code>Cache-Control</code> request header.<a name="line.337"></a>
+<span class="sourceLineNo">338</span> * <p><a name="line.338"></a>
+<span class="sourceLineNo">339</span> * This is a shortcut for calling <code>header(<js>"Cache-Control"</js>, value);</code><a name="line.339"></a>
+<span class="sourceLineNo">340</span> *<a name="line.340"></a>
+<span class="sourceLineNo">341</span> * @param value The new header value.<a name="line.341"></a>
+<span class="sourceLineNo">342</span> * @return This object (for method chaining).<a name="line.342"></a>
+<span class="sourceLineNo">343</span> */<a name="line.343"></a>
+<span class="sourceLineNo">344</span> public RestCall cacheControl(Object value) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span> return header("Cache-Control", value);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> /**<a name="line.348"></a>
+<span class="sourceLineNo">349</span> * Sets the value for the <code>Connection</code> request header.<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * <p><a name="line.350"></a>
+<span class="sourceLineNo">351</span> * This is a shortcut for calling <code>header(<js>"Connection"</js>, value);</code><a name="line.351"></a>
+<span class="sourceLineNo">352</span> *<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * @param value The new header value.<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * @return This object (for method chaining).<a name="line.354"></a>
+<span class="sourceLineNo">355</span> */<a name="line.355"></a>
+<span class="sourceLineNo">356</span> public RestCall connection(Object value) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> return header("Connection", value);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> /**<a name="line.360"></a>
+<span class="sourceLineNo">361</span> * Sets the value for the <code>Content-Length</code> request header.<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * <p><a name="line.362"></a>
+<span class="sourceLineNo">363</span> * This is a shortcut for calling <code>header(<js>"Content-Length"</js>, value);</code><a name="line.363"></a>
+<span class="sourceLineNo">364</span> *<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * @param value The new header value.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * @return This object (for method chaining).<a name="line.366"></a>
+<span class="sourceLineNo">367</span> */<a name="line.367"></a>
+<span class="sourceLineNo">368</span> public RestCall contentLength(Object value) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> return header("Content-Length", value);<a name="line.369"></a>
+<span class="sourceLineNo">370</span> }<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span> /**<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * Sets the value for the <code>Content-Type</code> request header.<a name="line.373"></a>
+<span class="sourceLineNo">374</span> * <p><a name="line.374"></a>
+<span class="sourceLineNo">375</span> * This overrides the media type specified on the serializer, but is overridden by calling <code>header(<js>"Content-Type"</js>, value);</code><a name="line.375"></a>
+<span class="sourceLineNo">376</span> *<a name="line.376"></a>
+<span class="sourceLineNo">377</span> * @param value The new header value.<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * @return This object (for method chaining).<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public RestCall contentType(Object value) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> return header("Content-Type", value);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span> /**<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * Sets the value for the <code>Date</code> request header.<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * <p><a name="line.386"></a>
+<span class="sourceLineNo">387</span> * This is a shortcut for calling <code>header(<js>"Date"</js>, value);</code><a name="line.387"></a>
+<span class="sourceLineNo">388</span> *<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * @param value The new header value.<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * @return This object (for method chaining).<a name="line.390"></a>
+<span class="so
<TRUNCATED>
[16/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.html
index 675f202..9d7976b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.html
@@ -177,314 +177,315 @@
<span class="sourceLineNo">169</span> // Special case where we're parsing a loose collection of resources.<a name="line.169"></a>
<span class="sourceLineNo">170</span> if (s.isLooseCollections() && type.isCollectionOrArray()) {<a name="line.170"></a>
<span class="sourceLineNo">171</span> Collection c = null;<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if (type.isArray())<a name="line.172"></a>
+<span class="sourceLineNo">172</span> if (type.isArray() || type.isArgs())<a name="line.172"></a>
<span class="sourceLineNo">173</span> c = new ArrayList();<a name="line.173"></a>
<span class="sourceLineNo">174</span> else<a name="line.174"></a>
<span class="sourceLineNo">175</span> c = (type.canCreateNewInstance(session.getOuter()) ? (Collection<?>)type.newInstance(session.getOuter()) : new ObjectList(session));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (Resource resource : roots)<a name="line.176"></a>
-<span class="sourceLineNo">177</span> c.add(parseAnything(s, type.getElementType(), resource, session.getOuter(), null));<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> if (type.isArray())<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return (T)session.toArray(type, c);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> return (T)c;<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (roots.isEmpty())<a name="line.184"></a>
-<span class="sourceLineNo">185</span> return null;<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (roots.size() > 1)<a name="line.186"></a>
-<span class="sourceLineNo">187</span> throw new ParseException(session, "Too many root nodes found in model: {0}", roots.size());<a name="line.187"></a>
-<span class="sourceLineNo">188</span> Resource resource = roots.get(0);<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> return parseAnything(s, type, resource, session.getOuter(), null);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> /*<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * Finds the roots in the model using either the "root" property to identify it,<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * or by resorting to scanning the model for all nodes with no incoming predicates.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> */<a name="line.196"></a>
-<span class="sourceLineNo">197</span> private static List<Resource> getRoots(RdfParserSession session, Model m) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> List<Resource> l = new LinkedList<Resource>();<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> // First try to find the root using the "http://www.apache.org/juneau/root" property.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> Property root = m.createProperty(session.getJuneauNsUri(), RDF_juneauNs_ROOT);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> for (ResIterator i = m.listResourcesWithProperty(root); i.hasNext();)<a name="line.202"></a>
-<span class="sourceLineNo">203</span> l.add(i.next());<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span> if (! l.isEmpty())<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return l;<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> // Otherwise, we need to find all resources that aren't objects.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // We want to explicitly ignore statements where the subject<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // and object are the same node.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> Set<RDFNode> objects = new HashSet<RDFNode>();<a name="line.211"></a>
-<span class="sourceLineNo">212</span> for (StmtIterator i = m.listStatements(); i.hasNext();) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> Statement st = i.next();<a name="line.213"></a>
-<span class="sourceLineNo">214</span> RDFNode subject = st.getSubject();<a name="line.214"></a>
-<span class="sourceLineNo">215</span> RDFNode object = st.getObject();<a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (object.isResource() && ! object.equals(subject))<a name="line.216"></a>
-<span class="sourceLineNo">217</span> objects.add(object);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> for (ResIterator i = m.listSubjects(); i.hasNext();) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> Resource r = i.next();<a name="line.220"></a>
-<span class="sourceLineNo">221</span> if (! objects.contains(r))<a name="line.221"></a>
-<span class="sourceLineNo">222</span> l.add(r);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> return l;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> private <T> BeanMap<T> parseIntoBeanMap(RdfParserSession session, Resource r2, BeanMap<T> m) throws Exception {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> BeanMeta<T> bm = m.getMeta();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.230"></a>
-<span class="sourceLineNo">231</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> Statement st = i.next();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> Property p = st.getPredicate();<a name="line.234"></a>
-<span class="sourceLineNo">235</span> String key = session.decodeString(p.getLocalName());<a name="line.235"></a>
-<span class="sourceLineNo">236</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> session.setCurrentProperty(pMeta);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (pMeta != null) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> RDFNode o = st.getObject();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> if (cm.isCollectionOrArray() && isMultiValuedCollections(session, pMeta)) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> ClassMeta<?> et = cm.getElementType();<a name="line.242"></a>
-<span class="sourceLineNo">243</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> setName(et, value, key);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> pMeta.add(m, value);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> setName(cm, value, key);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> pMeta.set(m, value);<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> session.setCurrentProperty(null);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m;<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> private static boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (pMeta != null && pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> return session.getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.265"></a>
-<span class="sourceLineNo">266</span> private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> if (eType == null)<a name="line.268"></a>
-<span class="sourceLineNo">269</span> eType = (ClassMeta<T>)object();<a name="line.269"></a>
-<span class="sourceLineNo">270</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> session.setCurrentClass(sType);<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (! sType.canCreateNewInstance(outer)) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> if (n.isResource()) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> Statement st = n.asResource().getProperty(session.getTypeProperty());<a name="line.276"></a>
-<span class="sourceLineNo">277</span> if (st != null) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> String c = st.getLiteral().getString();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> ClassMeta tcm = session.getClassMeta(c, pMeta, eType);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (tcm != null)<a name="line.280"></a>
-<span class="sourceLineNo">281</span> sType = eType = tcm;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> Object o = null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> // Do nothing. Leave o == null.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> } else if (sType.isObject()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> if (n.isLiteral()) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> o = n.asLiteral().getValue();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> if (o instanceof String) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> o = session.decodeString(o);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> else if (n.isResource()) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> Resource r = n.asResource();<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (session.wasAlreadyProcessed(r))<a name="line.298"></a>
-<span class="sourceLineNo">299</span> o = r.getURI();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> else if (r.getProperty(session.getValueProperty()) != null) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer, null);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> } else if (isSeq(session, r)) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> o = new ObjectList(session);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.304"></a>
-<span class="sourceLineNo">305</span> } else if (isBag(session, r)) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> o = new ObjectList(session);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> } else if (r.canAs(RDFList.class)) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> o = new ObjectList(session);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> } else {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> // If it has a URI and no child properties, we interpret this as an<a name="line.312"></a>
-<span class="sourceLineNo">313</span> // external resource, and convert it to just a URL.<a name="line.313"></a>
-<span class="sourceLineNo">314</span> String uri = r.getURI();<a name="line.314"></a>
-<span class="sourceLineNo">315</span> if (uri != null && ! r.listProperties().hasNext()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> o = r.getURI();<a name="line.316"></a>
-<span class="sourceLineNo">317</span> } else {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> ObjectMap m2 = new ObjectMap(session);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> parseIntoMap(session, r, m2, null, null, pMeta);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> o = session.cast(m2, pMeta, eType);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span> } else {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } else if (sType.isBoolean()) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> o = session.convertToType(getValue(session, n, outer), boolean.class);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> } else if (sType.isCharSequence()) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> o = session.decodeString(getValue(session, n, outer));<a name="line.329"></a>
-<span class="sourceLineNo">330</span> } else if (sType.isChar()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> o = session.decodeString(getValue(session, n, outer)).charAt(0);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> } else if (sType.isNumber()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass());<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } else if (sType.isMap()) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> Resource r = n.asResource();<a name="line.335"></a>
-<span class="sourceLineNo">336</span> if (session.wasAlreadyProcessed(r))<a name="line.336"></a>
-<span class="sourceLineNo">337</span> return null;<a name="line.337"></a>
-<span class="sourceLineNo">338</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.338"></a>
-<span class="sourceLineNo">339</span> o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType(), pMeta);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> } else if (sType.isCollectionOrArray()) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> if (sType.isArray())<a name="line.341"></a>
-<span class="sourceLineNo">342</span> o = new ArrayList();<a name="line.342"></a>
-<span class="sourceLineNo">343</span> else<a name="line.343"></a>
-<span class="sourceLineNo">344</span> o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(session));<a name="line.344"></a>
-<span class="sourceLineNo">345</span> Resource r = n.asResource();<a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (session.wasAlreadyProcessed(r))<a name="line.346"></a>
-<span class="sourceLineNo">347</span> return null;<a name="line.347"></a>
-<span class="sourceLineNo">348</span> if (isSeq(session, r)) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> } else if (isBag(session, r)) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> } else if (r.canAs(RDFList.class)) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> } else {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> throw new ParseException("Unrecognized node type ''{0}'' for collection", n);<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (sType.isArray())<a name="line.357"></a>
-<span class="sourceLineNo">358</span> o = session.toArray(sType, (Collection)o);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> Resource r = n.asResource();<a name="line.360"></a>
-<span class="sourceLineNo">361</span> if (session.wasAlreadyProcessed(r))<a name="line.361"></a>
-<span class="sourceLineNo">362</span> return null;<a name="line.362"></a>
-<span class="sourceLineNo">363</span> BeanMap<?> bm = session.newBeanMap(outer, sType.getInnerClass());<a name="line.363"></a>
-<span class="sourceLineNo">364</span> o = parseIntoBeanMap(session, r, bm).getBean();<a name="line.364"></a>
-<span class="sourceLineNo">365</span> } else if (sType.isUri() && n.isResource()) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));<a name="line.366"></a>
-<span class="sourceLineNo">367</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass()));<a name="line.370"></a>
-<span class="sourceLineNo">371</span> } else if (n.isResource()) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> Resource r = n.asResource();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> Map m = new ObjectMap(session);<a name="line.373"></a>
-<span class="sourceLineNo">374</span> parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.375"></a>
-<span class="sourceLineNo">376</span> o = session.cast((ObjectMap)m, pMeta, eType);<a name="line.376"></a>
-<span class="sourceLineNo">377</span> else<a name="line.377"></a>
-<span class="sourceLineNo">378</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.378"></a>
-<span class="sourceLineNo">379</span> } else {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> if (transform != null && o != null)<a name="line.383"></a>
-<span class="sourceLineNo">384</span> o = transform.unswap(session, o, eType);<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (outer != null)<a name="line.386"></a>
-<span class="sourceLineNo">387</span> setParent(eType, o, outer);<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> return (T)o;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> private static boolean isSeq(RdfParserSession session, RDFNode n) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (n.isResource()) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.394"></a>
-<span class="sourceLineNo">395</span> if (st != null)<a name="line.395"></a>
-<span class="sourceLineNo">396</span> return RDF_SEQ.equals(st.getResource().getURI());<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span> return false;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> private static boolean isBag(RdfParserSession session, RDFNode n) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> if (n.isResource()) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (st != null)<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return RDF_BAG.equals(st.getResource().getURI());<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return false;<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> private Object getValue(RdfParserSession session, RDFNode n, Object outer) throws Exception {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> if (n.isLiteral())<a name="line.411"></a>
-<span class="sourceLineNo">412</span> return n.asLiteral().getValue();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (n.isResource()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> Statement st = n.asResource().getProperty(session.getValueProperty());<a name="line.414"></a>
-<span class="sourceLineNo">415</span> if (st != null) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> n = st.getObject();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (n.isLiteral())<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return n.asLiteral().getValue();<a name="line.418"></a>
-<span class="sourceLineNo">419</span> return parseAnything(session, object(), st.getObject(), outer, null);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> throw new ParseException(session, "Unknown value type for node ''{0}''", n);<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> private <K,V> Map<K,V> parseIntoMap(RdfParserSession session, Resource r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> // Add URI as "uri" to generic maps.<a name="line.426"></a>
-<span class="sourceLineNo">427</span> if (r.getURI() != null) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> K uri = convertAttrToType(session, m, "uri", keyType);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> V value = convertAttrToType(session, m, r.getURI(), valueType);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> m.put(uri, value);<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for (StmtIterator i = r.listProperties(); i.hasNext();) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> Statement st = i.next();<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Property p = st.getPredicate();<a name="line.434"></a>
-<span class="sourceLineNo">435</span> String key = p.getLocalName();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (! (key.equals("root") && p.getURI().equals(session.getJuneauNsUri()))) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> key = session.decodeString(key);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> RDFNode o = st.getObject();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> K key2 = convertAttrToType(session, m, key, keyType);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> V value = parseAnything(session, valueType, o, m, pMeta);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> setName(valueType, value, key);<a name="line.441"></a>
-<span class="sourceLineNo">442</span> m.put(key2, value);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> return m;<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, Container c, Collection<E> l, ClassMeta<E> et, BeanPropertyMeta pMeta) throws Exception {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> for (NodeIterator ni = c.iterator(); ni.hasNext();) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> E e = parseAnything(session, et, ni.next(), l, pMeta);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> l.add(e);<a name="line.452"></a>
-<span class="sourceLineNo">453</span> }<a name="line.453"></a>
-<span class="sourceLineNo">454</span> return l;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, RDFList list, Collection<E> l, ClassMeta<E> et, BeanPropertyMeta pMeta) throws Exception {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> for (ExtendedIterator<RDFNode> ni = list.iterator(); ni.hasNext();) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span> E e = parseAnything(session, et, ni.next(), l, pMeta);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> l.add(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span> return l;<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> @Override /* Parser */<a name="line.465"></a>
-<span class="sourceLineNo">466</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> throw new UnsupportedOperationException("Parser '"+getClass().getName()+"' does not support this method.");<a name="line.467"></a>
-<span class="sourceLineNo">468</span> }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span> <a name="line.470"></a>
-<span class="sourceLineNo">471</span> //--------------------------------------------------------------------------------<a name="line.471"></a>
-<span class="sourceLineNo">472</span> // Entry point methods<a name="line.472"></a>
-<span class="sourceLineNo">473</span> //--------------------------------------------------------------------------------<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> @Override /* Parser */<a name="line.475"></a>
-<span class="sourceLineNo">476</span> public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span>}<a name="line.479"></a>
+<span class="sourceLineNo">176</span> <a name="line.176"></a>
+<span class="sourceLineNo">177</span> int argIndex = 0;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> for (Resource resource : roots)<a name="line.178"></a>
+<span class="sourceLineNo">179</span> c.add(parseAnything(s, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), resource, session.getOuter(), null));<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> if (type.isArray() || type.isArgs())<a name="line.181"></a>
+<span class="sourceLineNo">182</span> return (T)session.toArray(type, c);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> return (T)c;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (roots.isEmpty())<a name="line.186"></a>
+<span class="sourceLineNo">187</span> return null;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (roots.size() > 1)<a name="line.188"></a>
+<span class="sourceLineNo">189</span> throw new ParseException(session, "Too many root nodes found in model: {0}", roots.size());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> Resource resource = roots.get(0);<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> return parseAnything(s, type, resource, session.getOuter(), null);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<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> * Finds the roots in the model using either the "root" property to identify it,<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * or by resorting to scanning the model for all nodes with no incoming predicates.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> */<a name="line.198"></a>
+<span class="sourceLineNo">199</span> private static List<Resource> getRoots(RdfParserSession session, Model m) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> List<Resource> l = new LinkedList<Resource>();<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> // First try to find the root using the "http://www.apache.org/juneau/root" property.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> Property root = m.createProperty(session.getJuneauNsUri(), RDF_juneauNs_ROOT);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> for (ResIterator i = m.listResourcesWithProperty(root); i.hasNext();)<a name="line.204"></a>
+<span class="sourceLineNo">205</span> l.add(i.next());<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> if (! l.isEmpty())<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return l;<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> // Otherwise, we need to find all resources that aren't objects.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> // We want to explicitly ignore statements where the subject<a name="line.211"></a>
+<span class="sourceLineNo">212</span> // and object are the same node.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> Set<RDFNode> objects = new HashSet<RDFNode>();<a name="line.213"></a>
+<span class="sourceLineNo">214</span> for (StmtIterator i = m.listStatements(); i.hasNext();) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> Statement st = i.next();<a name="line.215"></a>
+<span class="sourceLineNo">216</span> RDFNode subject = st.getSubject();<a name="line.216"></a>
+<span class="sourceLineNo">217</span> RDFNode object = st.getObject();<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (object.isResource() && ! object.equals(subject))<a name="line.218"></a>
+<span class="sourceLineNo">219</span> objects.add(object);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> for (ResIterator i = m.listSubjects(); i.hasNext();) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> Resource r = i.next();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> if (! objects.contains(r))<a name="line.223"></a>
+<span class="sourceLineNo">224</span> l.add(r);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span> return l;<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> private <T> BeanMap<T> parseIntoBeanMap(RdfParserSession session, Resource r2, BeanMap<T> m) throws Exception {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> BeanMeta<T> bm = m.getMeta();<a name="line.230"></a>
+<span class="sourceLineNo">231</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.232"></a>
+<span class="sourceLineNo">233</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.233"></a>
+<span class="sourceLineNo">234</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> Statement st = i.next();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> Property p = st.getPredicate();<a name="line.236"></a>
+<span class="sourceLineNo">237</span> String key = session.decodeString(p.getLocalName());<a name="line.237"></a>
+<span class="sourceLineNo">238</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> session.setCurrentProperty(pMeta);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (pMeta != null) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> RDFNode o = st.getObject();<a name="line.241"></a>
+<span class="sourceLineNo">242</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> if (cm.isCollectionOrArray() && isMultiValuedCollections(session, pMeta)) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> ClassMeta<?> et = cm.getElementType();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> setName(et, value, key);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> pMeta.add(m, value);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> } else {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> setName(cm, value, key);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> pMeta.set(m, value);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> session.setCurrentProperty(null);<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return m;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> private static boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> if (pMeta != null && pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.262"></a>
+<span class="sourceLineNo">263</span> return pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> return session.getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.267"></a>
+<span class="sourceLineNo">268</span> private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> if (eType == null)<a name="line.270"></a>
+<span class="sourceLineNo">271</span> eType = (ClassMeta<T>)object();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.273"></a>
+<span class="sourceLineNo">274</span> session.setCurrentClass(sType);<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> if (! sType.canCreateNewInstance(outer)) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (n.isResource()) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> Statement st = n.asResource().getProperty(session.getTypeProperty());<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (st != null) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> String c = st.getLiteral().getString();<a name="line.280"></a>
+<span class="sourceLineNo">281</span> ClassMeta tcm = session.getClassMeta(c, pMeta, eType);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (tcm != null)<a name="line.282"></a>
+<span class="sourceLineNo">283</span> sType = eType = tcm;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> Object o = null;<a name="line.288"></a>
+<span class="sourceLineNo">289</span> if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // Do nothing. Leave o == null.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> } else if (sType.isObject()) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (n.isLiteral()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> o = n.asLiteral().getValue();<a name="line.293"></a>
+<span class="sourceLineNo">294</span> if (o instanceof String) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> o = session.decodeString(o);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> else if (n.isResource()) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> Resource r = n.asResource();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> if (session.wasAlreadyProcessed(r))<a name="line.300"></a>
+<span class="sourceLineNo">301</span> o = r.getURI();<a name="line.301"></a>
+<span class="sourceLineNo">302</span> else if (r.getProperty(session.getValueProperty()) != null) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer, null);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> } else if (isSeq(session, r)) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> o = new ObjectList(session);<a name="line.305"></a>
+<span class="sourceLineNo">306</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType, pMeta);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> } else if (isBag(session, r)) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> o = new ObjectList(session);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType, pMeta);<a name="line.309"></a>
+<span class="sourceLineNo">310</span> } else if (r.canAs(RDFList.class)) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> o = new ObjectList(session);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType, pMeta);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> } else {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> // If it has a URI and no child properties, we interpret this as an<a name="line.314"></a>
+<span class="sourceLineNo">315</span> // external resource, and convert it to just a URL.<a name="line.315"></a>
+<span class="sourceLineNo">316</span> String uri = r.getURI();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (uri != null && ! r.listProperties().hasNext()) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> o = r.getURI();<a name="line.318"></a>
+<span class="sourceLineNo">319</span> } else {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> ObjectMap m2 = new ObjectMap(session);<a name="line.320"></a>
+<span class="sourceLineNo">321</span> parseIntoMap(session, r, m2, null, null, pMeta);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> o = session.cast(m2, pMeta, eType);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span> } else {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span> } else if (sType.isBoolean()) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> o = session.convertToType(getValue(session, n, outer), boolean.class);<a name="line.329"></a>
+<span class="sourceLineNo">330</span> } else if (sType.isCharSequence()) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> o = session.decodeString(getValue(session, n, outer));<a name="line.331"></a>
+<span class="sourceLineNo">332</span> } else if (sType.isChar()) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> o = session.decodeString(getValue(session, n, outer)).charAt(0);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> } else if (sType.isNumber()) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass());<a name="line.335"></a>
+<span class="sourceLineNo">336</span> } else if (sType.isMap()) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> Resource r = n.asResource();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> if (session.wasAlreadyProcessed(r))<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return null;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.340"></a>
+<span class="sourceLineNo">341</span> o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType(), pMeta);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> } else if (sType.isCollectionOrArray() || sType.isArgs()) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> if (sType.isArray() || sType.isArgs())<a name="line.343"></a>
+<span class="sourceLineNo">344</span> o = new ArrayList();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> else<a name="line.345"></a>
+<span class="sourceLineNo">346</span> o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(session));<a name="line.346"></a>
+<span class="sourceLineNo">347</span> Resource r = n.asResource();<a name="line.347"></a>
+<span class="sourceLineNo">348</span> if (session.wasAlreadyProcessed(r))<a name="line.348"></a>
+<span class="sourceLineNo">349</span> return null;<a name="line.349"></a>
+<span class="sourceLineNo">350</span> if (isSeq(session, r)) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType, pMeta);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> } else if (isBag(session, r)) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType, pMeta);<a name="line.353"></a>
+<span class="sourceLineNo">354</span> } else if (r.canAs(RDFList.class)) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType, pMeta);<a name="line.355"></a>
+<span class="sourceLineNo">356</span> } else {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> throw new ParseException("Unrecognized node type ''{0}'' for collection", n);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> if (sType.isArray() || sType.isArgs())<a name="line.359"></a>
+<span class="sourceLineNo">360</span> o = session.toArray(sType, (Collection)o);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> Resource r = n.asResource();<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (session.wasAlreadyProcessed(r))<a name="line.363"></a>
+<span class="sourceLineNo">364</span> return null;<a name="line.364"></a>
+<span class="sourceLineNo">365</span> BeanMap<?> bm = session.newBeanMap(outer, sType.getInnerClass());<a name="line.365"></a>
+<span class="sourceLineNo">366</span> o = parseIntoBeanMap(session, r, bm).getBean();<a name="line.366"></a>
+<span class="sourceLineNo">367</span> } else if (sType.isUri() && n.isResource()) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));<a name="line.368"></a>
+<span class="sourceLineNo">369</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));<a name="line.370"></a>
+<span class="sourceLineNo">371</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass()));<a name="line.372"></a>
+<span class="sourceLineNo">373</span> } else if (n.isResource()) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> Resource r = n.asResource();<a name="line.374"></a>
+<span class="sourceLineNo">375</span> Map m = new ObjectMap(session);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.377"></a>
+<span class="sourceLineNo">378</span> o = session.cast((ObjectMap)m, pMeta, eType);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> else<a name="line.379"></a>
+<span class="sourceLineNo">380</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.380"></a>
+<span class="sourceLineNo">381</span> } else {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (transform != null && o != null)<a name="line.385"></a>
+<span class="sourceLineNo">386</span> o = transform.unswap(session, o, eType);<a name="line.386"></a>
+<span class="sourceLineNo">387</span><a name="line.387"></a>
+<span class="sourceLineNo">388</span> if (outer != null)<a name="line.388"></a>
+<span class="sourceLineNo">389</span> setParent(eType, o, outer);<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> return (T)o;<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> private static boolean isSeq(RdfParserSession session, RDFNode n) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (n.isResource()) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.396"></a>
+<span class="sourceLineNo">397</span> if (st != null)<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return RDF_SEQ.equals(st.getResource().getURI());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> return false;<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> private static boolean isBag(RdfParserSession session, RDFNode n) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> if (n.isResource()) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if (st != null)<a name="line.406"></a>
+<span class="sourceLineNo">407</span> return RDF_BAG.equals(st.getResource().getURI());<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span> return false;<a name="line.409"></a>
+<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span> private Object getValue(RdfParserSession session, RDFNode n, Object outer) throws Exception {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> if (n.isLiteral())<a name="line.413"></a>
+<span class="sourceLineNo">414</span> return n.asLiteral().getValue();<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (n.isResource()) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> Statement st = n.asResource().getProperty(session.getValueProperty());<a name="line.416"></a>
+<span class="sourceLineNo">417</span> if (st != null) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> n = st.getObject();<a name="line.418"></a>
+<span class="sourceLineNo">419</span> if (n.isLiteral())<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return n.asLiteral().getValue();<a name="line.420"></a>
+<span class="sourceLineNo">421</span> return parseAnything(session, object(), st.getObject(), outer, null);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span> }<a name="line.423"></a>
+<span class="sourceLineNo">424</span> throw new ParseException(session, "Unknown value type for node ''{0}''", n);<a name="line.424"></a>
+<span class="sourceLineNo">425</span> }<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> private <K,V> Map<K,V> parseIntoMap(RdfParserSession session, Resource r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> // Add URI as "uri" to generic maps.<a name="line.428"></a>
+<span class="sourceLineNo">429</span> if (r.getURI() != null) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> K uri = convertAttrToType(session, m, "uri", keyType);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> V value = convertAttrToType(session, m, r.getURI(), valueType);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> m.put(uri, value);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> for (StmtIterator i = r.listProperties(); i.hasNext();) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> Statement st = i.next();<a name="line.435"></a>
+<span class="sourceLineNo">436</span> Property p = st.getPredicate();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> String key = p.getLocalName();<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (! (key.equals("root") && p.getURI().equals(session.getJuneauNsUri()))) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> key = session.decodeString(key);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> RDFNode o = st.getObject();<a name="line.440"></a>
+<span class="sourceLineNo">441</span> K key2 = convertAttrToType(session, m, key, keyType);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> V value = parseAnything(session, valueType, o, m, pMeta);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> setName(valueType, value, key);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> m.put(key2, value);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> }<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span> return m;<a name="line.448"></a>
+<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> @SuppressWarnings("unchecked")<a name="line.451"></a>
+<span class="sourceLineNo">452</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, Container c, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> int argIndex = 0;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> for (NodeIterator ni = c.iterator(); ni.hasNext();) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> E e = (E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), ni.next(), l, pMeta);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> l.add(e);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return l;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span> @SuppressWarnings("unchecked")<a name="line.461"></a>
+<span class="sourceLineNo">462</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, RDFList list, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> int argIndex = 0;<a name="line.463"></a>
+<span class="sourceLineNo">464</span> for (ExtendedIterator<RDFNode> ni = list.iterator(); ni.hasNext();) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> E e = (E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), ni.next(), l, pMeta);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> l.add(e);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span> return l;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> }<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span> <a name="line.471"></a>
+<span class="sourceLineNo">472</span> //--------------------------------------------------------------------------------<a name="line.472"></a>
+<span class="sourceLineNo">473</span> // Entry point methods<a name="line.473"></a>
+<span class="sourceLineNo">474</span> //--------------------------------------------------------------------------------<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span> @Override /* Parser */<a name="line.476"></a>
+<span class="sourceLineNo">477</span> public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span> return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.478"></a>
+<span class="sourceLineNo">479</span> }<a name="line.479"></a>
+<span class="sourceLineNo">480</span>}<a name="line.480"></a>
[31/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParser.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParser.html
index 52457c5..cb4ad2e 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParser.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParser.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -266,13 +266,6 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
</td>
</tr>
<tr id="i3" class="rowColor">
-<td class="colFirst"><code>protected <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></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)</code>
-<div class="block">Implementation method.</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
<td class="colFirst"><code>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
@@ -281,27 +274,27 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
<div class="block">Implementation method.</div>
</td>
</tr>
-<tr id="i5" class="rowColor">
+<tr id="i4" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html#getOverrideProperties--">getOverrideProperties</a></span>()</code>
<div class="block">Method used by subclasses to override context factory properties for just this
instance without modifying the context factory itself.</div>
</td>
</tr>
-<tr id="i6" class="altColor">
+<tr id="i5" class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html#parseIntoSimpleMap-java.lang.String-">parseIntoSimpleMap</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> qs)</code>
<div class="block">Parse a URL query string into a simple map of key/value pairs.</div>
</td>
</tr>
-<tr id="i7" class="rowColor">
+<tr id="i6" class="altColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html#parseParameter-java.lang.CharSequence-java.lang.Class-">parseParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a> in,
<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><T> type)</code>
<div class="block">Parses a single query parameter value into the specified class type.</div>
</td>
</tr>
-<tr id="i8" class="altColor">
+<tr id="i7" class="rowColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html#parseParameter-java.lang.CharSequence-org.apache.juneau.ClassMeta-">parseParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a> in,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> type)</code>
@@ -309,7 +302,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
been converted to a <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> object.</div>
</td>
</tr>
-<tr id="i9" class="rowColor">
+<tr id="i8" class="altColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html#parseParameter-java.lang.CharSequence-java.lang.reflect.Type-java.lang.reflect.Type...-">parseParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a> in,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
@@ -337,7 +330,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.
ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.
apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
@@ -452,7 +445,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>parseIntoSimpleMap</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.336">parseIntoSimpleMap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> qs)
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.342">parseIntoSimpleMap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> qs)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Parse a URL query string into a simple map of key/value pairs.</div>
<dl>
@@ -471,7 +464,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>parseParameter</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.500">parseParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a> in,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.433">parseParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a> in,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -497,7 +490,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>parseParameter</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.524">parseParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a> in,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.457">parseParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a> in,
<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><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Parses a single query parameter value into the specified class type.</div>
@@ -518,7 +511,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>parseParameter</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.549">parseParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a> in,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.482">parseParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a> in,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html#parseParameter-java.lang.CharSequence-java.lang.reflect.Type-java.lang.reflect.Type...-"><code>parseParameter(CharSequence, Type, Type...)</code></a> except the type has already
@@ -540,7 +533,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParserSession.html" title="class in org.apache.juneau.urlencoding">UrlEncodingParserSession</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.571">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
+<pre>public <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParserSession.html" title="class in org.apache.juneau.urlencoding">UrlEncodingParserSession</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.504">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> op,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> javaMethod,
<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> outer,
@@ -578,7 +571,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doParse</h4>
-<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.576">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.509">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> type)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">Parser</a></code></span></div>
@@ -601,39 +594,13 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
</dl>
</li>
</ul>
-<a name="doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>doParseArgs</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[] <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.584">doParseArgs</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">Parser</a></code></span></div>
-<div class="block">Implementation method.
- Default implementation throws an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/UnsupportedOperationException.html?is-external=true" title="class or interface in java.lang"><code>UnsupportedOperationException</code></a>.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/uon/UonParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></code> in class <code><a href="../../../../org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon">UonParser</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The runtime session object returned by <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-"><code>Parser.createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</code></a>.
- If <jk>null</jk>, one will be created using <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-"><code>Parser.createSession(Object)</code></a>.</dd>
-<dd><code>argTypes</code> - Specifies the type of objects to create for each entry in the array.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>An array of parsed objects.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code> - If thrown from underlying stream, or if the input contains a syntax error or is malformed.</dd>
-</dl>
-</li>
-</ul>
<a name="doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>doParseIntoMap</h4>
-<pre>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.592">doParseIntoMap</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html#line.517">doParseIntoMap</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> keyType,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> valueType)
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParserSession.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParserSession.html
index 553a251..bfd3829 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParserSession.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParserSession.html
@@ -203,7 +203,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParserSession.html" title=
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
index 7559222..db285bc 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/urlencoding/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/package-summary.html b/content/site/apidocs/org/apache/juneau/urlencoding/package-summary.html
index 46fa2e5..32f0335 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/package-summary.html
@@ -1115,11 +1115,11 @@
// Consists of an in-memory address book repository.</jc>
<ja>@RestResource</ja>(
messages=<js>"nls/AddressBookResource"</js>,
+ title=<js>"$L{title}"</js>,
+ description=<js>"$L{description}"</js>,
+ pageLinks=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>,
properties={
- <ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_useWhitespace</jsf>, value=<js>"true"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, value=<js>"$L{title}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"$L{description}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>)
+ <ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_useWhitespace</jsf>, value=<js>"true"</js>)
},
encoders=GzipEncoder.<jk>class</jk>
)
@@ -1148,8 +1148,8 @@
<p class='bcode'>
<jc>// GET person request handler</jc>
<ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/people/{id}/*"</js>, rc={200,404})
- <jk>public</jk> Person getPerson(RestRequest req, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
- properties.put(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, req.getPathInfo());
+ <jk>public</jk> Person getPerson(RestRequest req, RestResponse res, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
+ res.setPageTitle(req.getPathInfo());
<jk>return</jk> findPerson(id);
}
@@ -1208,8 +1208,8 @@
<ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_useWhitespace</jsf>, value=<js>"true"</js>)
}
)
- <jk>public</jk> Person getPerson(RestRequest req, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
- properties.put(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, req.getPathInfo());
+ <jk>public</jk> Person getPerson(RestRequest req, RestResponse res, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
+ res.setPageTitle(req.getPathInfo());
<jk>return</jk> findPerson(id);
}
</p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/utils/Args.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/Args.html b/content/site/apidocs/org/apache/juneau/utils/Args.html
index 8b43ffe..3a8e25e 100644
--- a/content/site/apidocs/org/apache/juneau/utils/Args.html
+++ b/content/site/apidocs/org/apache/juneau/utils/Args.html
@@ -48,8 +48,8 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li>Prev Class</li>
-<li><a href="../../../../org/apache/juneau/utils/IOPipe.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/utils/Args.html" target="_top">Frames</a></li>
@@ -538,8 +538,8 @@ extends <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in o
</div>
<div class="subNav">
<ul class="navList">
-<li>Prev Class</li>
-<li><a href="../../../../org/apache/juneau/utils/IOPipe.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/utils/Args.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/utils/IOPipe.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/IOPipe.html b/content/site/apidocs/org/apache/juneau/utils/IOPipe.html
index 1cdf2f2..deacc7d 100644
--- a/content/site/apidocs/org/apache/juneau/utils/IOPipe.html
+++ b/content/site/apidocs/org/apache/juneau/utils/IOPipe.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/utils/IOPipe.LineProcessor.html" title="interface in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -389,7 +389,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/utils/IOPipe.LineProcessor.html" title="interface in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html b/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
index 4186fdb..a8c014b 100644
--- a/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
+++ b/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/utils/PojoIntrospector.html#line.32">PojoIntrospector</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/utils/PojoIntrospector.html#line.31">PojoIntrospector</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">Used to invoke methods on <code>Objects</code> using arguments in serialized form.
@@ -202,7 +202,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>PojoIntrospector</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/utils/PojoIntrospector.html#line.43">PojoIntrospector</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o,
+<pre>public <a href="../../../../src-html/org/apache/juneau/utils/PojoIntrospector.html#line.42">PojoIntrospector</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o,
<a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="class in org.apache.juneau.parser">ReaderParser</a> p)</pre>
<div class="block">Constructor.</div>
<dl>
@@ -218,7 +218,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>PojoIntrospector</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/utils/PojoIntrospector.html#line.55">PojoIntrospector</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/utils/PojoIntrospector.html#line.54">PojoIntrospector</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
<div class="block">Shortcut for calling <code><jk>new</jk> PojoIntrospector(o, <jk>null</jk>);</code></div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -240,7 +240,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>invokeMethod</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/utils/PojoIntrospector.html#line.79">invokeMethod</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> method,
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/utils/PojoIntrospector.html#line.78">invokeMethod</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> method,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/InvocationTargetException.html?is-external=true" title="class or interface in java.lang.reflect">InvocationTargetException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a>,
@@ -277,7 +277,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>invokeMethod</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/utils/PojoIntrospector.html#line.108">invokeMethod</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> method,
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/utils/PojoIntrospector.html#line.106">invokeMethod</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> method,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/NoSuchMethodException.html?is-external=true" title="class or interface in java.lang">NoSuchMethodException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a>,
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/utils/ProcBuilder.Matcher.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/ProcBuilder.Matcher.html b/content/site/apidocs/org/apache/juneau/utils/ProcBuilder.Matcher.html
index 2492e8f..fc15aa5 100644
--- a/content/site/apidocs/org/apache/juneau/utils/ProcBuilder.Matcher.html
+++ b/content/site/apidocs/org/apache/juneau/utils/ProcBuilder.Matcher.html
@@ -43,7 +43,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/utils/ProcBuilder.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/ZipFileList.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/utils/ProcBuilder.Matcher.html" target="_top">Frames</a></li>
@@ -196,7 +196,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/utils/ProcBuilder.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/ZipFileList.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/utils/ProcBuilder.Matcher.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/utils/ZipFileList.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/ZipFileList.html b/content/site/apidocs/org/apache/juneau/utils/ZipFileList.html
index 7b87086..a03caa9 100644
--- a/content/site/apidocs/org/apache/juneau/utils/ZipFileList.html
+++ b/content/site/apidocs/org/apache/juneau/utils/ZipFileList.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/ProcBuilder.Matcher.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/utils/ZipFileList.FileEntry.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -403,7 +403,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedList.h
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/ProcBuilder.Matcher.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/utils/ZipFileList.FileEntry.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/utils/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-frame.html b/content/site/apidocs/org/apache/juneau/utils/package-frame.html
index 1f35854..e5748e6 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-frame.html
@@ -18,7 +18,10 @@
</ul>
<h2 title="Classes">Classes</h2>
<ul title="Classes">
+<li><a href="AList.html" title="class in org.apache.juneau.utils" target="classFrame">AList</a></li>
+<li><a href="AMap.html" title="class in org.apache.juneau.utils" target="classFrame">AMap</a></li>
<li><a href="Args.html" title="class in org.apache.juneau.utils" target="classFrame">Args</a></li>
+<li><a href="ASet.html" title="class in org.apache.juneau.utils" target="classFrame">ASet</a></li>
<li><a href="IOPipe.html" title="class in org.apache.juneau.utils" target="classFrame">IOPipe</a></li>
<li><a href="ManifestFile.html" title="class in org.apache.juneau.utils" target="classFrame">ManifestFile</a></li>
<li><a href="MessageBundle.html" title="class in org.apache.juneau.utils" target="classFrame">MessageBundle</a></li>
@@ -29,6 +32,8 @@
<li><a href="PojoRest.html" title="class in org.apache.juneau.utils" target="classFrame">PojoRest</a></li>
<li><a href="ProcBuilder.html" title="class in org.apache.juneau.utils" target="classFrame">ProcBuilder</a></li>
<li><a href="ProcBuilder.Matcher.html" title="class in org.apache.juneau.utils" target="classFrame">ProcBuilder.Matcher</a></li>
+<li><a href="StringMessage.html" title="class in org.apache.juneau.utils" target="classFrame">StringMessage</a></li>
+<li><a href="StringObject.html" title="class in org.apache.juneau.utils" target="classFrame">StringObject</a></li>
<li><a href="ZipFileList.html" title="class in org.apache.juneau.utils" target="classFrame">ZipFileList</a></li>
<li><a href="ZipFileList.FileEntry.html" title="class in org.apache.juneau.utils" target="classFrame">ZipFileList.FileEntry</a></li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/utils/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-summary.html b/content/site/apidocs/org/apache/juneau/utils/package-summary.html
index bca9a41..1157039 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-summary.html
@@ -109,80 +109,110 @@
</tr>
<tbody>
<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/utils/AList.html" title="class in org.apache.juneau.utils">AList</a><T></td>
+<td class="colLast">
+<div class="block">An extension of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedList.html?is-external=true" title="class or interface in java.util"><code>LinkedList</code></a> with a convenience <a href="../../../../org/apache/juneau/utils/AList.html#append-T-"><code>AList.append(Object)</code></a> method.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils">AMap</a><K,V></td>
+<td class="colLast">
+<div class="block">An extension of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMap.html?is-external=true" title="class or interface in java.util"><code>LinkedHashMap</code></a> with a convenience <a href="../../../../org/apache/juneau/utils/AMap.html#append-K-V-"><code>AMap.append(Object,Object)</code></a> method.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils">Args</a></td>
<td class="colLast">
<div class="block">Utility class to make it easier to work with command-line arguments pass in through a <code>main(String[] args)</code> method.</div>
</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils">ASet</a><T></td>
+<td class="colLast">
+<div class="block">An extension of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashSet.html?is-external=true" title="class or interface in java.util"><code>LinkedHashSet</code></a> with a convenience <a href="../../../../org/apache/juneau/utils/ASet.html#append-T-"><code>ASet.append(Object)</code></a> method.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/IOPipe.html" title="class in org.apache.juneau.utils">IOPipe</a></td>
<td class="colLast">
<div class="block">A utility class for piping input streams and readers to output streams and writers.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils">ManifestFile</a></td>
<td class="colLast">
<div class="block">Utility class for working with Jar manifest files.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a></td>
<td class="colLast">
<div class="block">Wraps a <a href="http://docs.oracle.com/javase/7/docs/api/java/util/ResourceBundle.html?is-external=true" title="class or interface in java.util"><code>ResourceBundle</code></a> to provide some useful additional functionality.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/MetadataMap.html" title="class in org.apache.juneau.utils">MetadataMap</a></td>
<td class="colLast">
<div class="block">Utility class for quick lookup of class metadata instances.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ObjectUtils.html" title="class in org.apache.juneau.utils">ObjectUtils</a></td>
<td class="colLast">
<div class="block">Utility class for efficiently converting objects between types.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils">PojoIntrospector</a></td>
<td class="colLast">
<div class="block">Used to invoke methods on <code>Objects</code> using arguments in serialized form.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils">PojoQuery</a></td>
<td class="colLast">
<div class="block">Designed to provide query/view/sort/paging filtering on tabular in-memory POJO models.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils">PojoRest</a></td>
<td class="colLast">
<div class="block">Provides the ability to perform standard REST operations (GET, PUT, POST, DELETE) against
nodes in a POJO model.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ProcBuilder.html" title="class in org.apache.juneau.utils">ProcBuilder</a></td>
<td class="colLast">
<div class="block">Utility class for running operating system processes.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ProcBuilder.Matcher.html" title="class in org.apache.juneau.utils">ProcBuilder.Matcher</a></td>
<td class="colLast">
<div class="block">Specifies interface for defining OS-specific commands.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></td>
+<td class="colLast">
+<div class="block">An encapsulated MessageFormat-style string and arguments.</div>
+</td>
+</tr>
<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></td>
+<td class="colLast">
+<div class="block">A serializer/object pair used for delayed object serialization.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ZipFileList.html" title="class in org.apache.juneau.utils">ZipFileList</a></td>
<td class="colLast">
<div class="block">Utility class for representing the contents of a zip file as a list of entries
whose contents don't resolve until serialize time.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ZipFileList.FileEntry.html" title="class in org.apache.juneau.utils">ZipFileList.FileEntry</a></td>
<td class="colLast">
<div class="block">ZipFileList entry for File entry types.</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/utils/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-tree.html b/content/site/apidocs/org/apache/juneau/utils/package-tree.html
index 9ee1f0d..4249f21 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-tree.html
@@ -88,6 +88,7 @@
<ul>
<li type="circle">java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedList.html?is-external=true" title="class or interface in java.util"><span class="typeNameLink">LinkedList</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a><E>, java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><E>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
+<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/AList.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">AList</span></a><T></li>
<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/ZipFileList.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">ZipFileList</span></a></li>
</ul>
</li>
@@ -95,6 +96,19 @@
</li>
</ul>
</li>
+<li type="circle">java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractSet.html?is-external=true" title="class or interface in java.util"><span class="typeNameLink">AbstractSet</span></a><E> (implements java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><E>)
+<ul>
+<li type="circle">java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/HashSet.html?is-external=true" title="class or interface in java.util"><span class="typeNameLink">HashSet</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><E>)
+<ul>
+<li type="circle">java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashSet.html?is-external=true" title="class or interface in java.util"><span class="typeNameLink">LinkedHashSet</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><E>)
+<ul>
+<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">ASet</span></a><T></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
</ul>
</li>
<li type="circle">java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true" title="class or interface in java.util"><span class="typeNameLink">AbstractMap</span></a><K,V> (implements java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V>)
@@ -103,6 +117,7 @@
<ul>
<li type="circle">java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMap.html?is-external=true" title="class or interface in java.util"><span class="typeNameLink">LinkedHashMap</span></a><K,V> (implements java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V>)
<ul>
+<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">AMap</span></a><K,V></li>
<li type="circle">org.apache.juneau.<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><span class="typeNameLink">ObjectMap</span></a>
<ul>
<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Args</span></a></li>
@@ -128,6 +143,8 @@
<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">MessageBundle</span></a></li>
</ul>
</li>
+<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">StringMessage</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>, org.apache.juneau.<a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>)</li>
+<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">StringObject</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>, org.apache.juneau.<a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>)</li>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Throwable</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Exception</span></a>
[38/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/rest/RestContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestContext.html b/content/site/apidocs/org/apache/juneau/rest/RestContext.html
index 87c50ed..1a4ed4d 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestContext.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestContext.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -413,43 +413,61 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
</td>
</tr>
<tr id="i23" 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/RestContext.html#getPageLinks--">getPageLinks</a></span>()</code>
+<div class="block">Returns the page links as defined by the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageLinks--"><code>RestResource.pageLinks()</code></a> annotation or <a href="../../../../org/apache/juneau/rest/RestConfig.html#setPageLinks-java.lang.String-"><code>RestConfig.setPageLinks(String)</code></a> method.</div>
+</td>
+</tr>
+<tr id="i24" 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/RestContext.html#getPageText--">getPageText</a></span>()</code>
+<div class="block">Returns the page text as defined by the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageText--"><code>RestResource.pageText()</code></a> annotation or <a href="../../../../org/apache/juneau/rest/RestConfig.html#setPageText-java.lang.String-"><code>RestConfig.setPageText(String)</code></a> method.</div>
+</td>
+</tr>
+<tr id="i25" 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/RestContext.html#getPageTitle--">getPageTitle</a></span>()</code>
+<div class="block">Returns the page title as defined by the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageTitle--"><code>RestResource.pageTitle()</code></a> annotation or <a href="../../../../org/apache/juneau/rest/RestConfig.html#setPageTitle-java.lang.String-"><code>RestConfig.setPageTitle(String)</code></a> method.</div>
+</td>
+</tr>
+<tr id="i26" class="altColor">
<td class="colFirst"><code>protected <a href="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/RestContext.html#getParamFormat--">getParamFormat</a></span>()</code>
<div class="block">Returns the value of the <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_paramFormat"><code>REST_paramFormat</code></a> setting.</div>
</td>
</tr>
-<tr id="i24" class="altColor">
+<tr id="i27" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/parser/ParserGroup.html" title="class in org.apache.juneau.parser">ParserGroup</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getParsers--">getParsers</a></span>()</code>
<div class="block">Returns the parsers registered with this resource.</div>
</td>
</tr>
-<tr id="i25" class="rowColor">
+<tr id="i28" 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/RestContext.html#getPath--">getPath</a></span>()</code>
<div class="block">Returns the path for this resource as defined by the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#path--"><code>RestResource.path()</code></a> annotation or <a href="../../../../org/apache/juneau/rest/RestConfig.html#setPath-java.lang.String-"><code>RestConfig.setPath(String)</code></a> method
concatenated with those on all parent classes.</div>
</td>
</tr>
-<tr id="i26" class="altColor">
+<tr id="i29" class="rowColor">
<td class="colFirst"><code>protected <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/RestContext.html#getPojoSwaps--">getPojoSwaps</a></span>()</code>
<div class="block">Returns the POJO swaps associated with this resource.</div>
</td>
</tr>
-<tr id="i27" class="rowColor">
+<tr id="i30" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getProperties--">getProperties</a></span>()</code>
<div class="block">Returns the class-level properties associated with this servlet.</div>
</td>
</tr>
-<tr id="i28" class="altColor">
+<tr id="i31" class="rowColor">
<td class="colFirst"><code>protected <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></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getResource--">getResource</a></span>()</code>
<div class="block">Returns the resource object.</div>
</td>
</tr>
-<tr id="i29" class="rowColor">
+<tr id="i32" class="altColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getResource-java.lang.Class-org.apache.juneau.MediaType-java.lang.String-java.util.Locale-">getResource</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> c,
<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a> mediaType,
@@ -459,7 +477,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
using the parser matched by the specified media type.</div>
</td>
</tr>
-<tr id="i30" class="altColor">
+<tr id="i33" class="rowColor">
<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getResource-java.lang.String-java.util.Locale-">getResource</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a> locale)</code>
@@ -467,110 +485,110 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
on this class, searches up the parent hierarchy chain.</div>
</td>
</tr>
-<tr id="i31" class="rowColor">
+<tr id="i34" 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/RestContext.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a> locale)</code>
<div class="block">Reads the input stream from <a href="../../../../org/apache/juneau/rest/RestContext.html#getResource-java.lang.String-java.util.Locale-"><code>getResource(String, Locale)</code></a> into a String.</div>
</td>
</tr>
-<tr id="i32" class="altColor">
+<tr id="i35" class="rowColor">
<td class="colFirst"><code>protected <a href="../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getResponseHandlers--">getResponseHandlers</a></span>()</code>
<div class="block">Returns the response handlers associated with this resource.</div>
</td>
</tr>
-<tr id="i33" class="rowColor">
+<tr id="i36" class="altColor">
<td class="colFirst"><code>protected <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getRestServlet--">getRestServlet</a></span>()</code>
<div class="block">Returns the resource object as a <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a>.</div>
</td>
</tr>
-<tr id="i34" class="altColor">
+<tr id="i37" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getSerializers--">getSerializers</a></span>()</code>
<div class="block">Returns the serializers registered with this resource.</div>
</td>
</tr>
-<tr id="i35" class="rowColor">
+<tr id="i38" 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/RestContext.html#getServletInitParameter-java.lang.String-">getServletInitParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</code>
<div class="block">Returns the servlet init parameter returned by <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true#getInitParameter-java.lang.String-" title="class or interface in javax.servlet"><code>ServletConfig.getInitParameter(String)</code></a>.</div>
</td>
</tr>
-<tr id="i36" class="altColor">
+<tr id="i39" class="rowColor">
<td class="colFirst"><code>protected int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getStackTraceOccurrence-java.lang.Throwable-">getStackTraceOccurrence</a></span>(<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> e)</code>
<div class="block">Returns the number of times this exception was thrown based on a hash of its stacktrace.</div>
</td>
</tr>
-<tr id="i37" class="rowColor">
+<tr id="i40" class="altColor">
<td class="colFirst"><code>protected <a href="../../../../org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest">StreamResource</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getStyleSheet--">getStyleSheet</a></span>()</code>
<div class="block">Returns the stylesheet for use in the HTML views of the resource.</div>
</td>
</tr>
-<tr id="i38" class="altColor">
+<tr id="i41" class="rowColor">
<td class="colFirst"><code>protected <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getSupportedAcceptTypes--">getSupportedAcceptTypes</a></span>()</code>
<div class="block">Returns the explicit list of supported accept types for this resource.</div>
</td>
</tr>
-<tr id="i39" class="rowColor">
+<tr id="i42" class="altColor">
<td class="colFirst"><code>protected <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getSupportedContentTypes--">getSupportedContentTypes</a></span>()</code>
<div class="block">Returns the explicit list of supported content types for this resource.</div>
</td>
</tr>
-<tr id="i40" class="altColor">
+<tr id="i43" class="rowColor">
<td class="colFirst"><code>protected <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html" title="class in org.apache.juneau.urlencoding">UrlEncodingParser</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getUrlEncodingParser--">getUrlEncodingParser</a></span>()</code>
<div class="block">Returns the URL-encoding parser associated with this resource.</div>
</td>
</tr>
-<tr id="i41" class="rowColor">
+<tr id="i44" class="altColor">
<td class="colFirst"><code>protected <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getUrlEncodingSerializer--">getUrlEncodingSerializer</a></span>()</code>
<div class="block">Returns the URL-encoding serializer associated with this resource.</div>
</td>
</tr>
-<tr id="i42" class="altColor">
+<tr id="i45" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#getVarResolver--">getVarResolver</a></span>()</code>
<div class="block">Returns the variable resolver for this servlet.</div>
</td>
</tr>
-<tr id="i43" class="rowColor">
+<tr id="i46" class="altColor">
<td class="colFirst"><code>protected boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#hasChildResources--">hasChildResources</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this resource has any child resources associated with it.</div>
</td>
</tr>
-<tr id="i44" class="altColor">
+<tr id="i47" class="rowColor">
<td class="colFirst"><code>protected boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#isAllowBodyParam--">isAllowBodyParam</a></span>()</code>
<div class="block">Returns the value of the <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_allowBodyParam"><code>REST_allowBodyParam</code></a> setting.</div>
</td>
</tr>
-<tr id="i45" class="rowColor">
+<tr id="i48" class="altColor">
<td class="colFirst"><code>protected boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#isAllowHeaderParams--">isAllowHeaderParams</a></span>()</code>
<div class="block">Returns the value of the <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_allowHeaderParams"><code>REST_allowHeaderParams</code></a> setting.</div>
</td>
</tr>
-<tr id="i46" class="altColor">
+<tr id="i49" class="rowColor">
<td class="colFirst"><code>protected boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#isRenderResponseStackTraces--">isRenderResponseStackTraces</a></span>()</code>
<div class="block">Returns the value of the <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_renderResponseStackTraces"><code>REST_renderResponseStackTraces</code></a> setting.</div>
</td>
</tr>
-<tr id="i47" class="rowColor">
+<tr id="i50" class="altColor">
<td class="colFirst"><code>protected boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#isStaticFile-java.lang.String-">isStaticFile</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p)</code>
<div class="block">Returns <jk>true</jk> if the specified path refers to a static file.</div>
</td>
</tr>
-<tr id="i48" class="altColor">
+<tr id="i51" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest">StreamResource</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.html#resolveStaticFile-java.lang.String-">resolveStaticFile</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pathInfo)</code>
<div class="block">Resolve a static resource file.</div>
@@ -1001,7 +1019,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockListLast">
<li class="blockList">
<h4>RestContext</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.342">RestContext</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> resource,
+<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.344">RestContext</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> resource,
<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Constructor.</div>
@@ -1028,7 +1046,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getVarResolver</h4>
-<pre>public <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.742">getVarResolver</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.751">getVarResolver</a>()</pre>
<div class="block">Returns the variable resolver for this servlet.
<p>
Variable resolvers are used to replace variables in property values.
@@ -1057,7 +1075,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
properties={
<ja>@Property</ja>(
name=<jsf>HTMLDOC_links</jsf>,
- value=<js>"{up:'$R{requestParentURI}', options:'?method=OPTIONS', editLevel:'$R{servletURI}/editLevel?logger=$R{attribute.name}'}"</js>
+ value=<js>"{up:'$R{requestParentURI}', options:'?method=OPTIONS', editLevel:'editLevel?logger=$R{attribute.name}'}"</js>
)
}
)
@@ -1077,7 +1095,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getConfigFile</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.757">getConfigFile</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.766">getConfigFile</a>()</pre>
<div class="block">Returns the config file associated with this servlet.
<p>
The config file is identified via one of the following:
@@ -1097,7 +1115,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>resolveStaticFile</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest">StreamResource</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.774">resolveStaticFile</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pathInfo)
+<pre>public <a href="../../../../org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest">StreamResource</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.783">resolveStaticFile</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pathInfo)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Resolve a static resource file.
<p>
@@ -1122,7 +1140,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getResource</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.826">getResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.835">getResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a> locale)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Same as <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true#getResourceAsStream-java.lang.String-" title="class or interface in java.lang"><code>Class.getResourceAsStream(String)</code></a> except if it doesn't find the resource
@@ -1156,7 +1174,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getResourceAsString</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/RestContext.html#line.859">getResourceAsString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="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/RestContext.html#line.868">getResourceAsString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a> locale)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Reads the input stream from <a href="../../../../org/apache/juneau/rest/RestContext.html#getResource-java.lang.String-java.util.Locale-"><code>getResource(String, Locale)</code></a> into a String.</div>
@@ -1177,7 +1195,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getResource</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.884">getResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> c,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.893">getResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> c,
<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a> mediaType,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a> locale)
@@ -1207,7 +1225,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getPath</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/RestContext.html#line.915">getPath</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.924">getPath</a>()</pre>
<div class="block">Returns the path for this resource as defined by the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#path--"><code>RestResource.path()</code></a> annotation or <a href="../../../../org/apache/juneau/rest/RestConfig.html#setPath-java.lang.String-"><code>RestConfig.setPath(String)</code></a> method
concatenated with those on all parent classes.
<p>
@@ -1220,13 +1238,55 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
</dl>
</li>
</ul>
+<a name="getPageTitle--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPageTitle</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/RestContext.html#line.933">getPageTitle</a>()</pre>
+<div class="block">Returns the page title as defined by the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageTitle--"><code>RestResource.pageTitle()</code></a> annotation or <a href="../../../../org/apache/juneau/rest/RestConfig.html#setPageTitle-java.lang.String-"><code>RestConfig.setPageTitle(String)</code></a> method.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The page title.</dd>
+</dl>
+</li>
+</ul>
+<a name="getPageText--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPageText</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/RestContext.html#line.942">getPageText</a>()</pre>
+<div class="block">Returns the page text as defined by the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageText--"><code>RestResource.pageText()</code></a> annotation or <a href="../../../../org/apache/juneau/rest/RestConfig.html#setPageText-java.lang.String-"><code>RestConfig.setPageText(String)</code></a> method.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The page text.</dd>
+</dl>
+</li>
+</ul>
+<a name="getPageLinks--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPageLinks</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/RestContext.html#line.951">getPageLinks</a>()</pre>
+<div class="block">Returns the page links as defined by the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageLinks--"><code>RestResource.pageLinks()</code></a> annotation or <a href="../../../../org/apache/juneau/rest/RestConfig.html#setPageLinks-java.lang.String-"><code>RestConfig.setPageLinks(String)</code></a> method.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The page links.</dd>
+</dl>
+</li>
+</ul>
<a name="getLogger--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>getLogger</h4>
-<pre>public <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/RestContext.html#line.930">getLogger</a>()</pre>
+<pre>public <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/RestContext.html#line.966">getLogger</a>()</pre>
<div class="block">Returns the logger to use for this resource.
<p>
The logger for a resource is defined via one of the following:
@@ -1246,7 +1306,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getMessages</h4>
-<pre>public <a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.944">getMessages</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.980">getMessages</a>()</pre>
<div class="block">Returns the resource bundle used by this resource.
<p>
The resource bundle is defined via one of the following:
@@ -1265,7 +1325,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getInfoProvider</h4>
-<pre>public <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/RestContext.html#line.959">getInfoProvider</a>()</pre>
+<pre>public <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/RestContext.html#line.995">getInfoProvider</a>()</pre>
<div class="block">Returns the REST information provider used by this resource.
<p>
The information provider is defined via one of the following:
@@ -1285,7 +1345,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getCallHandler</h4>
-<pre>protected <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/RestContext.html#line.974">getCallHandler</a>()</pre>
+<pre>protected <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/RestContext.html#line.1010">getCallHandler</a>()</pre>
<div class="block">Returns the REST call handler used by this resource.
<p>
The call handler is defined via one of the following:
@@ -1305,7 +1365,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getCallRouters</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,org.apache.juneau.rest.CallRouter> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.983">getCallRouters</a>()</pre>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,org.apache.juneau.rest.CallRouter> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1019">getCallRouters</a>()</pre>
<div class="block">Returns a map of HTTP method names to call routers.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1319,7 +1379,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getResource</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.995">getResource</a>()</pre>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1031">getResource</a>()</pre>
<div class="block">Returns the resource object.
<p>
This is the instance of the class annotated with the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestResource</code></a> annotation, usually
@@ -1336,7 +1396,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getRestServlet</h4>
-<pre>protected <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1005">getRestServlet</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1041">getRestServlet</a>()</pre>
<div class="block">Returns the resource object as a <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1351,7 +1411,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>checkForInitException</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1014">checkForInitException</a>()
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1050">checkForInitException</a>()
throws <a href="../../../../org/apache/juneau/rest/RestException.html" title="class in org.apache.juneau.rest">RestException</a></pre>
<div class="block">Throws a <a href="../../../../org/apache/juneau/rest/RestException.html" title="class in org.apache.juneau.rest"><code>RestException</code></a> if an exception occurred in the constructor of this object.</div>
<dl>
@@ -1366,7 +1426,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getBeanContext</h4>
-<pre>public <a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1024">getBeanContext</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1060">getBeanContext</a>()</pre>
<div class="block">Returns the <a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau"><code>BeanContext</code></a> object used for parsing path variables and header values.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1380,7 +1440,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getProperties</h4>
-<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1045">getProperties</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1081">getProperties</a>()</pre>
<div class="block">Returns the class-level properties associated with this servlet.
<p>
Properties at the class level are defined via one of the following:
@@ -1406,7 +1466,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getSerializers</h4>
-<pre>public <a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1060">getSerializers</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1096">getSerializers</a>()</pre>
<div class="block">Returns the serializers registered with this resource.
<p>
Serializers at the class level are defined via one of the following:
@@ -1426,7 +1486,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getParsers</h4>
-<pre>public <a href="../../../../org/apache/juneau/parser/ParserGroup.html" title="class in org.apache.juneau.parser">ParserGroup</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1075">getParsers</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/parser/ParserGroup.html" title="class in org.apache.juneau.parser">ParserGroup</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1111">getParsers</a>()</pre>
<div class="block">Returns the parsers registered with this resource.
<p>
Parsers at the class level are defined via one of the following:
@@ -1446,7 +1506,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getServletInitParameter</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/RestContext.html#line.1085">getServletInitParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<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/RestContext.html#line.1121">getServletInitParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Returns the servlet init parameter returned by <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true#getInitParameter-java.lang.String-" title="class or interface in javax.servlet"><code>ServletConfig.getInitParameter(String)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1462,7 +1522,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getChildResources</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1095">getChildResources</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1131">getChildResources</a>()</pre>
<div class="block">Returns the child resources associated with this servlet.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1477,7 +1537,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getStackTraceOccurrence</h4>
-<pre>protected int <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1106">getStackTraceOccurrence</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> e)</pre>
+<pre>protected int <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1142">getStackTraceOccurrence</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> e)</pre>
<div class="block">Returns the number of times this exception was thrown based on a hash of its stacktrace.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1494,7 +1554,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>isRenderResponseStackTraces</h4>
-<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1118">isRenderResponseStackTraces</a>()</pre>
+<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1154">isRenderResponseStackTraces</a>()</pre>
<div class="block">Returns the value of the <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_renderResponseStackTraces"><code>REST_renderResponseStackTraces</code></a> setting.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1508,7 +1568,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>isAllowHeaderParams</h4>
-<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1126">isAllowHeaderParams</a>()</pre>
+<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1162">isAllowHeaderParams</a>()</pre>
<div class="block">Returns the value of the <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_allowHeaderParams"><code>REST_allowHeaderParams</code></a> setting.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1522,7 +1582,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>isAllowBodyParam</h4>
-<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1134">isAllowBodyParam</a>()</pre>
+<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1170">isAllowBodyParam</a>()</pre>
<div class="block">Returns the value of the <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_allowBodyParam"><code>REST_allowBodyParam</code></a> setting.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1536,7 +1596,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getDefaultCharset</h4>
-<pre>protected <a href="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/RestContext.html#line.1142">getDefaultCharset</a>()</pre>
+<pre>protected <a href="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/RestContext.html#line.1178">getDefaultCharset</a>()</pre>
<div class="block">Returns the value of the <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_defaultCharset"><code>REST_defaultCharset</code></a> setting.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1550,7 +1610,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getParamFormat</h4>
-<pre>protected <a href="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/RestContext.html#line.1150">getParamFormat</a>()</pre>
+<pre>protected <a href="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/RestContext.html#line.1186">getParamFormat</a>()</pre>
<div class="block">Returns the value of the <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_paramFormat"><code>REST_paramFormat</code></a> setting.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1564,7 +1624,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getClientVersionHeader</h4>
-<pre>protected <a href="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/RestContext.html#line.1166">getClientVersionHeader</a>()</pre>
+<pre>protected <a href="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/RestContext.html#line.1202">getClientVersionHeader</a>()</pre>
<div class="block">Returns the name of the client version header name used by this resource.
<p>
The client version header is the name of the HTTP header on requests that identify a client version.
@@ -1585,7 +1645,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>allowMethodParam</h4>
-<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1177">allowMethodParam</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> m)</pre>
+<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1213">allowMethodParam</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> m)</pre>
<div class="block">Returns <jk>true</jk> if the specified <code>Method</code> GET parameter value can be used to override
the method name in the HTTP header.</div>
<dl>
@@ -1602,7 +1662,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getBeanFilters</h4>
-<pre>protected <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><?>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1192">getBeanFilters</a>()</pre>
+<pre>protected <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><?>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1228">getBeanFilters</a>()</pre>
<div class="block">Returns the bean filters associated with this resource.
<p>
Bean filters at the class level are defined via one of the following:
@@ -1622,7 +1682,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getPojoSwaps</h4>
-<pre>protected <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><?>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1207">getPojoSwaps</a>()</pre>
+<pre>protected <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><?>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1243">getPojoSwaps</a>()</pre>
<div class="block">Returns the POJO swaps associated with this resource.
<p>
POJO swaps at the class level are defined via one of the following:
@@ -1642,7 +1702,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getUrlEncodingParser</h4>
-<pre>protected <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html" title="class in org.apache.juneau.urlencoding">UrlEncodingParser</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1215">getUrlEncodingParser</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html" title="class in org.apache.juneau.urlencoding">UrlEncodingParser</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1251">getUrlEncodingParser</a>()</pre>
<div class="block">Returns the URL-encoding parser associated with this resource.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1656,7 +1716,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getUrlEncodingSerializer</h4>
-<pre>protected <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1223">getUrlEncodingSerializer</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1259">getUrlEncodingSerializer</a>()</pre>
<div class="block">Returns the URL-encoding serializer associated with this resource.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1670,7 +1730,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getEncoders</h4>
-<pre>protected <a href="../../../../org/apache/juneau/encoders/EncoderGroup.html" title="class in org.apache.juneau.encoders">EncoderGroup</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1240">getEncoders</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/encoders/EncoderGroup.html" title="class in org.apache.juneau.encoders">EncoderGroup</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1276">getEncoders</a>()</pre>
<div class="block">Returns the encoders associated with this resource.
<p>
Encoders are used to provide various types of encoding such as <code>gzip</code> encoding.
@@ -1692,7 +1752,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getSupportedAcceptTypes</h4>
-<pre>protected <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1252">getSupportedAcceptTypes</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1288">getSupportedAcceptTypes</a>()</pre>
<div class="block">Returns the explicit list of supported accept types for this resource.
<p>
By default, this is simply the list of accept types supported by the registered parsers, but
@@ -1709,7 +1769,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getSupportedContentTypes</h4>
-<pre>protected <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1264">getSupportedContentTypes</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1300">getSupportedContentTypes</a>()</pre>
<div class="block">Returns the explicit list of supported content types for this resource.
<p>
By default, this is simply the list of content types supported by the registered serializers, but
@@ -1726,7 +1786,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getDefaultRequestHeaders</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1281">getDefaultRequestHeaders</a>()</pre>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1317">getDefaultRequestHeaders</a>()</pre>
<div class="block">Returns the default request headers for this resource.
<p>
These are headers automatically added to requests if not present.
@@ -1748,7 +1808,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getDefaultResponseHeaders</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1298">getDefaultResponseHeaders</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1334">getDefaultResponseHeaders</a>()</pre>
<div class="block">Returns the default response headers for this resource.
<p>
These are headers automatically added to responses if not otherwise specified during the request.
@@ -1770,7 +1830,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getConverters</h4>
-<pre>protected <a href="../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1315">getConverters</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1351">getConverters</a>()</pre>
<div class="block">Returns the converters associated with this resource at the class level.
<p>
Converters are used to 'convert' POJOs from one form to another before being passed of to the response handlers.
@@ -1792,7 +1852,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getGuards</h4>
-<pre>protected <a href="../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1332">getGuards</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1368">getGuards</a>()</pre>
<div class="block">Returns the guards associated with this resource at the class level.
<p>
Guards are used to restrict access to resources.
@@ -1814,7 +1874,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getResponseHandlers</h4>
-<pre>protected <a href="../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1349">getResponseHandlers</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>[] <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1385">getResponseHandlers</a>()</pre>
<div class="block">Returns the response handlers associated with this resource.
<p>
Response handlers are used to convert POJOs returned by REST Java methods into actual HTTP responses.
@@ -1836,7 +1896,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getMediaTypeForName</h4>
-<pre>protected <a href="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/RestContext.html#line.1362">getMediaTypeForName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<pre>protected <a href="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/RestContext.html#line.1398">getMediaTypeForName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Returns the media type for the specified file name.
<p>
The list of MIME-type mappings can be augmented through the <a href="../../../../org/apache/juneau/rest/RestConfig.html#addMimeTypes-java.lang.String...-"><code>RestConfig.addMimeTypes(String...)</code></a> method.
@@ -1855,7 +1915,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getFavIcon</h4>
-<pre>protected <a href="../../../../org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest">StreamResource</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1379">getFavIcon</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest">StreamResource</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1415">getFavIcon</a>()</pre>
<div class="block">Returns the favicon of the resource.
<p>
This is the icon served up under <js>"/favicon.ico"</jk> recognized by browsers.
@@ -1877,7 +1937,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getStyleSheet</h4>
-<pre>protected <a href="../../../../org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest">StreamResource</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1396">getStyleSheet</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest">StreamResource</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1432">getStyleSheet</a>()</pre>
<div class="block">Returns the stylesheet for use in the HTML views of the resource.
<p>
This is the contents of the page served up under <js>"/styles.css"</jk>.
@@ -1899,7 +1959,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>isStaticFile</h4>
-<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1414">isStaticFile</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p)</pre>
+<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1450">isStaticFile</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p)</pre>
<div class="block">Returns <jk>true</jk> if the specified path refers to a static file.
<p>
Static files are files pulled from the classpath and served up directly to the browser.
@@ -1923,7 +1983,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>getCallMethods</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,org.apache.juneau.rest.CallMethod> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1425">getCallMethods</a>()</pre>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,org.apache.juneau.rest.CallMethod> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1461">getCallMethods</a>()</pre>
<div class="block">Returns the REST Java methods defined in this resource.
<p>
These are the methods annotated with the <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a> annotation.</div>
@@ -1939,7 +1999,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>destroy</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1432">destroy</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1468">destroy</a>()</pre>
<div class="block">Calls <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true#destroy--" title="class or interface in javax.servlet"><code>Servlet.destroy()</code></a> on any child resources defined on this resource.</div>
</li>
</ul>
@@ -1949,7 +2009,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockList">
<li class="blockList">
<h4>hasChildResources</h4>
-<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1444">hasChildResources</a>()</pre>
+<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1480">hasChildResources</a>()</pre>
<div class="block">Returns <jk>true</jk> if this resource has any child resources associated with it.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1963,7 +2023,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<ul class="blockListLast">
<li class="blockList">
<h4>getChildResource</h4>
-<pre>protected <a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1454">getChildResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</pre>
+<pre>protected <a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a> <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.1490">getChildResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</pre>
<div class="block">Returns the context of the child resource associated with the specified path.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
[14/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
index af626d1..9100ae9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
@@ -202,7 +202,7 @@
<span class="sourceLineNo">194</span> o = session.cast(m, pMeta, eType);<a name="line.194"></a>
<span class="sourceLineNo">195</span> } else {<a name="line.195"></a>
<span class="sourceLineNo">196</span> Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance() : new ObjectList(session));<a name="line.196"></a>
-<span class="sourceLineNo">197</span> o = parseIntoCollection2(session, r, l, sType.getElementType(), pMeta);<a name="line.197"></a>
+<span class="sourceLineNo">197</span> o = parseIntoCollection2(session, r, l, sType, pMeta);<a name="line.197"></a>
<span class="sourceLineNo">198</span> }<a name="line.198"></a>
<span class="sourceLineNo">199</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.199"></a>
<span class="sourceLineNo">200</span> BeanMap m = session.newBeanMap(outer, sType.getInnerClass());<a name="line.200"></a>
@@ -211,13 +211,13 @@
<span class="sourceLineNo">203</span> o = sType.newInstanceFromString(outer, parseString(session, r));<a name="line.203"></a>
<span class="sourceLineNo">204</span> } else if (sType.canCreateNewInstanceFromNumber(outer) && StringUtils.isFirstNumberChar((char)c)) {<a name="line.204"></a>
<span class="sourceLineNo">205</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(session, r, sType.getNewInstanceFromNumberClass()));<a name="line.205"></a>
-<span class="sourceLineNo">206</span> } else if (sType.isArray()) {<a name="line.206"></a>
+<span class="sourceLineNo">206</span> } else if (sType.isArray() || sType.isArgs()) {<a name="line.206"></a>
<span class="sourceLineNo">207</span> if (c == '{') {<a name="line.207"></a>
<span class="sourceLineNo">208</span> ObjectMap m = new ObjectMap(session);<a name="line.208"></a>
<span class="sourceLineNo">209</span> parseIntoMap2(session, r, m, string(), object(), pMeta);<a name="line.209"></a>
<span class="sourceLineNo">210</span> o = session.cast(m, pMeta, eType);<a name="line.210"></a>
<span class="sourceLineNo">211</span> } else {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> ArrayList l = (ArrayList)parseIntoCollection2(session, r, new ArrayList(), sType.getElementType(), pMeta);<a name="line.212"></a>
+<span class="sourceLineNo">212</span> ArrayList l = (ArrayList)parseIntoCollection2(session, r, new ArrayList(), sType, pMeta);<a name="line.212"></a>
<span class="sourceLineNo">213</span> o = session.toArray(sType, l);<a name="line.213"></a>
<span class="sourceLineNo">214</span> }<a name="line.214"></a>
<span class="sourceLineNo">215</span> } else if (c == '{') {<a name="line.215"></a>
@@ -407,456 +407,403 @@
<span class="sourceLineNo">399</span> throw new ParseException(session, "Could not find the end of the field name.");<a name="line.399"></a>
<span class="sourceLineNo">400</span> }<a name="line.400"></a>
<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span> private <E> Collection<E> parseIntoCollection2(JsonParserSession session, ParserReader r, Collection<E> l, ClassMeta<E> elementType, BeanPropertyMeta pMeta) throws Exception {<a name="line.402"></a>
+<span class="sourceLineNo">402</span> private <E> Collection<E> parseIntoCollection2(JsonParserSession session, ParserReader r, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.402"></a>
<span class="sourceLineNo">403</span><a name="line.403"></a>
<span class="sourceLineNo">404</span> int S0=0; // Looking for outermost [<a name="line.404"></a>
<span class="sourceLineNo">405</span> int S1=1; // Looking for starting [ or { or " or ' or LITERAL or ]<a name="line.405"></a>
<span class="sourceLineNo">406</span> int S2=2; // Looking for , or ]<a name="line.406"></a>
<span class="sourceLineNo">407</span> int S3=3; // Looking for starting [ or { or " or ' or LITERAL<a name="line.407"></a>
<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> int state = S0;<a name="line.409"></a>
-<span class="sourceLineNo">410</span> int c = 0;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> while (c != -1) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> c = r.read();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (state == S0) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> if (c == '[')<a name="line.414"></a>
-<span class="sourceLineNo">415</span> state = S1;<a name="line.415"></a>
-<span class="sourceLineNo">416</span> } else if (state == S1) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (c == ']') {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return l;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> skipCommentsAndSpace(session, r.unread());<a name="line.420"></a>
-<span class="sourceLineNo">421</span> } else if (c != -1) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> l.add(parseAnything(session, elementType, r.unread(), l, pMeta));<a name="line.422"></a>
-<span class="sourceLineNo">423</span> state = S2;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> }<a name="line.424"></a>
-<span class="sourceLineNo">425</span> } else if (state == S2) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> if (c == ',') {<a name="line.426"></a>
-<span class="sourceLineNo">427</span> state = S3;<a name="line.427"></a>
-<span class="sourceLineNo">428</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> skipCommentsAndSpace(session, r.unread());<a name="line.429"></a>
-<span class="sourceLineNo">430</span> } else if (c == ']') {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> return l;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> } else {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> break; // Invalid character found.<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span> } else if (state == S3) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (session.isCommentOrWhitespace(c)) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> skipCommentsAndSpace(session, r.unread());<a name="line.437"></a>
-<span class="sourceLineNo">438</span> } else if (c == ']') {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> break;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> } else if (c != -1) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> l.add(parseAnything(session, elementType, r.unread(), l, pMeta));<a name="line.441"></a>
-<span class="sourceLineNo">442</span> state = S2;<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> }<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> if (state == S0)<a name="line.446"></a>
-<span class="sourceLineNo">447</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.447"></a>
-<span class="sourceLineNo">448</span> if (state == S1)<a name="line.448"></a>
-<span class="sourceLineNo">449</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.449"></a>
-<span class="sourceLineNo">450</span> if (state == S2)<a name="line.450"></a>
-<span class="sourceLineNo">451</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.451"></a>
-<span class="sourceLineNo">452</span> if (state == S3)<a name="line.452"></a>
-<span class="sourceLineNo">453</span> throw new ParseException(session, "Unexpected trailing comma in array.");<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span> return null; // Unreachable.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> private Object[] parseArgs(JsonParserSession session, ParserReader r, ClassMeta<?>[] argTypes) throws Exception {<a name="line.458"></a>
+<span class="sourceLineNo">409</span> int argIndex = 0;<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span> int state = S0;<a name="line.411"></a>
+<span class="sourceLineNo">412</span> int c = 0;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> while (c != -1) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> c = r.read();<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (state == S0) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (c == '[')<a name="line.416"></a>
+<span class="sourceLineNo">417</span> state = S1;<a name="line.417"></a>
+<span class="sourceLineNo">418</span> } else if (state == S1) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> if (c == ']') {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return l;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> skipCommentsAndSpace(session, r.unread());<a name="line.422"></a>
+<span class="sourceLineNo">423</span> } else if (c != -1) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> l.add((E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), r.unread(), l, pMeta));<a name="line.424"></a>
+<span class="sourceLineNo">425</span> state = S2;<a name="line.425"></a>
+<span class="sourceLineNo">426</span> }<a name="line.426"></a>
+<span class="sourceLineNo">427</span> } else if (state == S2) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> if (c == ',') {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> state = S3;<a name="line.429"></a>
+<span class="sourceLineNo">430</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> skipCommentsAndSpace(session, r.unread());<a name="line.431"></a>
+<span class="sourceLineNo">432</span> } else if (c == ']') {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> return l;<a name="line.433"></a>
+<span class="sourceLineNo">434</span> } else {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> break; // Invalid character found.<a name="line.435"></a>
+<span class="sourceLineNo">436</span> }<a name="line.436"></a>
+<span class="sourceLineNo">437</span> } else if (state == S3) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (session.isCommentOrWhitespace(c)) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> skipCommentsAndSpace(session, r.unread());<a name="line.439"></a>
+<span class="sourceLineNo">440</span> } else if (c == ']') {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> break;<a name="line.441"></a>
+<span class="sourceLineNo">442</span> } else if (c != -1) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span> l.add((E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), r.unread(), l, pMeta));<a name="line.443"></a>
+<span class="sourceLineNo">444</span> state = S2;<a name="line.444"></a>
+<span class="sourceLineNo">445</span> }<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span> if (state == S0)<a name="line.448"></a>
+<span class="sourceLineNo">449</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (state == S1)<a name="line.450"></a>
+<span class="sourceLineNo">451</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.451"></a>
+<span class="sourceLineNo">452</span> if (state == S2)<a name="line.452"></a>
+<span class="sourceLineNo">453</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.453"></a>
+<span class="sourceLineNo">454</span> if (state == S3)<a name="line.454"></a>
+<span class="sourceLineNo">455</span> throw new ParseException(session, "Unexpected trailing comma in array.");<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span> return null; // Unreachable.<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> int S0=0; // Looking for outermost [<a name="line.460"></a>
-<span class="sourceLineNo">461</span> int S1=1; // Looking for starting [ or { or " or ' or LITERAL<a name="line.461"></a>
-<span class="sourceLineNo">462</span> int S2=2; // Looking for , or ]<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span> Object[] o = new Object[argTypes.length];<a name="line.464"></a>
-<span class="sourceLineNo">465</span> int i = 0;<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span> int state = S0;<a name="line.467"></a>
-<span class="sourceLineNo">468</span> int c = 0;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> while (c != -1) {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> c = r.read();<a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (state == S0) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> if (c == '[')<a name="line.472"></a>
-<span class="sourceLineNo">473</span> state = S1;<a name="line.473"></a>
-<span class="sourceLineNo">474</span> } else if (state == S1) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span> if (c == ']') {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return o;<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> skipCommentsAndSpace(session, r.unread());<a name="line.478"></a>
-<span class="sourceLineNo">479</span> } else {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> o[i] = parseAnything(session, argTypes[i], r.unread(), session.getOuter(), null);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> i++;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> state = S2;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> }<a name="line.483"></a>
-<span class="sourceLineNo">484</span> } else if (state == S2) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span> if (c == ',') {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> state = S1;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> skipCommentsAndSpace(session, r.unread());<a name="line.488"></a>
-<span class="sourceLineNo">489</span> } else if (c == ']') {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> return o;<a name="line.490"></a>
-<span class="sourceLineNo">491</span> }<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span> if (state == S0)<a name="line.494"></a>
-<span class="sourceLineNo">495</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.495"></a>
-<span class="sourceLineNo">496</span> if (state == S1)<a name="line.496"></a>
-<span class="sourceLineNo">497</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (state == S2)<a name="line.498"></a>
-<span class="sourceLineNo">499</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> return null; // Unreachable.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span> private <T> BeanMap<T> parseIntoBeanMap2(JsonParserSession session, ParserReader r, BeanMap<T> m) throws Exception {<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> int S0=0; // Looking for outer {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> int S1=1; // Looking for attrName start.<a name="line.507"></a>
-<span class="sourceLineNo">508</span> int S3=3; // Found attrName end, looking for :.<a name="line.508"></a>
-<span class="sourceLineNo">509</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.509"></a>
-<span class="sourceLineNo">510</span> int S5=5; // Looking for , or }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> int state = S0;<a name="line.512"></a>
-<span class="sourceLineNo">513</span> String currAttr = "";<a name="line.513"></a>
-<span class="sourceLineNo">514</span> int c = 0;<a name="line.514"></a>
-<span class="sourceLineNo">515</span> int currAttrLine = -1, currAttrCol = -1;<a name="line.515"></a>
-<span class="sourceLineNo">516</span> while (c != -1) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span> c = r.read();<a name="line.517"></a>
-<span class="sourceLineNo">518</span> if (state == S0) {<a name="line.518"></a>
-<span class="sourceLineNo">519</span> if (c == '{')<a name="line.519"></a>
-<span class="sourceLineNo">520</span> state = S1;<a name="line.520"></a>
-<span class="sourceLineNo">521</span> } else if (state == S1) {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> if (c == '}') {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> return m;<a name="line.523"></a>
-<span class="sourceLineNo">524</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span> skipCommentsAndSpace(session, r.unread());<a name="line.525"></a>
-<span class="sourceLineNo">526</span> } else {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> r.unread();<a name="line.527"></a>
-<span class="sourceLineNo">528</span> currAttrLine= r.getLine();<a name="line.528"></a>
-<span class="sourceLineNo">529</span> currAttrCol = r.getColumn();<a name="line.529"></a>
-<span class="sourceLineNo">530</span> currAttr = parseFieldName(session, r);<a name="line.530"></a>
-<span class="sourceLineNo">531</span> state = S3;<a name="line.531"></a>
-<span class="sourceLineNo">532</span> }<a name="line.532"></a>
-<span class="sourceLineNo">533</span> } else if (state == S3) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> if (c == ':')<a name="line.534"></a>
-<span class="sourceLineNo">535</span> state = S4;<a name="line.535"></a>
-<span class="sourceLineNo">536</span> } else if (state == S4) {<a name="line.536"></a>
-<span class="sourceLineNo">537</span> if (session.isCommentOrWhitespace(c)) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> skipCommentsAndSpace(session, r.unread());<a name="line.538"></a>
-<span class="sourceLineNo">539</span> } else {<a name="line.539"></a>
-<span class="sourceLineNo">540</span> if (! currAttr.equals(session.getBeanTypePropertyName())) {<a name="line.540"></a>
-<span class="sourceLineNo">541</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.541"></a>
-<span class="sourceLineNo">542</span> session.setCurrentProperty(pMeta);<a name="line.542"></a>
-<span class="sourceLineNo">543</span> if (pMeta == null) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.544"></a>
-<span class="sourceLineNo">545</span> parseAnything(session, object(), r.unread(), m.getBean(false), null); // Read content anyway to ignore it<a name="line.545"></a>
-<span class="sourceLineNo">546</span> } else {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.547"></a>
-<span class="sourceLineNo">548</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), pMeta);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> setName(cm, value, currAttr);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> pMeta.set(m, value);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span> session.setCurrentProperty(null);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> state = S5;<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span> } else if (state == S5) {<a name="line.556"></a>
-<span class="sourceLineNo">557</span> if (c == ',')<a name="line.557"></a>
-<span class="sourceLineNo">558</span> state = S1;<a name="line.558"></a>
-<span class="sourceLineNo">559</span> else if (session.isCommentOrWhitespace(c))<a name="line.559"></a>
-<span class="sourceLineNo">560</span> skipCommentsAndSpace(session, r.unread());<a name="line.560"></a>
-<span class="sourceLineNo">561</span> else if (c == '}') {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> return m;<a name="line.562"></a>
-<span class="sourceLineNo">563</span> }<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span> }<a name="line.565"></a>
-<span class="sourceLineNo">566</span> if (state == S0)<a name="line.566"></a>
-<span class="sourceLineNo">567</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.567"></a>
-<span class="sourceLineNo">568</span> if (state == S1)<a name="line.568"></a>
-<span class="sourceLineNo">569</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.569"></a>
-<span class="sourceLineNo">570</span> if (state == S3)<a name="line.570"></a>
-<span class="sourceLineNo">571</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.571"></a>
-<span class="sourceLineNo">572</span> if (state == S4)<a name="line.572"></a>
-<span class="sourceLineNo">573</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if (state == S5)<a name="line.574"></a>
-<span class="sourceLineNo">575</span> throw new ParseException(session, "Could not find '}' marking end of JSON object.");<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span> return null; // Unreachable.<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span><a name="line.579"></a>
-<span class="sourceLineNo">580</span> /*<a name="line.580"></a>
-<span class="sourceLineNo">581</span> * Starting from the specified position in the character array, returns the<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * position of the character " or '.<a name="line.582"></a>
-<span class="sourceLineNo">583</span> * If the string consists of a concatenation of strings (e.g. 'AAA' + "BBB"), this method<a name="line.583"></a>
-<span class="sourceLineNo">584</span> * will automatically concatenate the strings and return the result.<a name="line.584"></a>
-<span class="sourceLineNo">585</span> */<a name="line.585"></a>
-<span class="sourceLineNo">586</span> private String parseString(JsonParserSession session, ParserReader r) throws Exception {<a name="line.586"></a>
-<span class="sourceLineNo">587</span> r.mark();<a name="line.587"></a>
-<span class="sourceLineNo">588</span> int qc = r.read(); // The quote character being used (" or ')<a name="line.588"></a>
-<span class="sourceLineNo">589</span> if (qc != '"' && session.isStrict()) {<a name="line.589"></a>
-<span class="sourceLineNo">590</span> String msg = (qc == '\'' ? "Invalid quote character \"{0}\" being used." : "Did not find quote character marking beginning of string. Character=\"{0}\"");<a name="line.590"></a>
-<span class="sourceLineNo">591</span> throw new ParseException(session, msg, (char)qc);<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> final boolean isQuoted = (qc == '\'' || qc == '"');<a name="line.593"></a>
-<span class="sourceLineNo">594</span> String s = null;<a name="line.594"></a>
-<span class="sourceLineNo">595</span> boolean isInEscape = false;<a name="line.595"></a>
-<span class="sourceLineNo">596</span> int c = 0;<a name="line.596"></a>
-<span class="sourceLineNo">597</span> while (c != -1) {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> c = r.read();<a name="line.598"></a>
-<span class="sourceLineNo">599</span> // Strict syntax requires that all control characters be escaped.<a name="line.599"></a>
-<span class="sourceLineNo">600</span> if (session.isStrict() && c <= 0x1F)<a name="line.600"></a>
-<span class="sourceLineNo">601</span> throw new ParseException("Unescaped control character encountered: ''0x{0}''", String.format("%04X", c));<a name="line.601"></a>
-<span class="sourceLineNo">602</span> if (isInEscape) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> switch (c) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> case 'n': r.replace('\n'); break;<a name="line.604"></a>
-<span class="sourceLineNo">605</span> case 'r': r.replace('\r'); break;<a name="line.605"></a>
-<span class="sourceLineNo">606</span> case 't': r.replace('\t'); break;<a name="line.606"></a>
-<span class="sourceLineNo">607</span> case 'f': r.replace('\f'); break;<a name="line.607"></a>
-<span class="sourceLineNo">608</span> case 'b': r.replace('\b'); break;<a name="line.608"></a>
-<span class="sourceLineNo">609</span> case '\\': r.replace('\\'); break;<a name="line.609"></a>
-<span class="sourceLineNo">610</span> case '/': r.replace('/'); break;<a name="line.610"></a>
-<span class="sourceLineNo">611</span> case '\'': r.replace('\''); break;<a name="line.611"></a>
-<span class="sourceLineNo">612</span> case '"': r.replace('"'); break;<a name="line.612"></a>
-<span class="sourceLineNo">613</span> case 'u': {<a name="line.613"></a>
-<span class="sourceLineNo">614</span> String n = r.read(4);<a name="line.614"></a>
-<span class="sourceLineNo">615</span> try {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> r.replace(Integer.parseInt(n, 16), 6);<a name="line.616"></a>
-<span class="sourceLineNo">617</span> } catch (NumberFormatException e) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span> throw new ParseException(session, "Invalid Unicode escape sequence in string.");<a name="line.618"></a>
-<span class="sourceLineNo">619</span> }<a name="line.619"></a>
-<span class="sourceLineNo">620</span> break;<a name="line.620"></a>
-<span class="sourceLineNo">621</span> }<a name="line.621"></a>
-<span class="sourceLineNo">622</span> default:<a name="line.622"></a>
-<span class="sourceLineNo">623</span> throw new ParseException(session, "Invalid escape sequence in string.");<a name="line.623"></a>
-<span class="sourceLineNo">624</span> }<a name="line.624"></a>
-<span class="sourceLineNo">625</span> isInEscape = false;<a name="line.625"></a>
-<span class="sourceLineNo">626</span> } else {<a name="line.626"></a>
-<span class="sourceLineNo">627</span> if (c == '\\') {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> isInEscape = true;<a name="line.628"></a>
-<span class="sourceLineNo">629</span> r.delete();<a name="line.629"></a>
-<span class="sourceLineNo">630</span> } else if (isQuoted) {<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (c == qc) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> s = r.getMarked(1, -1);<a name="line.632"></a>
-<span class="sourceLineNo">633</span> break;<a name="line.633"></a>
-<span class="sourceLineNo">634</span> }<a name="line.634"></a>
-<span class="sourceLineNo">635</span> } else {<a name="line.635"></a>
-<span class="sourceLineNo">636</span> if (c == ',' || c == '}' || session.isWhitespace(c)) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span> s = r.getMarked(0, -1);<a name="line.637"></a>
-<span class="sourceLineNo">638</span> r.unread();<a name="line.638"></a>
-<span class="sourceLineNo">639</span> break;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> } else if (c == -1) {<a name="line.640"></a>
-<span class="sourceLineNo">641</span> s = r.getMarked(0, 0);<a name="line.641"></a>
-<span class="sourceLineNo">642</span> break;<a name="line.642"></a>
-<span class="sourceLineNo">643</span> }<a name="line.643"></a>
-<span class="sourceLineNo">644</span> }<a name="line.644"></a>
-<span class="sourceLineNo">645</span> }<a name="line.645"></a>
-<span class="sourceLineNo">646</span> }<a name="line.646"></a>
-<span class="sourceLineNo">647</span> if (s == null)<a name="line.647"></a>
-<span class="sourceLineNo">648</span> throw new ParseException(session, "Could not find expected end character ''{0}''.", (char)qc);<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span> // Look for concatenated string (i.e. whitespace followed by +).<a name="line.650"></a>
-<span class="sourceLineNo">651</span> skipCommentsAndSpace(session, r);<a name="line.651"></a>
-<span class="sourceLineNo">652</span> if (r.peek() == '+') {<a name="line.652"></a>
-<span class="sourceLineNo">653</span> if (session.isStrict())<a name="line.653"></a>
-<span class="sourceLineNo">654</span> throw new ParseException(session, "String concatenation detected.");<a name="line.654"></a>
-<span class="sourceLineNo">655</span> r.read(); // Skip past '+'<a name="line.655"></a>
-<span class="sourceLineNo">656</span> skipCommentsAndSpace(session, r);<a name="line.656"></a>
-<span class="sourceLineNo">657</span> s += parseString(session, r);<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> return session.trim(s); // End of input reached.<a name="line.659"></a>
-<span class="sourceLineNo">660</span> }<a name="line.660"></a>
-<span class="sourceLineNo">661</span><a name="line.661"></a>
-<span class="sourceLineNo">662</span> /*<a name="line.662"></a>
-<span class="sourceLineNo">663</span> * Looks for the keywords true, false, or null.<a name="line.663"></a>
-<span class="sourceLineNo">664</span> * Throws an exception if any of these keywords are not found at the specified position.<a name="line.664"></a>
-<span class="sourceLineNo">665</span> */<a name="line.665"></a>
-<span class="sourceLineNo">666</span> private static void parseKeyword(JsonParserSession session, String keyword, ParserReader r) throws Exception {<a name="line.666"></a>
-<span class="sourceLineNo">667</span> try {<a name="line.667"></a>
-<span class="sourceLineNo">668</span> String s = r.read(keyword.length());<a name="line.668"></a>
-<span class="sourceLineNo">669</span> if (s.equals(keyword))<a name="line.669"></a>
-<span class="sourceLineNo">670</span> return;<a name="line.670"></a>
-<span class="sourceLineNo">671</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.671"></a>
-<span class="sourceLineNo">672</span> } catch (IndexOutOfBoundsException e) {<a name="line.672"></a>
-<span class="sourceLineNo">673</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.673"></a>
-<span class="sourceLineNo">674</span> }<a name="line.674"></a>
-<span class="sourceLineNo">675</span> }<a name="line.675"></a>
-<span class="sourceLineNo">676</span><a name="line.676"></a>
-<span class="sourceLineNo">677</span> /*<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * Doesn't actually parse anything, but moves the position beyond any whitespace or comments.<a name="line.678"></a>
-<span class="sourceLineNo">679</span> * If positionOnNext is 'true', then the cursor will be set to the point immediately after<a name="line.679"></a>
-<span class="sourceLineNo">680</span> * the comments and whitespace. Otherwise, the cursor will be set to the last position of<a name="line.680"></a>
-<span class="sourceLineNo">681</span> * the comments and whitespace.<a name="line.681"></a>
-<span class="sourceLineNo">682</span> */<a name="line.682"></a>
-<span class="sourceLineNo">683</span> private static void skipCommentsAndSpace(JsonParserSession session, ParserReader r) throws Exception {<a name="line.683"></a>
-<span class="sourceLineNo">684</span> int c = 0;<a name="line.684"></a>
-<span class="sourceLineNo">685</span> while ((c = r.read()) != -1) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span> if (! session.isWhitespace(c)) {<a name="line.686"></a>
-<span class="sourceLineNo">687</span> if (c == '/') {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> if (session.isStrict())<a name="line.688"></a>
-<span class="sourceLineNo">689</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.689"></a>
-<span class="sourceLineNo">690</span> skipComments(session, r);<a name="line.690"></a>
-<span class="sourceLineNo">691</span> } else {<a name="line.691"></a>
-<span class="sourceLineNo">692</span> r.unread();<a name="line.692"></a>
-<span class="sourceLineNo">693</span> return;<a name="line.693"></a>
-<span class="sourceLineNo">694</span> }<a name="line.694"></a>
-<span class="sourceLineNo">695</span> }<a name="line.695"></a>
-<span class="sourceLineNo">696</span> }<a name="line.696"></a>
-<span class="sourceLineNo">697</span> }<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span> /*<a name="line.699"></a>
-<span class="sourceLineNo">700</span> * Doesn't actually parse anything, but moves the position beyond the construct "{wrapperAttr:" when<a name="line.700"></a>
-<span class="sourceLineNo">701</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.701"></a>
-<span class="sourceLineNo">702</span> */<a name="line.702"></a>
-<span class="sourceLineNo">703</span> private void skipWrapperAttrStart(JsonParserSession session, ParserReader r, String wrapperAttr) throws Exception {<a name="line.703"></a>
+<span class="sourceLineNo">460</span> private <T> BeanMap<T> parseIntoBeanMap2(JsonParserSession session, ParserReader r, BeanMap<T> m) throws Exception {<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
+<span class="sourceLineNo">462</span> int S0=0; // Looking for outer {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> int S1=1; // Looking for attrName start.<a name="line.463"></a>
+<span class="sourceLineNo">464</span> int S3=3; // Found attrName end, looking for :.<a name="line.464"></a>
+<span class="sourceLineNo">465</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.465"></a>
+<span class="sourceLineNo">466</span> int S5=5; // Looking for , or }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> int state = S0;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> String currAttr = "";<a name="line.469"></a>
+<span class="sourceLineNo">470</span> int c = 0;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> int currAttrLine = -1, currAttrCol = -1;<a name="line.471"></a>
+<span class="sourceLineNo">472</span> while (c != -1) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> c = r.read();<a name="line.473"></a>
+<span class="sourceLineNo">474</span> if (state == S0) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> if (c == '{')<a name="line.475"></a>
+<span class="sourceLineNo">476</span> state = S1;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> } else if (state == S1) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span> if (c == '}') {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> return m;<a name="line.479"></a>
+<span class="sourceLineNo">480</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> skipCommentsAndSpace(session, r.unread());<a name="line.481"></a>
+<span class="sourceLineNo">482</span> } else {<a name="line.482"></a>
+<span class="sourceLineNo">483</span> r.unread();<a name="line.483"></a>
+<span class="sourceLineNo">484</span> currAttrLine= r.getLine();<a name="line.484"></a>
+<span class="sourceLineNo">485</span> currAttrCol = r.getColumn();<a name="line.485"></a>
+<span class="sourceLineNo">486</span> currAttr = parseFieldName(session, r);<a name="line.486"></a>
+<span class="sourceLineNo">487</span> state = S3;<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> } else if (state == S3) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> if (c == ':')<a name="line.490"></a>
+<span class="sourceLineNo">491</span> state = S4;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> } else if (state == S4) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> if (session.isCommentOrWhitespace(c)) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span> skipCommentsAndSpace(session, r.unread());<a name="line.494"></a>
+<span class="sourceLineNo">495</span> } else {<a name="line.495"></a>
+<span class="sourceLineNo">496</span> if (! currAttr.equals(session.getBeanTypePropertyName())) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.497"></a>
+<span class="sourceLineNo">498</span> session.setCurrentProperty(pMeta);<a name="line.498"></a>
+<span class="sourceLineNo">499</span> if (pMeta == null) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> parseAnything(session, object(), r.unread(), m.getBean(false), null); // Read content anyway to ignore it<a name="line.501"></a>
+<span class="sourceLineNo">502</span> } else {<a name="line.502"></a>
+<span class="sourceLineNo">503</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.503"></a>
+<span class="sourceLineNo">504</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), pMeta);<a name="line.504"></a>
+<span class="sourceLineNo">505</span> setName(cm, value, currAttr);<a name="line.505"></a>
+<span class="sourceLineNo">506</span> pMeta.set(m, value);<a name="line.506"></a>
+<span class="sourceLineNo">507</span> }<a name="line.507"></a>
+<span class="sourceLineNo">508</span> session.setCurrentProperty(null);<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span> state = S5;<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span> } else if (state == S5) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (c == ',')<a name="line.513"></a>
+<span class="sourceLineNo">514</span> state = S1;<a name="line.514"></a>
+<span class="sourceLineNo">515</span> else if (session.isCommentOrWhitespace(c))<a name="line.515"></a>
+<span class="sourceLineNo">516</span> skipCommentsAndSpace(session, r.unread());<a name="line.516"></a>
+<span class="sourceLineNo">517</span> else if (c == '}') {<a name="line.517"></a>
+<span class="sourceLineNo">518</span> return m;<a name="line.518"></a>
+<span class="sourceLineNo">519</span> }<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> }<a name="line.521"></a>
+<span class="sourceLineNo">522</span> if (state == S0)<a name="line.522"></a>
+<span class="sourceLineNo">523</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.523"></a>
+<span class="sourceLineNo">524</span> if (state == S1)<a name="line.524"></a>
+<span class="sourceLineNo">525</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.525"></a>
+<span class="sourceLineNo">526</span> if (state == S3)<a name="line.526"></a>
+<span class="sourceLineNo">527</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.527"></a>
+<span class="sourceLineNo">528</span> if (state == S4)<a name="line.528"></a>
+<span class="sourceLineNo">529</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.529"></a>
+<span class="sourceLineNo">530</span> if (state == S5)<a name="line.530"></a>
+<span class="sourceLineNo">531</span> throw new ParseException(session, "Could not find '}' marking end of JSON object.");<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span> return null; // Unreachable.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> }<a name="line.534"></a>
+<span class="sourceLineNo">535</span><a name="line.535"></a>
+<span class="sourceLineNo">536</span> /*<a name="line.536"></a>
+<span class="sourceLineNo">537</span> * Starting from the specified position in the character array, returns the<a name="line.537"></a>
+<span class="sourceLineNo">538</span> * position of the character " or '.<a name="line.538"></a>
+<span class="sourceLineNo">539</span> * If the string consists of a concatenation of strings (e.g. 'AAA' + "BBB"), this method<a name="line.539"></a>
+<span class="sourceLineNo">540</span> * will automatically concatenate the strings and return the result.<a name="line.540"></a>
+<span class="sourceLineNo">541</span> */<a name="line.541"></a>
+<span class="sourceLineNo">542</span> private String parseString(JsonParserSession session, ParserReader r) throws Exception {<a name="line.542"></a>
+<span class="sourceLineNo">543</span> r.mark();<a name="line.543"></a>
+<span class="sourceLineNo">544</span> int qc = r.read(); // The quote character being used (" or ')<a name="line.544"></a>
+<span class="sourceLineNo">545</span> if (qc != '"' && session.isStrict()) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span> String msg = (qc == '\'' ? "Invalid quote character \"{0}\" being used." : "Did not find quote character marking beginning of string. Character=\"{0}\"");<a name="line.546"></a>
+<span class="sourceLineNo">547</span> throw new ParseException(session, msg, (char)qc);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> }<a name="line.548"></a>
+<span class="sourceLineNo">549</span> final boolean isQuoted = (qc == '\'' || qc == '"');<a name="line.549"></a>
+<span class="sourceLineNo">550</span> String s = null;<a name="line.550"></a>
+<span class="sourceLineNo">551</span> boolean isInEscape = false;<a name="line.551"></a>
+<span class="sourceLineNo">552</span> int c = 0;<a name="line.552"></a>
+<span class="sourceLineNo">553</span> while (c != -1) {<a name="line.553"></a>
+<span class="sourceLineNo">554</span> c = r.read();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> // Strict syntax requires that all control characters be escaped.<a name="line.555"></a>
+<span class="sourceLineNo">556</span> if (session.isStrict() && c <= 0x1F)<a name="line.556"></a>
+<span class="sourceLineNo">557</span> throw new ParseException("Unescaped control character encountered: ''0x{0}''", String.format("%04X", c));<a name="line.557"></a>
+<span class="sourceLineNo">558</span> if (isInEscape) {<a name="line.558"></a>
+<span class="sourceLineNo">559</span> switch (c) {<a name="line.559"></a>
+<span class="sourceLineNo">560</span> case 'n': r.replace('\n'); break;<a name="line.560"></a>
+<span class="sourceLineNo">561</span> case 'r': r.replace('\r'); break;<a name="line.561"></a>
+<span class="sourceLineNo">562</span> case 't': r.replace('\t'); break;<a name="line.562"></a>
+<span class="sourceLineNo">563</span> case 'f': r.replace('\f'); break;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> case 'b': r.replace('\b'); break;<a name="line.564"></a>
+<span class="sourceLineNo">565</span> case '\\': r.replace('\\'); break;<a name="line.565"></a>
+<span class="sourceLineNo">566</span> case '/': r.replace('/'); break;<a name="line.566"></a>
+<span class="sourceLineNo">567</span> case '\'': r.replace('\''); break;<a name="line.567"></a>
+<span class="sourceLineNo">568</span> case '"': r.replace('"'); break;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> case 'u': {<a name="line.569"></a>
+<span class="sourceLineNo">570</span> String n = r.read(4);<a name="line.570"></a>
+<span class="sourceLineNo">571</span> try {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> r.replace(Integer.parseInt(n, 16), 6);<a name="line.572"></a>
+<span class="sourceLineNo">573</span> } catch (NumberFormatException e) {<a name="line.573"></a>
+<span class="sourceLineNo">574</span> throw new ParseException(session, "Invalid Unicode escape sequence in string.");<a name="line.574"></a>
+<span class="sourceLineNo">575</span> }<a name="line.575"></a>
+<span class="sourceLineNo">576</span> break;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span> default:<a name="line.578"></a>
+<span class="sourceLineNo">579</span> throw new ParseException(session, "Invalid escape sequence in string.");<a name="line.579"></a>
+<span class="sourceLineNo">580</span> }<a name="line.580"></a>
+<span class="sourceLineNo">581</span> isInEscape = false;<a name="line.581"></a>
+<span class="sourceLineNo">582</span> } else {<a name="line.582"></a>
+<span class="sourceLineNo">583</span> if (c == '\\') {<a name="line.583"></a>
+<span class="sourceLineNo">584</span> isInEscape = true;<a name="line.584"></a>
+<span class="sourceLineNo">585</span> r.delete();<a name="line.585"></a>
+<span class="sourceLineNo">586</span> } else if (isQuoted) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span> if (c == qc) {<a name="line.587"></a>
+<span class="sourceLineNo">588</span> s = r.getMarked(1, -1);<a name="line.588"></a>
+<span class="sourceLineNo">589</span> break;<a name="line.589"></a>
+<span class="sourceLineNo">590</span> }<a name="line.590"></a>
+<span class="sourceLineNo">591</span> } else {<a name="line.591"></a>
+<span class="sourceLineNo">592</span> if (c == ',' || c == '}' || session.isWhitespace(c)) {<a name="line.592"></a>
+<span class="sourceLineNo">593</span> s = r.getMarked(0, -1);<a name="line.593"></a>
+<span class="sourceLineNo">594</span> r.unread();<a name="line.594"></a>
+<span class="sourceLineNo">595</span> break;<a name="line.595"></a>
+<span class="sourceLineNo">596</span> } else if (c == -1) {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> s = r.getMarked(0, 0);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> break;<a name="line.598"></a>
+<span class="sourceLineNo">599</span> }<a name="line.599"></a>
+<span class="sourceLineNo">600</span> }<a name="line.600"></a>
+<span class="sourceLineNo">601</span> }<a name="line.601"></a>
+<span class="sourceLineNo">602</span> }<a name="line.602"></a>
+<span class="sourceLineNo">603</span> if (s == null)<a name="line.603"></a>
+<span class="sourceLineNo">604</span> throw new ParseException(session, "Could not find expected end character ''{0}''.", (char)qc);<a name="line.604"></a>
+<span class="sourceLineNo">605</span><a name="line.605"></a>
+<span class="sourceLineNo">606</span> // Look for concatenated string (i.e. whitespace followed by +).<a name="line.606"></a>
+<span class="sourceLineNo">607</span> skipCommentsAndSpace(session, r);<a name="line.607"></a>
+<span class="sourceLineNo">608</span> if (r.peek() == '+') {<a name="line.608"></a>
+<span class="sourceLineNo">609</span> if (session.isStrict())<a name="line.609"></a>
+<span class="sourceLineNo">610</span> throw new ParseException(session, "String concatenation detected.");<a name="line.610"></a>
+<span class="sourceLineNo">611</span> r.read(); // Skip past '+'<a name="line.611"></a>
+<span class="sourceLineNo">612</span> skipCommentsAndSpace(session, r);<a name="line.612"></a>
+<span class="sourceLineNo">613</span> s += parseString(session, r);<a name="line.613"></a>
+<span class="sourceLineNo">614</span> }<a name="line.614"></a>
+<span class="sourceLineNo">615</span> return session.trim(s); // End of input reached.<a name="line.615"></a>
+<span class="sourceLineNo">616</span> }<a name="line.616"></a>
+<span class="sourceLineNo">617</span><a name="line.617"></a>
+<span class="sourceLineNo">618</span> /*<a name="line.618"></a>
+<span class="sourceLineNo">619</span> * Looks for the keywords true, false, or null.<a name="line.619"></a>
+<span class="sourceLineNo">620</span> * Throws an exception if any of these keywords are not found at the specified position.<a name="line.620"></a>
+<span class="sourceLineNo">621</span> */<a name="line.621"></a>
+<span class="sourceLineNo">622</span> private static void parseKeyword(JsonParserSession session, String keyword, ParserReader r) throws Exception {<a name="line.622"></a>
+<span class="sourceLineNo">623</span> try {<a name="line.623"></a>
+<span class="sourceLineNo">624</span> String s = r.read(keyword.length());<a name="line.624"></a>
+<span class="sourceLineNo">625</span> if (s.equals(keyword))<a name="line.625"></a>
+<span class="sourceLineNo">626</span> return;<a name="line.626"></a>
+<span class="sourceLineNo">627</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.627"></a>
+<span class="sourceLineNo">628</span> } catch (IndexOutOfBoundsException e) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.629"></a>
+<span class="sourceLineNo">630</span> }<a name="line.630"></a>
+<span class="sourceLineNo">631</span> }<a name="line.631"></a>
+<span class="sourceLineNo">632</span><a name="line.632"></a>
+<span class="sourceLineNo">633</span> /*<a name="line.633"></a>
+<span class="sourceLineNo">634</span> * Doesn't actually parse anything, but moves the position beyond any whitespace or comments.<a name="line.634"></a>
+<span class="sourceLineNo">635</span> * If positionOnNext is 'true', then the cursor will be set to the point immediately after<a name="line.635"></a>
+<span class="sourceLineNo">636</span> * the comments and whitespace. Otherwise, the cursor will be set to the last position of<a name="line.636"></a>
+<span class="sourceLineNo">637</span> * the comments and whitespace.<a name="line.637"></a>
+<span class="sourceLineNo">638</span> */<a name="line.638"></a>
+<span class="sourceLineNo">639</span> private static void skipCommentsAndSpace(JsonParserSession session, ParserReader r) throws Exception {<a name="line.639"></a>
+<span class="sourceLineNo">640</span> int c = 0;<a name="line.640"></a>
+<span class="sourceLineNo">641</span> while ((c = r.read()) != -1) {<a name="line.641"></a>
+<span class="sourceLineNo">642</span> if (! session.isWhitespace(c)) {<a name="line.642"></a>
+<span class="sourceLineNo">643</span> if (c == '/') {<a name="line.643"></a>
+<span class="sourceLineNo">644</span> if (session.isStrict())<a name="line.644"></a>
+<span class="sourceLineNo">645</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.645"></a>
+<span class="sourceLineNo">646</span> skipComments(session, r);<a name="line.646"></a>
+<span class="sourceLineNo">647</span> } else {<a name="line.647"></a>
+<span class="sourceLineNo">648</span> r.unread();<a name="line.648"></a>
+<span class="sourceLineNo">649</span> return;<a name="line.649"></a>
+<span class="sourceLineNo">650</span> }<a name="line.650"></a>
+<span class="sourceLineNo">651</span> }<a name="line.651"></a>
+<span class="sourceLineNo">652</span> }<a name="line.652"></a>
+<span class="sourceLineNo">653</span> }<a name="line.653"></a>
+<span class="sourceLineNo">654</span><a name="line.654"></a>
+<span class="sourceLineNo">655</span> /*<a name="line.655"></a>
+<span class="sourceLineNo">656</span> * Doesn't actually parse anything, but moves the position beyond the construct "{wrapperAttr:" when<a name="line.656"></a>
+<span class="sourceLineNo">657</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.657"></a>
+<span class="sourceLineNo">658</span> */<a name="line.658"></a>
+<span class="sourceLineNo">659</span> private void skipWrapperAttrStart(JsonParserSession session, ParserReader r, String wrapperAttr) throws Exception {<a name="line.659"></a>
+<span class="sourceLineNo">660</span><a name="line.660"></a>
+<span class="sourceLineNo">661</span> int S0=0; // Looking for outer {<a name="line.661"></a>
+<span class="sourceLineNo">662</span> int S1=1; // Looking for attrName start.<a name="line.662"></a>
+<span class="sourceLineNo">663</span> int S3=3; // Found attrName end, looking for :.<a name="line.663"></a>
+<span class="sourceLineNo">664</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.664"></a>
+<span class="sourceLineNo">665</span><a name="line.665"></a>
+<span class="sourceLineNo">666</span> int state = S0;<a name="line.666"></a>
+<span class="sourceLineNo">667</span> String currAttr = null;<a name="line.667"></a>
+<span class="sourceLineNo">668</span> int c = 0;<a name="line.668"></a>
+<span class="sourceLineNo">669</span> while (c != -1) {<a name="line.669"></a>
+<span class="sourceLineNo">670</span> c = r.read();<a name="line.670"></a>
+<span class="sourceLineNo">671</span> if (state == S0) {<a name="line.671"></a>
+<span class="sourceLineNo">672</span> if (c == '{')<a name="line.672"></a>
+<span class="sourceLineNo">673</span> state = S1;<a name="line.673"></a>
+<span class="sourceLineNo">674</span> } else if (state == S1) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span> if (session.isCommentOrWhitespace(c)) {<a name="line.675"></a>
+<span class="sourceLineNo">676</span> skipCommentsAndSpace(session, r.unread());<a name="line.676"></a>
+<span class="sourceLineNo">677</span> } else {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> currAttr = parseFieldName(session, r.unread());<a name="line.678"></a>
+<span class="sourceLineNo">679</span> if (! currAttr.equals(wrapperAttr))<a name="line.679"></a>
+<span class="sourceLineNo">680</span> throw new ParseException(session, "Expected to find wrapper attribute ''{0}'' but found attribute ''{1}''", wrapperAttr, currAttr);<a name="line.680"></a>
+<span class="sourceLineNo">681</span> state = S3;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> }<a name="line.682"></a>
+<span class="sourceLineNo">683</span> } else if (state == S3) {<a name="line.683"></a>
+<span class="sourceLineNo">684</span> if (c == ':')<a name="line.684"></a>
+<span class="sourceLineNo">685</span> state = S4;<a name="line.685"></a>
+<span class="sourceLineNo">686</span> } else if (state == S4) {<a name="line.686"></a>
+<span class="sourceLineNo">687</span> if (session.isCommentOrWhitespace(c)) {<a name="line.687"></a>
+<span class="sourceLineNo">688</span> skipCommentsAndSpace(session, r.unread());<a name="line.688"></a>
+<span class="sourceLineNo">689</span> } else {<a name="line.689"></a>
+<span class="sourceLineNo">690</span> r.unread();<a name="line.690"></a>
+<span class="sourceLineNo">691</span> return;<a name="line.691"></a>
+<span class="sourceLineNo">692</span> }<a name="line.692"></a>
+<span class="sourceLineNo">693</span> }<a name="line.693"></a>
+<span class="sourceLineNo">694</span> }<a name="line.694"></a>
+<span class="sourceLineNo">695</span> if (state == S0)<a name="line.695"></a>
+<span class="sourceLineNo">696</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.696"></a>
+<span class="sourceLineNo">697</span> if (state == S1)<a name="line.697"></a>
+<span class="sourceLineNo">698</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.698"></a>
+<span class="sourceLineNo">699</span> if (state == S3)<a name="line.699"></a>
+<span class="sourceLineNo">700</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.700"></a>
+<span class="sourceLineNo">701</span> if (state == S4)<a name="line.701"></a>
+<span class="sourceLineNo">702</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.702"></a>
+<span class="sourceLineNo">703</span> }<a name="line.703"></a>
<span class="sourceLineNo">704</span><a name="line.704"></a>
-<span class="sourceLineNo">705</span> int S0=0; // Looking for outer {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> int S1=1; // Looking for attrName start.<a name="line.706"></a>
-<span class="sourceLineNo">707</span> int S3=3; // Found attrName end, looking for :.<a name="line.707"></a>
-<span class="sourceLineNo">708</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span> int state = S0;<a name="line.710"></a>
-<span class="sourceLineNo">711</span> String currAttr = null;<a name="line.711"></a>
-<span class="sourceLineNo">712</span> int c = 0;<a name="line.712"></a>
-<span class="sourceLineNo">713</span> while (c != -1) {<a name="line.713"></a>
-<span class="sourceLineNo">714</span> c = r.read();<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (state == S0) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> if (c == '{')<a name="line.716"></a>
-<span class="sourceLineNo">717</span> state = S1;<a name="line.717"></a>
-<span class="sourceLineNo">718</span> } else if (state == S1) {<a name="line.718"></a>
-<span class="sourceLineNo">719</span> if (session.isCommentOrWhitespace(c)) {<a name="line.719"></a>
-<span class="sourceLineNo">720</span> skipCommentsAndSpace(session, r.unread());<a name="line.720"></a>
-<span class="sourceLineNo">721</span> } else {<a name="line.721"></a>
-<span class="sourceLineNo">722</span> currAttr = parseFieldName(session, r.unread());<a name="line.722"></a>
-<span class="sourceLineNo">723</span> if (! currAttr.equals(wrapperAttr))<a name="line.723"></a>
-<span class="sourceLineNo">724</span> throw new ParseException(session, "Expected to find wrapper attribute ''{0}'' but found attribute ''{1}''", wrapperAttr, currAttr);<a name="line.724"></a>
-<span class="sourceLineNo">725</span> state = S3;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> }<a name="line.726"></a>
-<span class="sourceLineNo">727</span> } else if (state == S3) {<a name="line.727"></a>
-<span class="sourceLineNo">728</span> if (c == ':')<a name="line.728"></a>
-<span class="sourceLineNo">729</span> state = S4;<a name="line.729"></a>
-<span class="sourceLineNo">730</span> } else if (state == S4) {<a name="line.730"></a>
-<span class="sourceLineNo">731</span> if (session.isCommentOrWhitespace(c)) {<a name="line.731"></a>
-<span class="sourceLineNo">732</span> skipCommentsAndSpace(session, r.unread());<a name="line.732"></a>
-<span class="sourceLineNo">733</span> } else {<a name="line.733"></a>
-<span class="sourceLineNo">734</span> r.unread();<a name="line.734"></a>
-<span class="sourceLineNo">735</span> return;<a name="line.735"></a>
-<span class="sourceLineNo">736</span> }<a name="line.736"></a>
-<span class="sourceLineNo">737</span> }<a name="line.737"></a>
-<span class="sourceLineNo">738</span> }<a name="line.738"></a>
-<span class="sourceLineNo">739</span> if (state == S0)<a name="line.739"></a>
-<span class="sourceLineNo">740</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.740"></a>
-<span class="sourceLineNo">741</span> if (state == S1)<a name="line.741"></a>
-<span class="sourceLineNo">742</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.742"></a>
-<span class="sourceLineNo">743</span> if (state == S3)<a name="line.743"></a>
-<span class="sourceLineNo">744</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.744"></a>
-<span class="sourceLineNo">745</span> if (state == S4)<a name="line.745"></a>
-<span class="sourceLineNo">746</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.746"></a>
+<span class="sourceLineNo">705</span> /*<a name="line.705"></a>
+<span class="sourceLineNo">706</span> * Doesn't actually parse anything, but moves the position beyond the construct "}" when<a name="line.706"></a>
+<span class="sourceLineNo">707</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.707"></a>
+<span class="sourceLineNo">708</span> */<a name="line.708"></a>
+<span class="sourceLineNo">709</span> private static void skipWrapperAttrEnd(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.709"></a>
+<span class="sourceLineNo">710</span> int c = 0;<a name="line.710"></a>
+<span class="sourceLineNo">711</span> while ((c = r.read()) != -1) {<a name="line.711"></a>
+<span class="sourceLineNo">712</span> if (! session.isWhitespace(c)) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span> if (c == '/') {<a name="line.713"></a>
+<span class="sourceLineNo">714</span> if (session.isStrict())<a name="line.714"></a>
+<span class="sourceLineNo">715</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.715"></a>
+<span class="sourceLineNo">716</span> skipComments(session, r);<a name="line.716"></a>
+<span class="sourceLineNo">717</span> } else if (c == '}') {<a name="line.717"></a>
+<span class="sourceLineNo">718</span> return;<a name="line.718"></a>
+<span class="sourceLineNo">719</span> } else {<a name="line.719"></a>
+<span class="sourceLineNo">720</span> throw new ParseException(session, "Could not find '}' at the end of JSON wrapper object.");<a name="line.720"></a>
+<span class="sourceLineNo">721</span> }<a name="line.721"></a>
+<span class="sourceLineNo">722</span> }<a name="line.722"></a>
+<span class="sourceLineNo">723</span> }<a name="line.723"></a>
+<span class="sourceLineNo">724</span> }<a name="line.724"></a>
+<span class="sourceLineNo">725</span><a name="line.725"></a>
+<span class="sourceLineNo">726</span> /*<a name="line.726"></a>
+<span class="sourceLineNo">727</span> * Doesn't actually parse anything, but when positioned at the beginning of comment,<a name="line.727"></a>
+<span class="sourceLineNo">728</span> * it will move the pointer to the last character in the comment.<a name="line.728"></a>
+<span class="sourceLineNo">729</span> */<a name="line.729"></a>
+<span class="sourceLineNo">730</span> private static void skipComments(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.730"></a>
+<span class="sourceLineNo">731</span> int c = r.read();<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // "/* */" style comments<a name="line.732"></a>
+<span class="sourceLineNo">733</span> if (c == '*') {<a name="line.733"></a>
+<span class="sourceLineNo">734</span> while (c != -1)<a name="line.734"></a>
+<span class="sourceLineNo">735</span> if ((c = r.read()) == '*')<a name="line.735"></a>
+<span class="sourceLineNo">736</span> if ((c = r.read()) == '/')<a name="line.736"></a>
+<span class="sourceLineNo">737</span> return;<a name="line.737"></a>
+<span class="sourceLineNo">738</span> // "//" style comments<a name="line.738"></a>
+<span class="sourceLineNo">739</span> } else if (c == '/') {<a name="line.739"></a>
+<span class="sourceLineNo">740</span> while (c != -1) {<a name="line.740"></a>
+<span class="sourceLineNo">741</span> c = r.read();<a name="line.741"></a>
+<span class="sourceLineNo">742</span> if (c == -1 || c == '\n')<a name="line.742"></a>
+<span class="sourceLineNo">743</span> return;<a name="line.743"></a>
+<span class="sourceLineNo">744</span> }<a name="line.744"></a>
+<span class="sourceLineNo">745</span> }<a name="line.745"></a>
+<span class="sourceLineNo">746</span> throw new ParseException(session, "Open ended comment.");<a name="line.746"></a>
<span class="sourceLineNo">747</span> }<a name="line.747"></a>
<span class="sourceLineNo">748</span><a name="line.748"></a>
<span class="sourceLineNo">749</span> /*<a name="line.749"></a>
-<span class="sourceLineNo">750</span> * Doesn't actually parse anything, but moves the position beyond the construct "}" when<a name="line.750"></a>
-<span class="sourceLineNo">751</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.751"></a>
+<span class="sourceLineNo">750</span> * Call this method after you've finished a parsing a string to make sure that if there's any<a name="line.750"></a>
+<span class="sourceLineNo">751</span> * remainder in the input, that it consists only of whitespace and comments.<a name="line.751"></a>
<span class="sourceLineNo">752</span> */<a name="line.752"></a>
-<span class="sourceLineNo">753</span> private static void skipWrapperAttrEnd(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.753"></a>
-<span class="sourceLineNo">754</span> int c = 0;<a name="line.754"></a>
-<span class="sourceLineNo">755</span> while ((c = r.read()) != -1) {<a name="line.755"></a>
-<span class="sourceLineNo">756</span> if (! session.isWhitespace(c)) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span> if (c == '/') {<a name="line.757"></a>
-<span class="sourceLineNo">758</span> if (session.isStrict())<a name="line.758"></a>
-<span class="sourceLineNo">759</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.759"></a>
-<span class="sourceLineNo">760</span> skipComments(session, r);<a name="line.760"></a>
-<span class="sourceLineNo">761</span> } else if (c == '}') {<a name="line.761"></a>
-<span class="sourceLineNo">762</span> return;<a name="line.762"></a>
-<span class="sourceLineNo">763</span> } else {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> throw new ParseException(session, "Could not find '}' at the end of JSON wrapper object.");<a name="line.764"></a>
-<span class="sourceLineNo">765</span> }<a name="line.765"></a>
-<span class="sourceLineNo">766</span> }<a name="line.766"></a>
-<span class="sourceLineNo">767</span> }<a name="line.767"></a>
+<span class="sourceLineNo">753</span> private static void validateEnd(JsonParserSession session, ParserReader r) throws Exception {<a name="line.753"></a>
+<span class="sourceLineNo">754</span> skipCommentsAndSpace(session, r);<a name="line.754"></a>
+<span class="sourceLineNo">755</span> int c = r.read();<a name="line.755"></a>
+<span class="sourceLineNo">756</span> if (c != -1 && c != ';') // var x = {...}; expressions can end with a semicolon.<a name="line.756"></a>
+<span class="sourceLineNo">757</span> throw new ParseException(session, "Remainder after parse: ''{0}''.", (char)c);<a name="line.757"></a>
+<span class="sourceLineNo">758</span> }<a name="line.758"></a>
+<span class="sourceLineNo">759</span><a name="line.759"></a>
+<span class="sourceLineNo">760</span><a name="line.760"></a>
+<span class="sourceLineNo">761</span> //--------------------------------------------------------------------------------<a name="line.761"></a>
+<span class="sourceLineNo">762</span> // Entry point methods<a name="line.762"></a>
+<span class="sourceLineNo">763</span> //--------------------------------------------------------------------------------<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span> @Override /* Parser */<a name="line.765"></a>
+<span class="sourceLineNo">766</span> public JsonParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.766"></a>
+<span class="sourceLineNo">767</span> return new JsonParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.767"></a>
<span class="sourceLineNo">768</span> }<a name="line.768"></a>
<span class="sourceLineNo">769</span><a name="line.769"></a>
-<span class="sourceLineNo">770</span> /*<a name="line.770"></a>
-<span class="sourceLineNo">771</span> * Doesn't actually parse anything, but when positioned at the beginning of comment,<a name="line.771"></a>
-<span class="sourceLineNo">772</span> * it will move the pointer to the last character in the comment.<a name="line.772"></a>
-<span class="sourceLineNo">773</span> */<a name="line.773"></a>
-<span class="sourceLineNo">774</span> private static void skipComments(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.774"></a>
-<span class="sourceLineNo">775</span> int c = r.read();<a name="line.775"></a>
-<span class="sourceLineNo">776</span> // "/* */" style comments<a name="line.776"></a>
-<span class="sourceLineNo">777</span> if (c == '*') {<a name="line.777"></a>
-<span class="sourceLineNo">778</span> while (c != -1)<a name="line.778"></a>
-<span class="sourceLineNo">779</span> if ((c = r.read()) == '*')<a name="line.779"></a>
-<span class="sourceLineNo">780</span> if ((c = r.read()) == '/')<a name="line.780"></a>
-<span class="sourceLineNo">781</span> return;<a name="line.781"></a>
-<span class="sourceLineNo">782</span> // "//" style comments<a name="line.782"></a>
-<span class="sourceLineNo">783</span> } else if (c == '/') {<a name="line.783"></a>
-<span class="sourceLineNo">784</span> while (c != -1) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span> c = r.read();<a name="line.785"></a>
-<span class="sourceLineNo">786</span> if (c == -1 || c == '\n')<a name="line.786"></a>
-<span class="sourceLineNo">787</span> return;<a name="line.787"></a>
-<span class="sourceLineNo">788</span> }<a name="line.788"></a>
-<span class="sourceLineNo">789</span> }<a name="line.789"></a>
-<span class="sourceLineNo">790</span> throw new ParseException(session, "Open ended comment.");<a name="line.790"></a>
-<span class="sourceLineNo">791</span> }<a name="line.791"></a>
-<span class="sourceLineNo">792</span><a name="line.792"></a>
-<span class="sourceLineNo">793</span> /*<a name="line.793"></a>
-<span class="sourceLineNo">794</span> * Call this method after you've finished a parsing a string to make sure that if there's any<a name="line.794"></a>
-<span class="sourceLineNo">795</span> * remainder in the input, that it consists only of whitespace and comments.<a name="line.795"></a>
-<span class="sourceLineNo">796</span> */<a name="line.796"></a>
-<span class="sourceLineNo">797</span> private static void validateEnd(JsonParserSession session, ParserReader r) throws Exception {<a name="line.797"></a>
-<span class="sourceLineNo">798</span> skipCommentsAndSpace(session, r);<a name="line.798"></a>
-<span class="sourceLineNo">799</span> int c = r.read();<a name="line.799"></a>
-<span class="sourceLineNo">800</span> if (c != -1 && c != ';') // var x = {...}; expressions can end with a semicolon.<a name="line.800"></a>
-<span class="sourceLineNo">801</span> throw new ParseException(session, "Remainder after parse: ''{0}''.", (char)c);<a name="line.801"></a>
-<span class="sourceLineNo">802</span> }<a name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span><a name="line.804"></a>
-<span class="sourceLineNo">805</span> //--------------------------------------------------------------------------------<a name="line.805"></a>
-<span class="sourceLineNo">806</span> // Entry point methods<a name="line.806"></a>
-<span class="sourceLineNo">807</span> //--------------------------------------------------------------------------------<a name="line.807"></a>
-<span class="sourceLineNo">808</span><a name="line.808"></a>
-<span class="sourceLineNo">809</span> @Override /* Parser */<a name="line.809"></a>
-<span class="sourceLineNo">810</span> public JsonParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.810"></a>
-<span class="sourceLineNo">811</span> return new JsonParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.811"></a>
-<span class="sourceLineNo">812</span> }<a name="line.812"></a>
-<span class="sourceLineNo">813</span><a name="line.813"></a>
-<span class="sourceLineNo">814</span> @Override /* Parser */<a name="line.814"></a>
-<span class="sourceLineNo">815</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.815"></a>
-<span class="sourceLineNo">816</span> JsonParserSession s = (JsonParserSession)session;<a name="line.816"></a>
-<span class="sourceLineNo">817</span> ParserReader r = s.getReader();<a name="line.817"></a>
-<span class="sourceLineNo">818</span> if (r == null)<a name="line.818"></a>
-<span class="sourceLineNo">819</span> return null;<a name="line.819"></a>
-<span class="sourceLineNo">820</span> T o = parseAnything(s, type, r, s.getOuter(), null);<a name="line.820"></a>
-<span class="sourceLineNo">821</span> validateEnd(s, r);<a name="line.821"></a>
-<span class="sourceLineNo">822</span> return o;<a name="line.822"></a>
-<span class="sourceLineNo">823</span> }<a name="line.823"></a>
-<span class="sourceLineNo">824</span><a name="line.824"></a>
-<span class="sourceLineNo">825</span> @Override /* ReaderParser */<a name="line.825"></a>
-<span class="sourceLineNo">826</span> protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {<a name="line.826"></a>
-<span class="sourceLineNo">827</span> JsonParserSession s = (JsonParserSession)session;<a name="line.827"></a>
-<span class="sourceLineNo">828</span> ParserReader r = s.getReader();<a name="line.828"></a>
-<span class="sourceLineNo">829</span> m = parseIntoMap2(s, r, m, (ClassMeta<K>)s.getClassMeta(keyType), (ClassMeta<V>)s.getClassMeta(valueType), null);<a name="line.829"></a>
-<span class="sourceLineNo">830</span> validateEnd(s, r);<a name="line.830"></a>
-<span class="sourceLineNo">831</span> return m;<a name="line.831"></a>
-<span class="sourceLineNo">832</span> }<a name="line.832"></a>
-<span class="sourceLineNo">833</span><a name="line.833"></a>
-<span class="sourceLineNo">834</span> @Override /* ReaderParser */<a name="line.834"></a>
-<span class="sourceLineNo">835</span> protected <E> Collection<E> doParseIntoCollection(ParserSession session, Collection<E> c, Type elementType) throws Exception {<a name="line.835"></a>
-<span class="sourceLineNo">836</span> JsonParserSession s = (JsonParserSession)session;<a name="line.836"></a>
-<span class="sourceLineNo">837</span> ParserReader r = s.getReader();<a name="line.837"></a>
-<span class="sourceLineNo">838</span> c = parseIntoCollection2(s, r, c, (ClassMeta<E>)s.getClassMeta(elementType), null);<a name="line.838"></a>
-<span class="sourceLineNo">839</span> validateEnd(s, r);<a name="line.839"></a>
-<span class="sourceLineNo">840</span> return c;<a name="line.840"></a>
-<span class="sourceLineNo">841</span> }<a name="line.841"></a>
-<span class="sourceLineNo">842</span><a name="line.842"></a>
-<span class="sourceLineNo">843</span> @Override /* ReaderParser */<a name="line.843"></a>
-<span class="sourceLineNo">844</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.844"></a>
-<span class="sourceLineNo">845</span> JsonParserSession s = (JsonParserSession)session;<a name="line.845"></a>
-<span class="sourceLineNo">846</span> ParserReader r = s.getReader();<a name="line.846"></a>
-<span class="sourceLineNo">847</span> Object[] a = parseArgs(s, r, argTypes);<a name="line.847"></a>
-<span class="sourceLineNo">848</span> validateEnd(s, r);<a name="line.848"></a>
-<span class="sourceLineNo">849</span> return a;<a name="line.849"></a>
-<span class="sourceLineNo">850</span> }<a name="line.850"></a>
-<span class="sourceLineNo">851</span>}<a name="line.851"></a>
+<span class="sourceLineNo">770</span> @Override /* Parser */<a name="line.770"></a>
+<span class="sourceLineNo">771</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.771"></a>
+<span class="sourceLineNo">772</span> JsonParserSession s = (JsonParserSession)session;<a name="line.772"></a>
+<span class="sourceLineNo">773</span> ParserReader r = s.getReader();<a name="line.773"></a>
+<span class="sourceLineNo">774</span> if (r == null)<a name="line.774"></a>
+<span class="sourceLineNo">775</span> return null;<a name="line.775"></a>
+<span class="sourceLineNo">776</span> T o = parseAnything(s, type, r, s.getOuter(), null);<a name="line.776"></a>
+<span class="sourceLineNo">777</span> validateEnd(s, r);<a name="line.777"></a>
+<span class="sourceLineNo">778</span> return o;<a name="line.778"></a>
+<span class="sourceLineNo">779</span> }<a name="line.779"></a>
+<span class="sourceLineNo">780</span><a name="line.780"></a>
+<span class="sourceLineNo">781</span> @Override /* ReaderParser */<a name="line.781"></a>
+<span class="sourceLineNo">782</span> protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> JsonParserSession s = (JsonParserSession)session;<a name="line.783"></a>
+<span class="sourceLineNo">784</span> ParserReader r = s.getReader();<a name="line.784"></a>
+<span class="sourceLineNo">785</span> m = parseIntoMap2(s, r, m, (ClassMeta<K>)s.getClassMeta(keyType), (ClassMeta<V>)s.getClassMeta(valueType), null);<a name="line.785"></a>
+<span class="sourceLineNo">786</span> validateEnd(s, r);<a name="line.786"></a>
+<span class="sourceLineNo">787</span> return m;<a name="line.787"></a>
+<span class="sourceLineNo">788</span> }<a name="line.788"></a>
+<span class="sourceLineNo">789</span><a name="line.789"></a>
+<span class="sourceLineNo">790</span> @Override /* ReaderParser */<a name="line.790"></a>
+<span class="sourceLineNo">791</span> protected <E> Collection<E> doParseIntoCollection(ParserSession session, Collection<E> c, Type elementType) throws Exception {<a name="line.791"></a>
+<span class="sourceLineNo">792</span> JsonParserSession s = (JsonParserSession)session;<a name="line.792"></a>
+<span class="sourceLineNo">793</span> ParserReader r = s.getReader();<a name="line.793"></a>
+<span class="sourceLineNo">794</span> c = parseIntoCollection2(s, r, c, s.getClassMeta(elementType), null);<a name="line.794"></a>
+<span class="sourceLineNo">795</span> validateEnd(s, r);<a name="line.795"></a>
+<span class="sourceLineNo">796</span> return c;<a name="line.796"></a>
+<span class="sourceLineNo">797</span> }<a name="line.797"></a>
+<span class="sourceLineNo">798</span>}<a name="line.798"></a>
[20/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.N3.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.N3.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.N3.html
index 675f202..9d7976b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.N3.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.N3.html
@@ -177,314 +177,315 @@
<span class="sourceLineNo">169</span> // Special case where we're parsing a loose collection of resources.<a name="line.169"></a>
<span class="sourceLineNo">170</span> if (s.isLooseCollections() && type.isCollectionOrArray()) {<a name="line.170"></a>
<span class="sourceLineNo">171</span> Collection c = null;<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if (type.isArray())<a name="line.172"></a>
+<span class="sourceLineNo">172</span> if (type.isArray() || type.isArgs())<a name="line.172"></a>
<span class="sourceLineNo">173</span> c = new ArrayList();<a name="line.173"></a>
<span class="sourceLineNo">174</span> else<a name="line.174"></a>
<span class="sourceLineNo">175</span> c = (type.canCreateNewInstance(session.getOuter()) ? (Collection<?>)type.newInstance(session.getOuter()) : new ObjectList(session));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (Resource resource : roots)<a name="line.176"></a>
-<span class="sourceLineNo">177</span> c.add(parseAnything(s, type.getElementType(), resource, session.getOuter(), null));<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> if (type.isArray())<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return (T)session.toArray(type, c);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> return (T)c;<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (roots.isEmpty())<a name="line.184"></a>
-<span class="sourceLineNo">185</span> return null;<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (roots.size() > 1)<a name="line.186"></a>
-<span class="sourceLineNo">187</span> throw new ParseException(session, "Too many root nodes found in model: {0}", roots.size());<a name="line.187"></a>
-<span class="sourceLineNo">188</span> Resource resource = roots.get(0);<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> return parseAnything(s, type, resource, session.getOuter(), null);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> /*<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * Finds the roots in the model using either the "root" property to identify it,<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * or by resorting to scanning the model for all nodes with no incoming predicates.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> */<a name="line.196"></a>
-<span class="sourceLineNo">197</span> private static List<Resource> getRoots(RdfParserSession session, Model m) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> List<Resource> l = new LinkedList<Resource>();<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> // First try to find the root using the "http://www.apache.org/juneau/root" property.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> Property root = m.createProperty(session.getJuneauNsUri(), RDF_juneauNs_ROOT);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> for (ResIterator i = m.listResourcesWithProperty(root); i.hasNext();)<a name="line.202"></a>
-<span class="sourceLineNo">203</span> l.add(i.next());<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span> if (! l.isEmpty())<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return l;<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> // Otherwise, we need to find all resources that aren't objects.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // We want to explicitly ignore statements where the subject<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // and object are the same node.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> Set<RDFNode> objects = new HashSet<RDFNode>();<a name="line.211"></a>
-<span class="sourceLineNo">212</span> for (StmtIterator i = m.listStatements(); i.hasNext();) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> Statement st = i.next();<a name="line.213"></a>
-<span class="sourceLineNo">214</span> RDFNode subject = st.getSubject();<a name="line.214"></a>
-<span class="sourceLineNo">215</span> RDFNode object = st.getObject();<a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (object.isResource() && ! object.equals(subject))<a name="line.216"></a>
-<span class="sourceLineNo">217</span> objects.add(object);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> for (ResIterator i = m.listSubjects(); i.hasNext();) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> Resource r = i.next();<a name="line.220"></a>
-<span class="sourceLineNo">221</span> if (! objects.contains(r))<a name="line.221"></a>
-<span class="sourceLineNo">222</span> l.add(r);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> return l;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> private <T> BeanMap<T> parseIntoBeanMap(RdfParserSession session, Resource r2, BeanMap<T> m) throws Exception {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> BeanMeta<T> bm = m.getMeta();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.230"></a>
-<span class="sourceLineNo">231</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> Statement st = i.next();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> Property p = st.getPredicate();<a name="line.234"></a>
-<span class="sourceLineNo">235</span> String key = session.decodeString(p.getLocalName());<a name="line.235"></a>
-<span class="sourceLineNo">236</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> session.setCurrentProperty(pMeta);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (pMeta != null) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> RDFNode o = st.getObject();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> if (cm.isCollectionOrArray() && isMultiValuedCollections(session, pMeta)) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> ClassMeta<?> et = cm.getElementType();<a name="line.242"></a>
-<span class="sourceLineNo">243</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> setName(et, value, key);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> pMeta.add(m, value);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> setName(cm, value, key);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> pMeta.set(m, value);<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> session.setCurrentProperty(null);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m;<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> private static boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (pMeta != null && pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> return session.getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.265"></a>
-<span class="sourceLineNo">266</span> private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> if (eType == null)<a name="line.268"></a>
-<span class="sourceLineNo">269</span> eType = (ClassMeta<T>)object();<a name="line.269"></a>
-<span class="sourceLineNo">270</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> session.setCurrentClass(sType);<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (! sType.canCreateNewInstance(outer)) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> if (n.isResource()) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> Statement st = n.asResource().getProperty(session.getTypeProperty());<a name="line.276"></a>
-<span class="sourceLineNo">277</span> if (st != null) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> String c = st.getLiteral().getString();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> ClassMeta tcm = session.getClassMeta(c, pMeta, eType);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (tcm != null)<a name="line.280"></a>
-<span class="sourceLineNo">281</span> sType = eType = tcm;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> Object o = null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> // Do nothing. Leave o == null.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> } else if (sType.isObject()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> if (n.isLiteral()) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> o = n.asLiteral().getValue();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> if (o instanceof String) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> o = session.decodeString(o);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> else if (n.isResource()) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> Resource r = n.asResource();<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (session.wasAlreadyProcessed(r))<a name="line.298"></a>
-<span class="sourceLineNo">299</span> o = r.getURI();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> else if (r.getProperty(session.getValueProperty()) != null) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer, null);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> } else if (isSeq(session, r)) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> o = new ObjectList(session);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.304"></a>
-<span class="sourceLineNo">305</span> } else if (isBag(session, r)) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> o = new ObjectList(session);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> } else if (r.canAs(RDFList.class)) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> o = new ObjectList(session);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> } else {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> // If it has a URI and no child properties, we interpret this as an<a name="line.312"></a>
-<span class="sourceLineNo">313</span> // external resource, and convert it to just a URL.<a name="line.313"></a>
-<span class="sourceLineNo">314</span> String uri = r.getURI();<a name="line.314"></a>
-<span class="sourceLineNo">315</span> if (uri != null && ! r.listProperties().hasNext()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> o = r.getURI();<a name="line.316"></a>
-<span class="sourceLineNo">317</span> } else {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> ObjectMap m2 = new ObjectMap(session);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> parseIntoMap(session, r, m2, null, null, pMeta);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> o = session.cast(m2, pMeta, eType);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span> } else {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } else if (sType.isBoolean()) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> o = session.convertToType(getValue(session, n, outer), boolean.class);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> } else if (sType.isCharSequence()) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> o = session.decodeString(getValue(session, n, outer));<a name="line.329"></a>
-<span class="sourceLineNo">330</span> } else if (sType.isChar()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> o = session.decodeString(getValue(session, n, outer)).charAt(0);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> } else if (sType.isNumber()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass());<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } else if (sType.isMap()) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> Resource r = n.asResource();<a name="line.335"></a>
-<span class="sourceLineNo">336</span> if (session.wasAlreadyProcessed(r))<a name="line.336"></a>
-<span class="sourceLineNo">337</span> return null;<a name="line.337"></a>
-<span class="sourceLineNo">338</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.338"></a>
-<span class="sourceLineNo">339</span> o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType(), pMeta);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> } else if (sType.isCollectionOrArray()) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> if (sType.isArray())<a name="line.341"></a>
-<span class="sourceLineNo">342</span> o = new ArrayList();<a name="line.342"></a>
-<span class="sourceLineNo">343</span> else<a name="line.343"></a>
-<span class="sourceLineNo">344</span> o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(session));<a name="line.344"></a>
-<span class="sourceLineNo">345</span> Resource r = n.asResource();<a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (session.wasAlreadyProcessed(r))<a name="line.346"></a>
-<span class="sourceLineNo">347</span> return null;<a name="line.347"></a>
-<span class="sourceLineNo">348</span> if (isSeq(session, r)) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> } else if (isBag(session, r)) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> } else if (r.canAs(RDFList.class)) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> } else {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> throw new ParseException("Unrecognized node type ''{0}'' for collection", n);<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (sType.isArray())<a name="line.357"></a>
-<span class="sourceLineNo">358</span> o = session.toArray(sType, (Collection)o);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> Resource r = n.asResource();<a name="line.360"></a>
-<span class="sourceLineNo">361</span> if (session.wasAlreadyProcessed(r))<a name="line.361"></a>
-<span class="sourceLineNo">362</span> return null;<a name="line.362"></a>
-<span class="sourceLineNo">363</span> BeanMap<?> bm = session.newBeanMap(outer, sType.getInnerClass());<a name="line.363"></a>
-<span class="sourceLineNo">364</span> o = parseIntoBeanMap(session, r, bm).getBean();<a name="line.364"></a>
-<span class="sourceLineNo">365</span> } else if (sType.isUri() && n.isResource()) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));<a name="line.366"></a>
-<span class="sourceLineNo">367</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass()));<a name="line.370"></a>
-<span class="sourceLineNo">371</span> } else if (n.isResource()) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> Resource r = n.asResource();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> Map m = new ObjectMap(session);<a name="line.373"></a>
-<span class="sourceLineNo">374</span> parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.375"></a>
-<span class="sourceLineNo">376</span> o = session.cast((ObjectMap)m, pMeta, eType);<a name="line.376"></a>
-<span class="sourceLineNo">377</span> else<a name="line.377"></a>
-<span class="sourceLineNo">378</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.378"></a>
-<span class="sourceLineNo">379</span> } else {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> if (transform != null && o != null)<a name="line.383"></a>
-<span class="sourceLineNo">384</span> o = transform.unswap(session, o, eType);<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (outer != null)<a name="line.386"></a>
-<span class="sourceLineNo">387</span> setParent(eType, o, outer);<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> return (T)o;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> private static boolean isSeq(RdfParserSession session, RDFNode n) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (n.isResource()) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.394"></a>
-<span class="sourceLineNo">395</span> if (st != null)<a name="line.395"></a>
-<span class="sourceLineNo">396</span> return RDF_SEQ.equals(st.getResource().getURI());<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span> return false;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> private static boolean isBag(RdfParserSession session, RDFNode n) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> if (n.isResource()) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (st != null)<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return RDF_BAG.equals(st.getResource().getURI());<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return false;<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> private Object getValue(RdfParserSession session, RDFNode n, Object outer) throws Exception {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> if (n.isLiteral())<a name="line.411"></a>
-<span class="sourceLineNo">412</span> return n.asLiteral().getValue();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (n.isResource()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> Statement st = n.asResource().getProperty(session.getValueProperty());<a name="line.414"></a>
-<span class="sourceLineNo">415</span> if (st != null) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> n = st.getObject();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (n.isLiteral())<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return n.asLiteral().getValue();<a name="line.418"></a>
-<span class="sourceLineNo">419</span> return parseAnything(session, object(), st.getObject(), outer, null);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> throw new ParseException(session, "Unknown value type for node ''{0}''", n);<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> private <K,V> Map<K,V> parseIntoMap(RdfParserSession session, Resource r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> // Add URI as "uri" to generic maps.<a name="line.426"></a>
-<span class="sourceLineNo">427</span> if (r.getURI() != null) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> K uri = convertAttrToType(session, m, "uri", keyType);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> V value = convertAttrToType(session, m, r.getURI(), valueType);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> m.put(uri, value);<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for (StmtIterator i = r.listProperties(); i.hasNext();) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> Statement st = i.next();<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Property p = st.getPredicate();<a name="line.434"></a>
-<span class="sourceLineNo">435</span> String key = p.getLocalName();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (! (key.equals("root") && p.getURI().equals(session.getJuneauNsUri()))) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> key = session.decodeString(key);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> RDFNode o = st.getObject();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> K key2 = convertAttrToType(session, m, key, keyType);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> V value = parseAnything(session, valueType, o, m, pMeta);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> setName(valueType, value, key);<a name="line.441"></a>
-<span class="sourceLineNo">442</span> m.put(key2, value);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> return m;<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, Container c, Collection<E> l, ClassMeta<E> et, BeanPropertyMeta pMeta) throws Exception {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> for (NodeIterator ni = c.iterator(); ni.hasNext();) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> E e = parseAnything(session, et, ni.next(), l, pMeta);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> l.add(e);<a name="line.452"></a>
-<span class="sourceLineNo">453</span> }<a name="line.453"></a>
-<span class="sourceLineNo">454</span> return l;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, RDFList list, Collection<E> l, ClassMeta<E> et, BeanPropertyMeta pMeta) throws Exception {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> for (ExtendedIterator<RDFNode> ni = list.iterator(); ni.hasNext();) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span> E e = parseAnything(session, et, ni.next(), l, pMeta);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> l.add(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span> return l;<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> @Override /* Parser */<a name="line.465"></a>
-<span class="sourceLineNo">466</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> throw new UnsupportedOperationException("Parser '"+getClass().getName()+"' does not support this method.");<a name="line.467"></a>
-<span class="sourceLineNo">468</span> }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span> <a name="line.470"></a>
-<span class="sourceLineNo">471</span> //--------------------------------------------------------------------------------<a name="line.471"></a>
-<span class="sourceLineNo">472</span> // Entry point methods<a name="line.472"></a>
-<span class="sourceLineNo">473</span> //--------------------------------------------------------------------------------<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> @Override /* Parser */<a name="line.475"></a>
-<span class="sourceLineNo">476</span> public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span>}<a name="line.479"></a>
+<span class="sourceLineNo">176</span> <a name="line.176"></a>
+<span class="sourceLineNo">177</span> int argIndex = 0;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> for (Resource resource : roots)<a name="line.178"></a>
+<span class="sourceLineNo">179</span> c.add(parseAnything(s, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), resource, session.getOuter(), null));<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> if (type.isArray() || type.isArgs())<a name="line.181"></a>
+<span class="sourceLineNo">182</span> return (T)session.toArray(type, c);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> return (T)c;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (roots.isEmpty())<a name="line.186"></a>
+<span class="sourceLineNo">187</span> return null;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (roots.size() > 1)<a name="line.188"></a>
+<span class="sourceLineNo">189</span> throw new ParseException(session, "Too many root nodes found in model: {0}", roots.size());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> Resource resource = roots.get(0);<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> return parseAnything(s, type, resource, session.getOuter(), null);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<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> * Finds the roots in the model using either the "root" property to identify it,<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * or by resorting to scanning the model for all nodes with no incoming predicates.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> */<a name="line.198"></a>
+<span class="sourceLineNo">199</span> private static List<Resource> getRoots(RdfParserSession session, Model m) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> List<Resource> l = new LinkedList<Resource>();<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> // First try to find the root using the "http://www.apache.org/juneau/root" property.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> Property root = m.createProperty(session.getJuneauNsUri(), RDF_juneauNs_ROOT);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> for (ResIterator i = m.listResourcesWithProperty(root); i.hasNext();)<a name="line.204"></a>
+<span class="sourceLineNo">205</span> l.add(i.next());<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> if (! l.isEmpty())<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return l;<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> // Otherwise, we need to find all resources that aren't objects.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> // We want to explicitly ignore statements where the subject<a name="line.211"></a>
+<span class="sourceLineNo">212</span> // and object are the same node.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> Set<RDFNode> objects = new HashSet<RDFNode>();<a name="line.213"></a>
+<span class="sourceLineNo">214</span> for (StmtIterator i = m.listStatements(); i.hasNext();) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> Statement st = i.next();<a name="line.215"></a>
+<span class="sourceLineNo">216</span> RDFNode subject = st.getSubject();<a name="line.216"></a>
+<span class="sourceLineNo">217</span> RDFNode object = st.getObject();<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (object.isResource() && ! object.equals(subject))<a name="line.218"></a>
+<span class="sourceLineNo">219</span> objects.add(object);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> for (ResIterator i = m.listSubjects(); i.hasNext();) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> Resource r = i.next();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> if (! objects.contains(r))<a name="line.223"></a>
+<span class="sourceLineNo">224</span> l.add(r);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span> return l;<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> private <T> BeanMap<T> parseIntoBeanMap(RdfParserSession session, Resource r2, BeanMap<T> m) throws Exception {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> BeanMeta<T> bm = m.getMeta();<a name="line.230"></a>
+<span class="sourceLineNo">231</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.232"></a>
+<span class="sourceLineNo">233</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.233"></a>
+<span class="sourceLineNo">234</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> Statement st = i.next();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> Property p = st.getPredicate();<a name="line.236"></a>
+<span class="sourceLineNo">237</span> String key = session.decodeString(p.getLocalName());<a name="line.237"></a>
+<span class="sourceLineNo">238</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> session.setCurrentProperty(pMeta);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (pMeta != null) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> RDFNode o = st.getObject();<a name="line.241"></a>
+<span class="sourceLineNo">242</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> if (cm.isCollectionOrArray() && isMultiValuedCollections(session, pMeta)) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> ClassMeta<?> et = cm.getElementType();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> setName(et, value, key);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> pMeta.add(m, value);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> } else {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> setName(cm, value, key);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> pMeta.set(m, value);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> session.setCurrentProperty(null);<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return m;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> private static boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> if (pMeta != null && pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.262"></a>
+<span class="sourceLineNo">263</span> return pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> return session.getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.267"></a>
+<span class="sourceLineNo">268</span> private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> if (eType == null)<a name="line.270"></a>
+<span class="sourceLineNo">271</span> eType = (ClassMeta<T>)object();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.273"></a>
+<span class="sourceLineNo">274</span> session.setCurrentClass(sType);<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> if (! sType.canCreateNewInstance(outer)) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (n.isResource()) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> Statement st = n.asResource().getProperty(session.getTypeProperty());<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (st != null) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> String c = st.getLiteral().getString();<a name="line.280"></a>
+<span class="sourceLineNo">281</span> ClassMeta tcm = session.getClassMeta(c, pMeta, eType);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (tcm != null)<a name="line.282"></a>
+<span class="sourceLineNo">283</span> sType = eType = tcm;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> Object o = null;<a name="line.288"></a>
+<span class="sourceLineNo">289</span> if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // Do nothing. Leave o == null.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> } else if (sType.isObject()) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (n.isLiteral()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> o = n.asLiteral().getValue();<a name="line.293"></a>
+<span class="sourceLineNo">294</span> if (o instanceof String) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> o = session.decodeString(o);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> else if (n.isResource()) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> Resource r = n.asResource();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> if (session.wasAlreadyProcessed(r))<a name="line.300"></a>
+<span class="sourceLineNo">301</span> o = r.getURI();<a name="line.301"></a>
+<span class="sourceLineNo">302</span> else if (r.getProperty(session.getValueProperty()) != null) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer, null);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> } else if (isSeq(session, r)) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> o = new ObjectList(session);<a name="line.305"></a>
+<span class="sourceLineNo">306</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType, pMeta);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> } else if (isBag(session, r)) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> o = new ObjectList(session);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType, pMeta);<a name="line.309"></a>
+<span class="sourceLineNo">310</span> } else if (r.canAs(RDFList.class)) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> o = new ObjectList(session);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType, pMeta);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> } else {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> // If it has a URI and no child properties, we interpret this as an<a name="line.314"></a>
+<span class="sourceLineNo">315</span> // external resource, and convert it to just a URL.<a name="line.315"></a>
+<span class="sourceLineNo">316</span> String uri = r.getURI();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (uri != null && ! r.listProperties().hasNext()) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> o = r.getURI();<a name="line.318"></a>
+<span class="sourceLineNo">319</span> } else {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> ObjectMap m2 = new ObjectMap(session);<a name="line.320"></a>
+<span class="sourceLineNo">321</span> parseIntoMap(session, r, m2, null, null, pMeta);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> o = session.cast(m2, pMeta, eType);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span> } else {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span> } else if (sType.isBoolean()) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> o = session.convertToType(getValue(session, n, outer), boolean.class);<a name="line.329"></a>
+<span class="sourceLineNo">330</span> } else if (sType.isCharSequence()) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> o = session.decodeString(getValue(session, n, outer));<a name="line.331"></a>
+<span class="sourceLineNo">332</span> } else if (sType.isChar()) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> o = session.decodeString(getValue(session, n, outer)).charAt(0);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> } else if (sType.isNumber()) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass());<a name="line.335"></a>
+<span class="sourceLineNo">336</span> } else if (sType.isMap()) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> Resource r = n.asResource();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> if (session.wasAlreadyProcessed(r))<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return null;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.340"></a>
+<span class="sourceLineNo">341</span> o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType(), pMeta);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> } else if (sType.isCollectionOrArray() || sType.isArgs()) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> if (sType.isArray() || sType.isArgs())<a name="line.343"></a>
+<span class="sourceLineNo">344</span> o = new ArrayList();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> else<a name="line.345"></a>
+<span class="sourceLineNo">346</span> o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(session));<a name="line.346"></a>
+<span class="sourceLineNo">347</span> Resource r = n.asResource();<a name="line.347"></a>
+<span class="sourceLineNo">348</span> if (session.wasAlreadyProcessed(r))<a name="line.348"></a>
+<span class="sourceLineNo">349</span> return null;<a name="line.349"></a>
+<span class="sourceLineNo">350</span> if (isSeq(session, r)) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType, pMeta);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> } else if (isBag(session, r)) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType, pMeta);<a name="line.353"></a>
+<span class="sourceLineNo">354</span> } else if (r.canAs(RDFList.class)) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType, pMeta);<a name="line.355"></a>
+<span class="sourceLineNo">356</span> } else {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> throw new ParseException("Unrecognized node type ''{0}'' for collection", n);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> if (sType.isArray() || sType.isArgs())<a name="line.359"></a>
+<span class="sourceLineNo">360</span> o = session.toArray(sType, (Collection)o);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> Resource r = n.asResource();<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (session.wasAlreadyProcessed(r))<a name="line.363"></a>
+<span class="sourceLineNo">364</span> return null;<a name="line.364"></a>
+<span class="sourceLineNo">365</span> BeanMap<?> bm = session.newBeanMap(outer, sType.getInnerClass());<a name="line.365"></a>
+<span class="sourceLineNo">366</span> o = parseIntoBeanMap(session, r, bm).getBean();<a name="line.366"></a>
+<span class="sourceLineNo">367</span> } else if (sType.isUri() && n.isResource()) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));<a name="line.368"></a>
+<span class="sourceLineNo">369</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));<a name="line.370"></a>
+<span class="sourceLineNo">371</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass()));<a name="line.372"></a>
+<span class="sourceLineNo">373</span> } else if (n.isResource()) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> Resource r = n.asResource();<a name="line.374"></a>
+<span class="sourceLineNo">375</span> Map m = new ObjectMap(session);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.377"></a>
+<span class="sourceLineNo">378</span> o = session.cast((ObjectMap)m, pMeta, eType);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> else<a name="line.379"></a>
+<span class="sourceLineNo">380</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.380"></a>
+<span class="sourceLineNo">381</span> } else {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (transform != null && o != null)<a name="line.385"></a>
+<span class="sourceLineNo">386</span> o = transform.unswap(session, o, eType);<a name="line.386"></a>
+<span class="sourceLineNo">387</span><a name="line.387"></a>
+<span class="sourceLineNo">388</span> if (outer != null)<a name="line.388"></a>
+<span class="sourceLineNo">389</span> setParent(eType, o, outer);<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> return (T)o;<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> private static boolean isSeq(RdfParserSession session, RDFNode n) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (n.isResource()) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.396"></a>
+<span class="sourceLineNo">397</span> if (st != null)<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return RDF_SEQ.equals(st.getResource().getURI());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> return false;<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> private static boolean isBag(RdfParserSession session, RDFNode n) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> if (n.isResource()) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if (st != null)<a name="line.406"></a>
+<span class="sourceLineNo">407</span> return RDF_BAG.equals(st.getResource().getURI());<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span> return false;<a name="line.409"></a>
+<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span> private Object getValue(RdfParserSession session, RDFNode n, Object outer) throws Exception {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> if (n.isLiteral())<a name="line.413"></a>
+<span class="sourceLineNo">414</span> return n.asLiteral().getValue();<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (n.isResource()) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> Statement st = n.asResource().getProperty(session.getValueProperty());<a name="line.416"></a>
+<span class="sourceLineNo">417</span> if (st != null) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> n = st.getObject();<a name="line.418"></a>
+<span class="sourceLineNo">419</span> if (n.isLiteral())<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return n.asLiteral().getValue();<a name="line.420"></a>
+<span class="sourceLineNo">421</span> return parseAnything(session, object(), st.getObject(), outer, null);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span> }<a name="line.423"></a>
+<span class="sourceLineNo">424</span> throw new ParseException(session, "Unknown value type for node ''{0}''", n);<a name="line.424"></a>
+<span class="sourceLineNo">425</span> }<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> private <K,V> Map<K,V> parseIntoMap(RdfParserSession session, Resource r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> // Add URI as "uri" to generic maps.<a name="line.428"></a>
+<span class="sourceLineNo">429</span> if (r.getURI() != null) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> K uri = convertAttrToType(session, m, "uri", keyType);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> V value = convertAttrToType(session, m, r.getURI(), valueType);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> m.put(uri, value);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> for (StmtIterator i = r.listProperties(); i.hasNext();) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> Statement st = i.next();<a name="line.435"></a>
+<span class="sourceLineNo">436</span> Property p = st.getPredicate();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> String key = p.getLocalName();<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (! (key.equals("root") && p.getURI().equals(session.getJuneauNsUri()))) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> key = session.decodeString(key);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> RDFNode o = st.getObject();<a name="line.440"></a>
+<span class="sourceLineNo">441</span> K key2 = convertAttrToType(session, m, key, keyType);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> V value = parseAnything(session, valueType, o, m, pMeta);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> setName(valueType, value, key);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> m.put(key2, value);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> }<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span> return m;<a name="line.448"></a>
+<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> @SuppressWarnings("unchecked")<a name="line.451"></a>
+<span class="sourceLineNo">452</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, Container c, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> int argIndex = 0;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> for (NodeIterator ni = c.iterator(); ni.hasNext();) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> E e = (E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), ni.next(), l, pMeta);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> l.add(e);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return l;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span> @SuppressWarnings("unchecked")<a name="line.461"></a>
+<span class="sourceLineNo">462</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, RDFList list, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> int argIndex = 0;<a name="line.463"></a>
+<span class="sourceLineNo">464</span> for (ExtendedIterator<RDFNode> ni = list.iterator(); ni.hasNext();) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> E e = (E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), ni.next(), l, pMeta);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> l.add(e);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span> return l;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> }<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span> <a name="line.471"></a>
+<span class="sourceLineNo">472</span> //--------------------------------------------------------------------------------<a name="line.472"></a>
+<span class="sourceLineNo">473</span> // Entry point methods<a name="line.473"></a>
+<span class="sourceLineNo">474</span> //--------------------------------------------------------------------------------<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span> @Override /* Parser */<a name="line.476"></a>
+<span class="sourceLineNo">477</span> public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span> return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.478"></a>
+<span class="sourceLineNo">479</span> }<a name="line.479"></a>
+<span class="sourceLineNo">480</span>}<a name="line.480"></a>
[30/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/xml/XmlParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlParser.html b/content/site/apidocs/org/apache/juneau/xml/XmlParser.html
index 1dbd771..35f4bfa 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlParser.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlParser.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -239,13 +239,6 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
</td>
</tr>
<tr id="i3" class="rowColor">
-<td class="colFirst"><code>protected <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></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)</code>
-<div class="block">Implementation method.</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
<td class="colFirst"><code>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlParser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> c,
@@ -253,7 +246,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<div class="block">Implementation method.</div>
</td>
</tr>
-<tr id="i5" class="rowColor">
+<tr id="i4" class="altColor">
<td class="colFirst"><code>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlParser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
@@ -262,7 +255,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<div class="block">Implementation method.</div>
</td>
</tr>
-<tr id="i6" class="altColor">
+<tr id="i5" class="rowColor">
<td class="colFirst"><code>protected <T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlParser.html#parseAnything-org.apache.juneau.xml.XmlParserSession-org.apache.juneau.ClassMeta-java.lang.String-javax.xml.stream.XMLStreamReader-java.lang.Object-boolean-org.apache.juneau.BeanPropertyMeta-">parseAnything</a></span>(<a href="../../../../org/apache/juneau/xml/XmlParserSession.html" title="class in org.apache.juneau.xml">XmlParserSession</a> session,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> eType,
@@ -287,7 +280,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.
ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.
apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
@@ -412,7 +405,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/xml/XmlParserSession.html" title="class in org.apache.juneau.xml">XmlParserSession</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParser.html#line.514">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
+<pre>public <a href="../../../../org/apache/juneau/xml/XmlParserSession.html" title="class in org.apache.juneau.xml">XmlParserSession</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParser.html#line.498">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> op,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> javaMethod,
<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> outer,
@@ -450,7 +443,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>doParse</h4>
-<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/xml/XmlParser.html#line.519">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/xml/XmlParser.html#line.503">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> type)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">Parser</a></code></span></div>
@@ -479,7 +472,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>doParseIntoMap</h4>
-<pre>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> <a href="../../../../src-html/org/apache/juneau/xml/XmlParser.html#line.525">doParseIntoMap</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> <a href="../../../../src-html/org/apache/juneau/xml/XmlParser.html#line.509">doParseIntoMap</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> keyType,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> valueType)
@@ -506,10 +499,10 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<a name="doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">
<!-- -->
</a>
-<ul class="blockList">
+<ul class="blockListLast">
<li class="blockList">
<h4>doParseIntoCollection</h4>
-<pre>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> <a href="../../../../src-html/org/apache/juneau/xml/XmlParser.html#line.532">doParseIntoCollection</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> <a href="../../../../src-html/org/apache/juneau/xml/XmlParser.html#line.516">doParseIntoCollection</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> c,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> elementType)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -531,32 +524,6 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
</dl>
</li>
</ul>
-<a name="doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>doParseArgs</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[] <a href="../../../../src-html/org/apache/juneau/xml/XmlParser.html#line.539">doParseArgs</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">Parser</a></code></span></div>
-<div class="block">Implementation method.
- Default implementation throws an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/UnsupportedOperationException.html?is-external=true" title="class or interface in java.lang"><code>UnsupportedOperationException</code></a>.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></code> in class <code><a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The runtime session object returned by <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-"><code>Parser.createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</code></a>.
- If <jk>null</jk>, one will be created using <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-"><code>Parser.createSession(Object)</code></a>.</dd>
-<dd><code>argTypes</code> - Specifies the type of objects to create for each entry in the array.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>An array of parsed objects.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code> - If thrown from underlying stream, or if the input contains a syntax error or is malformed.</dd>
-</dl>
-</li>
-</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html b/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html
index 212b655..3254737 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html
@@ -276,7 +276,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title=
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html b/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html
index 1a13190..3d681a7 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html
@@ -263,7 +263,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/xml/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/package-summary.html b/content/site/apidocs/org/apache/juneau/xml/package-summary.html
index 95fdb01..609b7f1 100644
--- a/content/site/apidocs/org/apache/juneau/xml/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/xml/package-summary.html
@@ -3128,12 +3128,12 @@
// Consists of an in-memory address book repository.</jc>
<ja>@RestResource</ja>(
messages=<js>"nls/AddressBookResource"</js>,
+ title=<js>"$L{title}"</js>,
+ description=<js>"$L{description}"</js>,
+ pageLinks=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>,
properties={
<ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
- <ja>@Property</ja>(name=HtmlSerializerContext.<jsf>HTML_uriAnchorText</jsf>, value=<jsf>TO_STRING</jsf>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, value=<js>"$L{title}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"$L{description}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>)
+ <ja>@Property</ja>(name=HtmlSerializerContext.<jsf>HTML_uriAnchorText</jsf>, value=<jsf>TO_STRING</jsf>)
},
encoders=GzipEncoder.<jk>class</jk>
)
@@ -3162,8 +3162,8 @@
<p class='bcode'>
<jc>// GET person request handler</jc>
<ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/people/{id}/*"</js>, rc={200,404})
- <jk>public</jk> Person getPerson(RestRequest req, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
- properties.put(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, req.getPathInfo());
+ <jk>public</jk> Person getPerson(RestRequest req, RestResponse res, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
+ res.setPageTitle(req.getPathInfo());
<jk>return</jk> findPerson(id);
}
@@ -3222,8 +3222,8 @@
<ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>)
}
)
- <jk>public</jk> Person getPerson(RestRequest req, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
- properties.put(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, req.getPathInfo());
+ <jk>public</jk> Person getPerson(RestRequest req, RestRequest res, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
+ res.setPageTitle(req.getPathInfo());
<jk>return</jk> findPerson(id);
}
</p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index bba44fa..04a3f10 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -1731,7 +1731,7 @@
URL key4;
<jc>// Load our config file</jc>
- ConfigFile f = ConfigMgr.<jsf>DEFAULT</jsf>.get(<js>"MyIniFile.cfg"</js>);
+ ConfigFile f = <jk>new</jk> ConfigFileBuilder().build(<js>"MyIniFile.cfg"</js>);
<jc>// Read values from default section</jc>
key1 = f.getInt(<js>"key1"</js>);
@@ -1750,7 +1750,7 @@
</p>
<p class='bcode'>
<jc>// Construct the sample INI file programmatically</jc>
- ConfigFile cf = ConfigMgr.<jsf>DEFAULT</jsf>.create(<js>"MyIniFile.cfg"</js>)
+ ConfigFile cf = <jk>new</jk> ConfigFileBuilder().build(<js>"MyIniFile.cfg"</js>)
.addLines(<jk>null</jk>,
<js>"# Default section"</js>,
<js>"key1 = 1"</js>,
@@ -1772,7 +1772,7 @@
</p>
<p class='bcode'>
<jc>// Construct the sample INI file programmatically</jc>
- ConfigFile cf = ConfigMgr.<jsf>DEFAULT</jsf>.create(<js>"MyIniFile.cfg"</js>)
+ ConfigFile cf = <jk>new</jk> ConfigFileBuilder().build(<js>"MyIniFile.cfg"</js>)
.addLines(<jk>null</jk>,
<js>"# Default section"</js>)
.addHeaderComments(<js>"section1"</js>,
@@ -2299,9 +2299,9 @@
path=<js>"/systemProperties"</js>,
title=<js>"System properties resource"</js>,
description=<js>"REST interface for performing CRUD operations on system properties."</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>,
properties={
- <ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'$R{servletURI}?method=OPTIONS'}"</js>),
+ <ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>)
},
stylesheet=<js>"styles/devops.css"</js>,
encoders=GzipEncoder.<jk>class</jk>,
@@ -2965,9 +2965,7 @@
<ja>@RestResource</ja>(
path=<js>"/"</js>,
messages=<js>"nls/RootResources"</js>,
- properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'$R{servletURI}?method=OPTIONS',source:'$R{servletURI}/source?classes=(org.apache.juneau.rest.samples.RootResources)'}"</js>)
- },
+ pageLinks=<js>"{options:'?method=OPTIONS'}"</js>,
children={
HelloWorldResource.<jk>class</jk>,
MethodExampleResource.<jk>class</jk>,
@@ -3059,9 +3057,7 @@
<ja>@RestResource</ja>(
messages=<js>"nls/HelloWorldResource"</js>,
path=<js>"/helloWorld"</js>,
- properties={
- <ja>@Property</ja>(name=HTMLDOC_links, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>)
- }
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
)
<jk>public class</jk> HelloWorldResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -3136,9 +3132,7 @@
<ja>@RestResource</ja>(
path=<js>"/methodExample"</js>,
messages=<js>"nls/MethodExampleResource"</js>,
- properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.MethodExampleResource)'}"</js>)
- }
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
)
<jk>public class</jk> MethodExampleResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -3280,9 +3274,7 @@
</p>
<p class='bcode'>
<ja>@RestResource</ja>(
- properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS'}"</js>)
- }
+ pageLinks=<js>"{options:'?method=OPTIONS'}"</js>
)
</p>
<p>
@@ -3547,10 +3539,10 @@
<ja>@RestResource</ja>(
path=<js>"/echo"</js>,
messages=<js>"nls/RequestEchoResource"</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>,
properties={
<ja>@Property</ja>(name=<jsf>SERIALIZER_maxDepth</jsf>, value=<js>"10"</js>),
- <ja>@Property</ja>(name=<jsf>SERIALIZER_detectRecursions</jsf>, value=<js>"true"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.RequestEchoResource)'}"</js>)
+ <ja>@Property</ja>(name=<jsf>SERIALIZER_detectRecursions</jsf>, value=<js>"true"</js>)
},
beanFilters={
<jc>// Interpret these as their parent classes, not subclasses</jc>
@@ -3565,10 +3557,9 @@
<jd>/** GET request handler */</jd>
<ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/*"</js>, converters={Queryable.<jk>class</jk>,Traversable.<jk>class</jk>})
- <jk>public</jk> HttpServletRequest doGet(RestRequest req, <ja>@Properties</ja> ObjectMap properties) {
+ <jk>public</jk> HttpServletRequest doGet(RestRequest req, RestResponse res, <ja>@Properties</ja> ObjectMap properties) {
<jc>// Set the HtmlDocSerializer title programmatically.
- // This sets the value for this request only.</jc>
- properties.put(<jsf>HTMLDOC_title</jsf>, <js>"Contents of HttpServletRequest object"</js>);
+ res.setPageTitle(req.getPathInfo());
<jc>// Just echo the request back as the response.</jc>
<jk>return</jk> req;
@@ -3606,7 +3597,7 @@
.addPojoSwaps(EnumerationSwap.<jk>class</jk>)
.setProperty(<jsf>SERIALIZER_maxDepth</jsf>, 10)
.setProperty(<jsf>SERIALIZER_detectRecursions</jsf>, <jk>true</jk>)
- .property(<jsf>HTMLDOC_links</jsf>, <js>"{...}"</js>);
+ .setPageLinks(<js>"{...}"</js>);
<jc>// Don't forget to call this!</jc>
<jk>super</jk>.init(config);
@@ -4003,13 +3994,13 @@
<ja>@RestResource</ja>(
path=<js>"/addressBook"</js>,
messages=<js>"nls/AddressBookResource"</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>,
properties={
<ja>@Property</ja>(name=<jsf>REST_allowMethodParam</jsf>, value=<js>"*"</js>),
<ja>@Property</ja>(name=<jsf>HTML_uriAnchorText</jsf>, value=<jsf>TO_STRING</jsf>),
<ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
<ja>@Property</ja>(name=<jsf>RDF_rdfxml_tab</jsf>, value=<js>"5"</js>),
<ja>@Property</ja>(name=<jsf>RDF_addRootProperty</jsf>, value=<js>"true"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'$R{servletURI}?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.addressbook.AddressBookResource,org.apache.juneau.examples.addressbook.Address,org.apache.juneau.examples.addressbook.AddressBook,org.apache.juneau.examples.addressbook.CreateAddress,org.apache.juneau.examples.addressbook.CreatePerson,org.apache.juneau.examples.addressbook.IAddressBook,org.apache.juneau.examples.addressbook.Person)'}"</js>),
<jc>// Resolve all relative URIs so that they're relative to this servlet!</jc>
<ja>@Property</ja>(name=<jsf>SERIALIZER_relativeUriBase</jsf>, value=<js>"$R{servletURI}"</js>),
},
@@ -4652,10 +4643,10 @@
<ja>@RestResource</ja>(
path=<js>"/remoteable"</js>,
messages=<js>"nls/SampleRemoteableServlet"</js>,
+ title=<js>"Remoteable Service Proxy API"</js>,
+ description=<js>"Sample class showing how to use remoteable proxies. The list below are exposed services that can be retrieved using RestClient.getProxyInterface(Class)."</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>,
properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"Remoteable Service Proxy API"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"Sample class showing how to use remoteable proxies. The list below are exposed services that can be retrieved using RestClient.getProxyInterface(Class)."</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'$R{servletURI}?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.SampleRemoteableServlet)'}"</js>),
<jc>// Allow us to use method=POST from a browser.</jc>
<ja>@Property</ja>(name=<jsf>REST_allowMethodParam</jsf>, value=<js>"*"</js>)
}
@@ -4759,12 +4750,12 @@
<ja>@RestResource</ja>(
path=<js>"/tempDir"</js>,
messages=<js>"nls/TempDirResource"</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS',upload:'upload'}"</js>,
properties={
<ja>@Property</ja>(name=<js>"DirectoryResource.rootDir"</js>, value=<js>"$S{java.io.tmpdir}"</js>),
<ja>@Property</ja>(name=<js>"DirectoryResource.allowViews"</js>, value=<js>"true"</js>),
<ja>@Property</ja>(name=<js>"DirectoryResource.allowDeletes"</js>, value=<js>"true"</js>),
- <ja>@Property</ja>(name=<js>"DirectoryResource.allowPuts"</js>, value=<js>"false"</js>),
- <ja>@Property</ja>(name=HTMLDOC_links, value=<js>"{up:'$R{requestParentURI}',options:'$R{servletURI}?method=OPTIONS',upload:'upload',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.TempDirResource,org.apache.juneau.rest.samples.DirectoryResource)'}"</js>),
+ <ja>@Property</ja>(name=<js>"DirectoryResource.allowPuts"</js>, value=<js>"false"</js>)
},
stylesheet=<js>"styles/devops.css"</js>
)
@@ -4877,11 +4868,11 @@
<ja>@RestResource</ja>(
path=<js>"/atom"</js>,
messages=<js>"nls/AtomFeedResource"</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>,
properties={
<ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
<ja>@Property</ja>(name=<jsf>RDF_rdfxml_tab</jsf>, value=<js>"5"</js>),
- <ja>@Property</ja>(name=<jsf>RDF_addRootProperty</jsf>, value=<js>"true"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.AtomFeedResource)'}"</js>)
+ <ja>@Property</ja>(name=<jsf>RDF_addRootProperty</jsf>, value=<js>"true"</js>)
},
encoders=GzipEncoder.<jk>class</jk>
)
@@ -4985,9 +4976,7 @@
<ja>@RestResource</ja>(
path=<js>"/docker"</js>,
title=<js>"Sample Docker resource"</js>,
- properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.AtomFeedResource)'}"</js>)
- }
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
)
<jk>public class</jk> DockerRegistryResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -5066,11 +5055,9 @@
<ja>@RestResource</ja>(
path=<js>"/tumblrParser"</js>,
messages=<js>"nls/TumblrParserResource"</js>,
- properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.TumblrParserResource)'}"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"Tumblr parser service"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"Specify a URL to a Tumblr blog and parse the results."</js>)
- }
+ title=<js>"Tumblr parser service"</js>,
+ description=<js>"Specify a URL to a Tumblr blog and parse the results."</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
)
<jk>public class</jk> TumblrParserResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -5150,11 +5137,9 @@
<ja>@RestResource</ja>(
path=<js>"/photos"</js>,
messages=<js>"nls/PhotosResource"</js>,
- properties={
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS'}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, value=<js>"Photo REST service"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"Use a tool like Poster to upload and retrieve jpeg and png images."</js>)
- }
+ title=<js>"Photo REST service"</js>,
+ description=<js>"Use a tool like Poster to upload and retrieve jpeg and png images."</js>,
+ pageLinks=<js>"{options:'?method=OPTIONS'}"</js>
)
<jk>public class</jk> PhotosResource <jk>extends</jk> RestServletDefault {
@@ -5196,8 +5181,8 @@
<jd>/** GET request handler for list of all photos */</jd>
<ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/"</js>)
<jk>public</jk> Collection<Photo> getAllPhotos(RestRequest req, RestResponse res) <jk>throws</jk> Exception {
- res.setProperty(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, <js>"Photo REST service"</js>);
- res.setProperty(HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, <js>"Use a tool like Poster to upload and retrieve jpeg and png images."</js>);
+ res.setPageTitle(<js>"Photo REST service"</js>);
+ res.setPageText(<js>"Use a tool like Poster to upload and retrieve jpeg and png images."</js>);
<jk>return</jk> photos.values();
}
@@ -5292,10 +5277,8 @@
<ja>@RestResource</ja>(
path=<js>"/jsonSchema"</js>,
messages=<js>"nls/JsonSchemaResource"</js>,
- properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"Sample JSON-Schema document"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.JsonSchemaResource)'}"</js>)
- }
+ title=<js>"Sample JSON-Schema document"</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
)
<jk>public class</jk> JsonSchemaResource <jk>extends</jk> ResourceJena {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -5374,11 +5357,9 @@
<ja>@RestResource</ja>(
path=<js>"/sqlQuery"</js>,
messages=<js>"nls/SqlQueryResource"</js>,
- properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"SQL query service"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"Executes queries against the local derby '$C{SqlQueryResource/connectionUrl}' database"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'$R{servletURI}?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.SqlQueryResource)'}"</js>),
- }
+ title=<js>"SQL query service"</js>,
+ description=<js>"Executes queries against the local derby '$C{SqlQueryResource/connectionUrl}' database"</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
)
<jk>public class</jk> SqlQueryResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -5565,9 +5546,7 @@
path=<js>"/config"</js>,
title=<js>"Configuration"</js>,
description=<js>"Contents of configuration file."</js>,
- properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'$R{servletURI}?method=OPTIONS',edit:'$R{servletURI}/edit'}"</js>),
- }
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS',edit:'edit'}"</js>
)
<jk>public class</jk> ConfigResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -5665,7 +5644,7 @@
}
)
<jk>public</jk> ConfigFile setConfigContents(<ja>@Body</ja> Reader contents) <jk>throws</jk> Exception {
- ConfigFile cf2 = ConfigMgr.<jsf>DEFAULT</jsf>.create().load(contents);
+ ConfigFile cf2 = <jk>new</jk> ConfigFileBuilder().build().load(contents);
<jk>return</jk> getConfig().merge(cf2).save();
}
@@ -6046,7 +6025,7 @@
<h6 class='topic'>org.apache.juneau</h6>
<ul class='spaced-list'>
- <li>Revamped the serializer and parser classes to use builders for creation.
+ <li>Revamped the serializer, parser classes to use builders for creation.
Serializers and parsers are now unmodifiable objects once they are created.
This is a breaking code change that will require adoption.
<p class='bcode'>
@@ -6072,7 +6051,7 @@
<li><a href="org/apache/juneau/parser/ParserGroupBuilder.html" title="class in org.apache.juneau.parser"><code>ParserGroupBuilder</code></a>
<li><a href="org/apache/juneau/encoders/EncoderGroupBuilder.html" title="class in org.apache.juneau.encoders"><code>EncoderGroupBuilder</code></a>
</ul>
- Also introduced
+ <li>Revamped the config file API to use a build: <a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini"><code>ConfigFileBuilder</code></a>.
<li>Removed the <code><del>Lockable</del></code> interface.
<li>New <code>addBeanTypeProperties</code> setting added to serializers to override the
<a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_addBeanTypeProperties"><code>SerializerContext.SERIALIZER_addBeanTypeProperties</code></a> setting
@@ -6106,6 +6085,12 @@
</ul>
<li><a href="org/apache/juneau/html/HtmlParser.html" title="class in org.apache.juneau.html"><code>HtmlParser</code></a> can now parse full body contents generated by <a href="org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html"><code>HtmlDocSerializer</code></a>.
<li>Parse-args supported added to <a href="org/apache/juneau/msgpack/MsgPackParser.html" title="class in org.apache.juneau.msgpack"><code>MsgPackParser</code></a> to allow it to be used in remoteable proxies.
+ <li>Added some convenience classes for constructing collections using a fluent interface:
+ <ul>
+ <li><a href="org/apache/juneau/utils/AList.html" title="class in org.apache.juneau.utils"><code>AList</code></a>
+ <li><a href="org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils"><code>ASet</code></a>
+ <li><a href="org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils"><code>AMap</code></a>
+ </ul>
</ul>
<h6 class='topic'>org.apache.juneau.rest</h6>
@@ -6142,16 +6127,54 @@
</ul>
<li>New annotations added to <a href="org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestResource</code></a> to allow non-<code>RestServlet</code>
resources to do the same as subclassing directly from <code>RestServlet</code>:
- <ul>
- <li><a href="org/apache/juneau/rest/annotation/RestResource.html#resourceResolver--"><code>resourceResolver()</code></a>
- - Specify a <a href="org/apache/juneau/rest/RestResourceResolver.html" title="class in org.apache.juneau.rest"><code>RestResourceResolver</code></a> class for resolving child resources.
- <li><a href="org/apache/juneau/rest/annotation/RestResource.html#callHandler--"><code>callHandler()</code></a>
- - Specify a <a href="org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest"><code>RestCallHandler</code></a> class for handling the lifecycle of a REST call.
- <li><a href="org/apache/juneau/rest/annotation/RestResource.html#infoProvider--"><code>infoProvider()</code></a>
- - Specify a <a href="org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest"><code>RestInfoProvider</code></a> class for customizing title/description/Swagger information on a REST resource.
- <li><a href="org/apache/juneau/rest/annotation/RestResource.html#logger--"><code>logger()</code></a>
- - Specify a <a href="org/apache/juneau/rest/RestLogger.html" title="class in org.apache.juneau.rest"><code>RestLogger</code></a> class for handling logging.
- </ul>
+ <ul>
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#resourceResolver--"><code>resourceResolver()</code></a>
+ - Specify a <a href="org/apache/juneau/rest/RestResourceResolver.html" title="class in org.apache.juneau.rest"><code>RestResourceResolver</code></a> class for resolving child resources.
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#callHandler--"><code>callHandler()</code></a>
+ - Specify a <a href="org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest"><code>RestCallHandler</code></a> class for handling the lifecycle of a REST call.
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#infoProvider--"><code>infoProvider()</code></a>
+ - Specify a <a href="org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest"><code>RestInfoProvider</code></a> class for customizing title/description/Swagger information on a REST resource.
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#logger--"><code>logger()</code></a>
+ - Specify a <a href="org/apache/juneau/rest/RestLogger.html" title="class in org.apache.juneau.rest"><code>RestLogger</code></a> class for handling logging.
+ </ul>
+ <li>New annotations added to <a href="org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestResource</code></a> and <a href="org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a>
+ to simplify defining page title, text, and links on HTML views:
+ <ul>
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#pageTitle--"><code>@RestResource.pageTitle()</code></a>
+ <li><a href="org/apache/juneau/rest/annotation/RestMethod.html#pageTitle--"><code>@RestMethod.pageTitle()</code></a>
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#pageText--"><code>@RestResource.pageText()</code></a>
+ <li><a href="org/apache/juneau/rest/annotation/RestMethod.html#pageText--"><code>@RestMethod.pageText()</code></a>
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#pageLinks--"><code>@RestResource.pageLinks()</code></a>
+ <li><a href="org/apache/juneau/rest/annotation/RestMethod.html#pageLinks--"><code>@RestMethod.pageLinks()</code></a>
+ </ul>
+ <p class='bcode'>
+ <jc>// Old method</jc>
+ <ja>@RestResource</ja>(
+ properties={
+ <ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"System properties resource"</js>),
+ <ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"REST interface for performing CRUD operations on system properties."</js>),
+ <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>)
+ }
+ )
+
+ <jc>// New method</jc>
+ <ja>@RestResource</ja>(
+ pageTitle=<js>"System properties resource"</js>,
+ pageDescription=<js>"REST interface for performing CRUD operations on system properties."</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
+ )
+ </p>
+ <p>
+ Typically you're going to simply want to use the <code>title</code> and <code>description</code> annotations
+ which apply to both the page title/text and the swagger doc:
+ </p>
+ <p class='bcode'>
+ <ja>@RestResource</ja>(
+ title=<js>"System properties resource"</js>,
+ description=<js>"REST interface for performing CRUD operations on system properties."</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
+ )
+ </p>
<li><a href="org/apache/juneau/rest/annotation/RestResource.html#stylesheet--"><code>RestResource.stylesheet()</code></a> can now take in a comma-delimited list of stylesheet paths.
<li><a href="org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest"><code>StreamResource</code></a> can now contain multiple sources from a variety of source types (e.g. <code><jk>byte</jk>[]</code> arrays, <code>InputStreams</code>, <code>Files</code>, etc...)
and is now immutable. It also includes a new <a href="org/apache/juneau/rest/StreamResource.Builder.html" title="class in org.apache.juneau.rest"><code>StreamResource.Builder</code></a> class.
@@ -6172,6 +6195,16 @@
<li>Updated doc: <a class='doclink' href='#Remoteable'>6 - Remoteable Services</a>
<li><a href="org/apache/juneau/rest/RestRequest.html#toString--"><code>RestRequest.toString()</code></a> can be called at any time to view the headers and content of the request
without affecting functionality. Very useful for debugging.
+ <li>You can now use numeric values in path annotations.
+ <br>When using numeric variable names, you don't need to specify the variable name in the <ja>@Path</ja> annoation:
+ <p class='bcode'>
+ <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{0}/{1}/{2}/*"</js>)
+ <jk>public void</jk> doGet(RestRequest req, RestResponse res,
+ <ja>@Path</ja> String foo, <ja>@Path</ja> <jk>int</jk> bar, <ja>@Path</ja> UUID baz) {
+ ...
+ }
+ </p>
+ <li><a href="org/apache/juneau/rest/annotation/RestMethod.html#name--"><code>@RestMethod.name()</code></a> annotation is now optional. Defaults to <js>"GET"</js>.
</ul>
<h6 class='topic'>org.apache.juneau.rest.client</h6>
@@ -6195,6 +6228,18 @@
<li><a href="org/apache/juneau/rest/client/RestClientBuilder.html#debug-boolean-"><code>RestClientBuilder.debug(boolean)</code></a> now adds a <code>Debug: true</code> header on all requests.
</ul>
<li>New doc: <a class='doclink' href='org/apache/juneau/rest/client/package-summary.html#Debugging'>1.5 - Debugging</a>
+ <li>The <code>RestClient</code> class <code>doX(Object url)</code> methods now handle HttpClient <code>URIBuilder</code> instances.
+ <li>New methods added to <a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client"><code>RestCall</code></a> that allow you to manipulate URLs after you've already created the <code>RestCall</code> object:
+ <ul>
+ <li><a href="org/apache/juneau/rest/client/RestCall.html#uri-java.lang.Object-"><code>RestCall.uri(Object)</code></a>
+ <li><a href="org/apache/juneau/rest/client/RestCall.html#param-java.lang.String-java.lang.Object-"><code>RestCall.param(String,Object)</code></a>
+ <li><a href="org/apache/juneau/rest/client/RestCall.html#query-java.lang.String-"><code>RestCall.query(String)</code></a>
+ <li><a href="org/apache/juneau/rest/client/RestCall.html#host-java.lang.String-"><code>RestCall.host(String)</code></a>
+ <li><a href="org/apache/juneau/rest/client/RestCall.html#port-int-"><code>RestCall.port(int)</code></a>
+ <li><a href="org/apache/juneau/rest/client/RestCall.html#userInfo-java.lang.String-java.lang.String-"><code>RestCall.userInfo(String,String)</code></a>
+ <li><a href="org/apache/juneau/rest/client/RestCall.html#userInfo-java.lang.String-"><code>RestCall.userInfo(String)</code></a>
+ <li><a href="org/apache/juneau/rest/client/RestCall.html#scheme-java.lang.String-"><code>RestCall.scheme(String)</code></a>
+ </ul>
</ul>
<h6 class='topic'>org.apache.juneau.microservice</h6>
@@ -6722,10 +6767,10 @@
<li><a href="org/apache/juneau/ini/ConfigFile.html#toWritable--"><code>ConfigFile.toWritable()</code></a> - Wraps the config file in a <a href="org/apache/juneau/Writable.html" title="interface in org.apache.juneau"><code>Writable</code></a> interface so that it can be serialized by the REST interface as a plain-text INI file instead of as a serialized POJO.
<li><a href="org/apache/juneau/ini/ConfigFile.html#getInt-java.lang.String-"><code>ConfigFile.getInt(String)</code></a> - Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
</ul>
- <li>New methods in <a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><code>ConfigMgr</code></a>:
+ <li>New methods in <code><del>ConfigMgr</del></code>:
<ul>
- <li><a href="org/apache/juneau/ini/ConfigMgr.html#create--"><code>ConfigMgr.create()</code></a>, <a href="org/apache/juneau/ini/ConfigMgr.html#create-java.io.Reader-"><code>ConfigMgr.create(Reader)</code></a>, <a href="org/apache/juneau/ini/ConfigMgr.html#create-java.io.File-"><code>ConfigMgr.create(File)</code></a>
- <li><a href="org/apache/juneau/ini/ConfigMgr.html#deleteAll--"><code>ConfigMgr.deleteAll()</code></a>
+ <li><code><del>ConfigMgr.create()</del></code>, <code><del>ConfigMgr.create(Reader)</del></code>, <code><del>ConfigMgr.create(File)</del></code>
+ <li><code><del>ConfigMgr.deleteAll()</del></code>
</ul>
<li>New methods in <a href="org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini"><code>Section</code></a>:
<ul>
@@ -6771,7 +6816,7 @@
<ul>
<li><a href="org/apache/juneau/Streamable.html" title="interface in org.apache.juneau"><code>Streamable</code></a> interface for identifying objects that can be serialized directly to an output stream.
<li><a href="org/apache/juneau/Writable.html" title="interface in org.apache.juneau"><code>Writable</code></a> interface for identifying objects that can be serialized directly to a writer.
- <li><a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer"><code>StringObject</code></a> class that can be used for delayed object serialization.
+ <li><code><del>StringObject</del></code> class that can be used for delayed object serialization.
<li><a href="org/apache/juneau/internal/ByteArrayCache.html" title="class in org.apache.juneau.internal"><code>ByteArrayCache</code></a>
<li><a href="org/apache/juneau/internal/ByteArrayInOutStream.html" title="class in org.apache.juneau.internal"><code>ByteArrayInOutStream</code></a>
<li><a href="org/apache/juneau/internal/FileUtils.html" title="class in org.apache.juneau.internal"><code>FileUtils</code></a>
@@ -7132,7 +7177,7 @@
<li>Significant API changes to <a class='doclink' href='org/apache/juneau/ini/package-summary.html#TOC'>org.apache.juneau.ini</a> API.
<ul>
<li><a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> is now thread safe and can be shared across multiple threads.
- <li>New <a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><code>ConfigMgr</code></a> class for managing configuration files.
+ <li>New <code><del>ConfigMgr</del></code> class for managing configuration files.
<li>Serializers and parsers can be associated with config files for storing and retrieving POJOs.
Default support provided for JSON.
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index 4aba9c3..9d5a88a 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -135,6 +135,7 @@
<ul>
<li type="circle">java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedList.html?is-external=true" title="class or interface in java.util"><span class="typeNameLink">LinkedList</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a><E>, java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><E>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
+<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/AList.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">AList</span></a><T></li>
<li type="circle">org.apache.juneau.rest.labels.<a href="org/apache/juneau/rest/labels/ChildResourceDescriptions.html" title="class in org.apache.juneau.rest.labels"><span class="typeNameLink">ChildResourceDescriptions</span></a></li>
<li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/IdentityList.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">IdentityList</span></a><T></li>
<li type="circle">org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonTypeArray.html" title="class in org.apache.juneau.dto.jsonschema"><span class="typeNameLink">JsonTypeArray</span></a></li>
@@ -164,6 +165,15 @@
</li>
<li type="circle">java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractSet.html?is-external=true" title="class or interface in java.util"><span class="typeNameLink">AbstractSet</span></a><E> (implements java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><E>)
<ul>
+<li type="circle">java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/HashSet.html?is-external=true" title="class or interface in java.util"><span class="typeNameLink">HashSet</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><E>)
+<ul>
+<li type="circle">java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashSet.html?is-external=true" title="class or interface in java.util"><span class="typeNameLink">LinkedHashSet</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><E>)
+<ul>
+<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">ASet</span></a><T></li>
+</ul>
+</li>
+</ul>
+</li>
<li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/MultiSet.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">MultiSet</span></a><E></li>
</ul>
</li>
@@ -195,6 +205,7 @@
<ul>
<li type="circle">java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMap.html?is-external=true" title="class or interface in java.util"><span class="typeNameLink">LinkedHashMap</span></a><K,V> (implements java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V>)
<ul>
+<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">AMap</span></a><K,V></li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/BeanDictionaryMap.html" title="class in org.apache.juneau"><span class="typeNameLink">BeanDictionaryMap</span></a></li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><span class="typeNameLink">ObjectMap</span></a>
<ul>
@@ -302,13 +313,13 @@
<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileWrapped</span></a></li>
</ul>
</li>
+<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileBuilder</span></a></li>
<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileListener</span></a>
<ul>
<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/EntryListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">EntryListener</span></a></li>
<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/SectionListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">SectionListener</span></a></li>
</ul>
</li>
-<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigMgr</span></a></li>
<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigUtils</span></a></li>
<li type="circle">org.apache.juneau.jena.<a href="org/apache/juneau/jena/Constants.html" title="class in org.apache.juneau.jena"><span class="typeNameLink">Constants</span></a></li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/Context.html" title="class in org.apache.juneau"><span class="typeNameLink">Context</span></a>
@@ -1045,7 +1056,8 @@
<li type="circle">org.apache.juneau.rest.response.<a href="org/apache/juneau/rest/response/StreamableHandler.html" title="class in org.apache.juneau.rest.response"><span class="typeNameLink">StreamableHandler</span></a> (implements org.apache.juneau.rest.<a href="org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>)</li>
<li type="circle">org.apache.juneau.rest.<a href="org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">StreamResource</span></a> (implements org.apache.juneau.<a href="org/apache/juneau/Streamable.html" title="interface in org.apache.juneau">Streamable</a>)</li>
<li type="circle">org.apache.juneau.rest.<a href="org/apache/juneau/rest/StreamResource.Builder.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">StreamResource.Builder</span></a></li>
-<li type="circle">org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">StringObject</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>, org.apache.juneau.<a href="org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>)</li>
+<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">StringMessage</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>, org.apache.juneau.<a href="org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>)</li>
+<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">StringObject</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>, org.apache.juneau.<a href="org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>)</li>
<li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">StringUtils</span></a></li>
<li type="circle">org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/SwaggerBuilder.html" title="class in org.apache.juneau.dto.swagger"><span class="typeNameLink">SwaggerBuilder</span></a></li>
<li type="circle">org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/SwaggerElement.html" title="class in org.apache.juneau.dto.swagger"><span class="typeNameLink">SwaggerElement</span></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/serialized-form.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/serialized-form.html b/content/site/apidocs/serialized-form.html
index ccc29b4..4e62f8c 100644
--- a/content/site/apidocs/serialized-form.html
+++ b/content/site/apidocs/serialized-form.html
@@ -642,6 +642,16 @@
<li class="blockList">
<h2 title="Package">Package org.apache.juneau.utils</h2>
<ul class="blockList">
+<li class="blockList"><a name="org.apache.juneau.utils.AList">
+<!-- -->
+</a>
+<h3>Class <a href="org/apache/juneau/utils/AList.html" title="class in org.apache.juneau.utils">org.apache.juneau.utils.AList</a> extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedList.html?is-external=true" title="class or interface in java.util">LinkedList</a><<a href="org/apache/juneau/utils/AList.html" title="type parameter in AList">T</a>> implements Serializable</h3>
+</li>
+<li class="blockList"><a name="org.apache.juneau.utils.AMap">
+<!-- -->
+</a>
+<h3>Class <a href="org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils">org.apache.juneau.utils.AMap</a> extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMap.html?is-external=true" title="class or interface in java.util">LinkedHashMap</a><<a href="org/apache/juneau/utils/AMap.html" title="type parameter in AMap">K</a>,<a href="org/apache/juneau/utils/AMap.html" title="type parameter in AMap">V</a>> implements Serializable</h3>
+</li>
<li class="blockList"><a name="org.apache.juneau.utils.Args">
<!-- -->
</a>
@@ -651,6 +661,11 @@
<dd>1L</dd>
</dl>
</li>
+<li class="blockList"><a name="org.apache.juneau.utils.ASet">
+<!-- -->
+</a>
+<h3>Class <a href="org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils">org.apache.juneau.utils.ASet</a> extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashSet.html?is-external=true" title="class or interface in java.util">LinkedHashSet</a><<a href="org/apache/juneau/utils/ASet.html" title="type parameter in ASet">T</a>> implements Serializable</h3>
+</li>
<li class="blockList"><a name="org.apache.juneau.utils.ManifestFile">
<!-- -->
</a>
[47/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/PropertyStore.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/PropertyStore.html b/content/site/apidocs/org/apache/juneau/PropertyStore.html
index f756a42..8b77f17 100644
--- a/content/site/apidocs/org/apache/juneau/PropertyStore.html
+++ b/content/site/apidocs/org/apache/juneau/PropertyStore.html
@@ -232,7 +232,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
ps.putToProperty(<js>"BeanContext.implClasses.map"</js>, MyInterface.<jk>class</jk>, MyInterfaceImpl.<jk>class</jk>);
<jc>// Append to map property using set().</jc>
- Map m = <jk>new</jk> HashMap(){{put(MyInterface.<jk>class</jk>,MyInterfaceImpl.<jk>class</jk>)}};
+ Map m = <jk>new</jk> AMap().append(MyInterface.<jk>class</jk>,MyInterfaceImpl.<jk>class</jk>);
ps.setProperty(<js>"BeanContext.implClasses.map.put"</js>, m);
</p>
<p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/Writable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/Writable.html b/content/site/apidocs/org/apache/juneau/Writable.html
index 15c810d..7973499 100644
--- a/content/site/apidocs/org/apache/juneau/Writable.html
+++ b/content/site/apidocs/org/apache/juneau/Writable.html
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>, <a href="../../../org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></dd>
+<dd><a href="../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>, <a href="../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a>, <a href="../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></dd>
</dl>
<hr>
<br>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/csv/CsvParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/csv/CsvParser.html b/content/site/apidocs/org/apache/juneau/csv/CsvParser.html
index dd67ae8..c22cacd 100644
--- a/content/site/apidocs/org/apache/juneau/csv/CsvParser.html
+++ b/content/site/apidocs/org/apache/juneau/csv/CsvParser.html
@@ -219,7 +219,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lan
g.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parse
r/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a h
ref="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-ja
va.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#p
arseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/csv/CsvParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/csv/CsvParserSession.html b/content/site/apidocs/org/apache/juneau/csv/CsvParserSession.html
index 64baddb..22aa04d 100644
--- a/content/site/apidocs/org/apache/juneau/csv/CsvParserSession.html
+++ b/content/site/apidocs/org/apache/juneau/csv/CsvParserSession.html
@@ -209,7 +209,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title=
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/csv/CsvSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/csv/CsvSerializerSession.html b/content/site/apidocs/org/apache/juneau/csv/CsvSerializerSession.html
index c6a5dff..55814ff 100644
--- a/content/site/apidocs/org/apache/juneau/csv/CsvSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/csv/CsvSerializerSession.html
@@ -188,7 +188,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/dto/jsonschema/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/jsonschema/package-summary.html b/content/site/apidocs/org/apache/juneau/dto/jsonschema/package-summary.html
index 463b85b..30cd3a5 100644
--- a/content/site/apidocs/org/apache/juneau/dto/jsonschema/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/dto/jsonschema/package-summary.html
@@ -546,10 +546,8 @@
<ja>@RestResource</ja>(
path=<js>"/jsonSchema"</js>,
messages=<js>"nls/JsonSchemaResource"</js>,
- properties={
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, value=<js>"Sample JSON-Schema document"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS'}"</js>)
- }
+ title=<js>"Sample JSON-Schema document"</js>,
+ pageLinks=<js>"{options:'?method=OPTIONS'}"</js>
)
<jk>public class</jk> JsonSchemaResource <jk>extends</jk> RestServletJenaDefault {
[23/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.Sq.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.Sq.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.Sq.html
index 3aa18df..63dfc3a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.Sq.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.Sq.html
@@ -398,7 +398,7 @@
<span class="sourceLineNo">390</span> out.i(i+2);<a name="line.390"></a>
<span class="sourceLineNo">391</span> out.eTag("td").nl();<a name="line.391"></a>
<span class="sourceLineNo">392</span> out.sTag(i+2, "td");<a name="line.392"></a>
-<span class="sourceLineNo">393</span> cr = serializeAnything(session, out, value, valueType, (key == null ? "_x0000_" : key.toString()), 2, null, false);<a name="line.393"></a>
+<span class="sourceLineNo">393</span> cr = serializeAnything(session, out, value, valueType, (key == null ? "_x0000_" : session.toString(key)), 2, null, false);<a name="line.393"></a>
<span class="sourceLineNo">394</span> if (cr == CR_NORMAL)<a name="line.394"></a>
<span class="sourceLineNo">395</span> out.i(i+2);<a name="line.395"></a>
<span class="sourceLineNo">396</span> out.eTag("td").nl();<a name="line.396"></a>
@@ -493,211 +493,217 @@
<span class="sourceLineNo">485</span><a name="line.485"></a>
<span class="sourceLineNo">486</span> out.oTag(i, "table").attr(btpn, type2).append('>').nl();<a name="line.486"></a>
<span class="sourceLineNo">487</span> out.sTag(i+1, "tr").nl();<a name="line.487"></a>
-<span class="sourceLineNo">488</span> for (Object key : th)<a name="line.488"></a>
-<span class="sourceLineNo">489</span> out.sTag(i+2, "th").append(key).eTag("th").nl();<a name="line.489"></a>
-<span class="sourceLineNo">490</span> out.eTag(i+1, "tr").nl();<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> for (Object o : c) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> ClassMeta<?> cm = session.getClassMetaForObject(o);<a name="line.493"></a>
+<span class="sourceLineNo">488</span> for (Object key : th) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span> out.sTag(i+2, "th");<a name="line.489"></a>
+<span class="sourceLineNo">490</span> out.text(session.convertToType(key, String.class));<a name="line.490"></a>
+<span class="sourceLineNo">491</span> out.eTag("th").nl();<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span> out.eTag(i+1, "tr").nl();<a name="line.493"></a>
<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> PojoSwap f = cm.getPojoSwap();<a name="line.496"></a>
-<span class="sourceLineNo">497</span> o = f.swap(session, o);<a name="line.497"></a>
-<span class="sourceLineNo">498</span> cm = cm.getSerializedClassMeta();<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> out.oTag(i+1, "tr");<a name="line.501"></a>
-<span class="sourceLineNo">502</span> String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.502"></a>
-<span class="sourceLineNo">503</span> if (typeName != null && sType.getElementType() != cm)<a name="line.503"></a>
-<span class="sourceLineNo">504</span> out.attr(btpn, typeName);<a name="line.504"></a>
-<span class="sourceLineNo">505</span> out.cTag().nl();<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span> if (cm == null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span> serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.508"></a>
+<span class="sourceLineNo">495</span> for (Object o : c) {<a name="line.495"></a>
+<span class="sourceLineNo">496</span> ClassMeta<?> cm = session.getClassMetaForObject(o);<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> PojoSwap f = cm.getPojoSwap();<a name="line.499"></a>
+<span class="sourceLineNo">500</span> o = f.swap(session, o);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> cm = cm.getSerializedClassMeta();<a name="line.501"></a>
+<span class="sourceLineNo">502</span> }<a name="line.502"></a>
+<span class="sourceLineNo">503</span><a name="line.503"></a>
+<span class="sourceLineNo">504</span> out.oTag(i+1, "tr");<a name="line.504"></a>
+<span class="sourceLineNo">505</span> String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.505"></a>
+<span class="sourceLineNo">506</span> if (typeName != null && sType.getElementType() != cm)<a name="line.506"></a>
+<span class="sourceLineNo">507</span> out.attr(btpn, typeName);<a name="line.507"></a>
+<span class="sourceLineNo">508</span> out.cTag().nl();<a name="line.508"></a>
<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span> } else if (cm.isMap() && ! (cm.isBeanMap())) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> Map m2 = session.sort((Map)o);<a name="line.511"></a>
+<span class="sourceLineNo">510</span> if (cm == null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span> serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.511"></a>
<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span> for (Object k : th) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> out.sTag(i+2, "td");<a name="line.514"></a>
-<span class="sourceLineNo">515</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, session.toString(k), 2, null, false);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> if (cr == CR_NORMAL)<a name="line.516"></a>
-<span class="sourceLineNo">517</span> out.i(i+2);<a name="line.517"></a>
-<span class="sourceLineNo">518</span> out.eTag("td").nl();<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> } else {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> BeanMap m2 = null;<a name="line.521"></a>
-<span class="sourceLineNo">522</span> if (o instanceof BeanMap)<a name="line.522"></a>
-<span class="sourceLineNo">523</span> m2 = (BeanMap)o;<a name="line.523"></a>
-<span class="sourceLineNo">524</span> else<a name="line.524"></a>
-<span class="sourceLineNo">525</span> m2 = session.toBeanMap(o);<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span> for (Object k : th) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.528"></a>
-<span class="sourceLineNo">529</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.529"></a>
-<span class="sourceLineNo">530</span> out.sTag(i+2, "td");<a name="line.530"></a>
-<span class="sourceLineNo">531</span> ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.531"></a>
-<span class="sourceLineNo">532</span> if (cr == CR_NORMAL)<a name="line.532"></a>
-<span class="sourceLineNo">533</span> out.i(i+2);<a name="line.533"></a>
-<span class="sourceLineNo">534</span> out.eTag("td").nl();<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span> }<a name="line.536"></a>
-<span class="sourceLineNo">537</span> out.eTag(i+1, "tr").nl();<a name="line.537"></a>
-<span class="sourceLineNo">538</span> }<a name="line.538"></a>
-<span class="sourceLineNo">539</span> out.eTag(i, "table").nl();<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> } else {<a name="line.541"></a>
-<span class="sourceLineNo">542</span> out.oTag(i, "ul");<a name="line.542"></a>
-<span class="sourceLineNo">543</span> if (! type2.equals("array"))<a name="line.543"></a>
-<span class="sourceLineNo">544</span> out.attr(btpn, type2);<a name="line.544"></a>
-<span class="sourceLineNo">545</span> out.append('>').nl();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> for (Object o : c) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> out.sTag(i+1, "li");<a name="line.547"></a>
-<span class="sourceLineNo">548</span> ContentResult cr = serializeAnything(session, out, o, seType, name, 1, null, false);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> if (cr == CR_NORMAL)<a name="line.549"></a>
-<span class="sourceLineNo">550</span> out.i(i+1);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> out.eTag("li").nl();<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span> out.eTag(i, "ul").nl();<a name="line.553"></a>
-<span class="sourceLineNo">554</span> }<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span> /*<a name="line.557"></a>
-<span class="sourceLineNo">558</span> * Returns the table column headers for the specified collection of objects.<a name="line.558"></a>
-<span class="sourceLineNo">559</span> * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.559"></a>
-<span class="sourceLineNo">560</span> * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.560"></a>
-<span class="sourceLineNo">561</span> */<a name="line.561"></a>
-<span class="sourceLineNo">562</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.562"></a>
-<span class="sourceLineNo">563</span> private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.563"></a>
-<span class="sourceLineNo">564</span> if (c.size() == 0)<a name="line.564"></a>
-<span class="sourceLineNo">565</span> return null;<a name="line.565"></a>
-<span class="sourceLineNo">566</span> c = session.sort(c);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> Object[] th;<a name="line.567"></a>
-<span class="sourceLineNo">568</span> Set<Object> s = new TreeSet<Object>();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> Set<ClassMeta> prevC = new HashSet<ClassMeta>();<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Object o1 = null;<a name="line.570"></a>
-<span class="sourceLineNo">571</span> for (Object o : c)<a name="line.571"></a>
-<span class="sourceLineNo">572</span> if (o != null) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span> o1 = o;<a name="line.573"></a>
-<span class="sourceLineNo">574</span> break;<a name="line.574"></a>
-<span class="sourceLineNo">575</span> }<a name="line.575"></a>
-<span class="sourceLineNo">576</span> if (o1 == null)<a name="line.576"></a>
-<span class="sourceLineNo">577</span> return null;<a name="line.577"></a>
-<span class="sourceLineNo">578</span> ClassMeta<?> cm = session.getClassMetaForObject(o1);<a name="line.578"></a>
-<span class="sourceLineNo">579</span> if (cm.getPojoSwap() != null) {<a name="line.579"></a>
-<span class="sourceLineNo">580</span> PojoSwap f = cm.getPojoSwap();<a name="line.580"></a>
-<span class="sourceLineNo">581</span> o1 = f.swap(session, o1);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> cm = cm.getSerializedClassMeta();<a name="line.582"></a>
-<span class="sourceLineNo">583</span> }<a name="line.583"></a>
-<span class="sourceLineNo">584</span> if (cm == null || ! cm.isMapOrBean())<a name="line.584"></a>
-<span class="sourceLineNo">585</span> return null;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.586"></a>
+<span class="sourceLineNo">513</span> } else if (cm.isMap() && ! (cm.isBeanMap())) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> Map m2 = session.sort((Map)o);<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span> for (Object k : th) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span> out.sTag(i+2, "td");<a name="line.517"></a>
+<span class="sourceLineNo">518</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, session.toString(k), 2, null, false);<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (cr == CR_NORMAL)<a name="line.519"></a>
+<span class="sourceLineNo">520</span> out.i(i+2);<a name="line.520"></a>
+<span class="sourceLineNo">521</span> out.eTag("td").nl();<a name="line.521"></a>
+<span class="sourceLineNo">522</span> }<a name="line.522"></a>
+<span class="sourceLineNo">523</span> } else {<a name="line.523"></a>
+<span class="sourceLineNo">524</span> BeanMap m2 = null;<a name="line.524"></a>
+<span class="sourceLineNo">525</span> if (o instanceof BeanMap)<a name="line.525"></a>
+<span class="sourceLineNo">526</span> m2 = (BeanMap)o;<a name="line.526"></a>
+<span class="sourceLineNo">527</span> else<a name="line.527"></a>
+<span class="sourceLineNo">528</span> m2 = session.toBeanMap(o);<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span> for (Object k : th) {<a name="line.530"></a>
+<span class="sourceLineNo">531</span> BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.531"></a>
+<span class="sourceLineNo">532</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.532"></a>
+<span class="sourceLineNo">533</span> out.sTag(i+2, "td");<a name="line.533"></a>
+<span class="sourceLineNo">534</span> ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.534"></a>
+<span class="sourceLineNo">535</span> if (cr == CR_NORMAL)<a name="line.535"></a>
+<span class="sourceLineNo">536</span> out.i(i+2);<a name="line.536"></a>
+<span class="sourceLineNo">537</span> out.eTag("td").nl();<a name="line.537"></a>
+<span class="sourceLineNo">538</span> }<a name="line.538"></a>
+<span class="sourceLineNo">539</span> }<a name="line.539"></a>
+<span class="sourceLineNo">540</span> out.eTag(i+1, "tr").nl();<a name="line.540"></a>
+<span class="sourceLineNo">541</span> }<a name="line.541"></a>
+<span class="sourceLineNo">542</span> out.eTag(i, "table").nl();<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span> } else {<a name="line.544"></a>
+<span class="sourceLineNo">545</span> out.oTag(i, "ul");<a name="line.545"></a>
+<span class="sourceLineNo">546</span> if (! type2.equals("array"))<a name="line.546"></a>
+<span class="sourceLineNo">547</span> out.attr(btpn, type2);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> out.append('>').nl();<a name="line.548"></a>
+<span class="sourceLineNo">549</span> for (Object o : c) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span> out.sTag(i+1, "li");<a name="line.550"></a>
+<span class="sourceLineNo">551</span> ContentResult cr = serializeAnything(session, out, o, seType, name, 1, null, false);<a name="line.551"></a>
+<span class="sourceLineNo">552</span> if (cr == CR_NORMAL)<a name="line.552"></a>
+<span class="sourceLineNo">553</span> out.i(i+1);<a name="line.553"></a>
+<span class="sourceLineNo">554</span> out.eTag("li").nl();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> }<a name="line.555"></a>
+<span class="sourceLineNo">556</span> out.eTag(i, "ul").nl();<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span> }<a name="line.558"></a>
+<span class="sourceLineNo">559</span><a name="line.559"></a>
+<span class="sourceLineNo">560</span> /*<a name="line.560"></a>
+<span class="sourceLineNo">561</span> * Returns the table column headers for the specified collection of objects.<a name="line.561"></a>
+<span class="sourceLineNo">562</span> * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.562"></a>
+<span class="sourceLineNo">563</span> * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.563"></a>
+<span class="sourceLineNo">564</span> */<a name="line.564"></a>
+<span class="sourceLineNo">565</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.565"></a>
+<span class="sourceLineNo">566</span> private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.566"></a>
+<span class="sourceLineNo">567</span> if (c.size() == 0)<a name="line.567"></a>
+<span class="sourceLineNo">568</span> return null;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> c = session.sort(c);<a name="line.569"></a>
+<span class="sourceLineNo">570</span> Object[] th;<a name="line.570"></a>
+<span class="sourceLineNo">571</span> Set<ClassMeta> prevC = new HashSet<ClassMeta>();<a name="line.571"></a>
+<span class="sourceLineNo">572</span> Object o1 = null;<a name="line.572"></a>
+<span class="sourceLineNo">573</span> for (Object o : c)<a name="line.573"></a>
+<span class="sourceLineNo">574</span> if (o != null) {<a name="line.574"></a>
+<span class="sourceLineNo">575</span> o1 = o;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> break;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span> if (o1 == null)<a name="line.578"></a>
+<span class="sourceLineNo">579</span> return null;<a name="line.579"></a>
+<span class="sourceLineNo">580</span> ClassMeta<?> cm = session.getClassMetaForObject(o1);<a name="line.580"></a>
+<span class="sourceLineNo">581</span> if (cm.getPojoSwap() != null) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span> PojoSwap f = cm.getPojoSwap();<a name="line.582"></a>
+<span class="sourceLineNo">583</span> o1 = f.swap(session, o1);<a name="line.583"></a>
+<span class="sourceLineNo">584</span> cm = cm.getSerializedClassMeta();<a name="line.584"></a>
+<span class="sourceLineNo">585</span> }<a name="line.585"></a>
+<span class="sourceLineNo">586</span> if (cm == null || ! cm.isMapOrBean())<a name="line.586"></a>
<span class="sourceLineNo">587</span> return null;<a name="line.587"></a>
-<span class="sourceLineNo">588</span> HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> if (h.isNoTables() || (hbpMeta != null && hbpMeta.isNoTables()))<a name="line.589"></a>
-<span class="sourceLineNo">590</span> return null;<a name="line.590"></a>
-<span class="sourceLineNo">591</span> if (h.isNoTableHeaders() || (hbpMeta != null && hbpMeta.isNoTableHeaders()))<a name="line.591"></a>
-<span class="sourceLineNo">592</span> return new Object[0];<a name="line.592"></a>
-<span class="sourceLineNo">593</span> if (session.canIgnoreValue(cm, null, o1))<a name="line.593"></a>
-<span class="sourceLineNo">594</span> return null;<a name="line.594"></a>
-<span class="sourceLineNo">595</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.596"></a>
-<span class="sourceLineNo">597</span> for (Object o : c) {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> if (! cm.isInstance(o))<a name="line.599"></a>
-<span class="sourceLineNo">600</span> return null;<a name="line.600"></a>
-<span class="sourceLineNo">601</span> Map m = session.sort((Map)o);<a name="line.601"></a>
-<span class="sourceLineNo">602</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (e.getValue() != null)<a name="line.603"></a>
-<span class="sourceLineNo">604</span> set.add(e.getKey() == null ? null : e.getKey());<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span> th = set.toArray(new Object[set.size()]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> } else {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.610"></a>
-<span class="sourceLineNo">611</span> for (Object o : c) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.612"></a>
-<span class="sourceLineNo">613</span> if (! cm.isInstance(o))<a name="line.613"></a>
-<span class="sourceLineNo">614</span> return null;<a name="line.614"></a>
-<span class="sourceLineNo">615</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.615"></a>
-<span class="sourceLineNo">616</span> for (Map.Entry<String,Object> e : bm.entrySet()) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span> if (e.getValue() != null)<a name="line.617"></a>
-<span class="sourceLineNo">618</span> set.add(e.getKey());<a name="line.618"></a>
-<span class="sourceLineNo">619</span> }<a name="line.619"></a>
-<span class="sourceLineNo">620</span> }<a name="line.620"></a>
-<span class="sourceLineNo">621</span> }<a name="line.621"></a>
-<span class="sourceLineNo">622</span> th = set.toArray(new Object[set.size()]);<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span> prevC.add(cm);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> s.addAll(Arrays.asList(th));<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> for (Object o : c) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> if (o == null)<a name="line.628"></a>
-<span class="sourceLineNo">629</span> continue;<a name="line.629"></a>
-<span class="sourceLineNo">630</span> cm = session.getClassMetaForObject(o);<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> PojoSwap f = cm.getPojoSwap();<a name="line.632"></a>
-<span class="sourceLineNo">633</span> o = f.swap(session, o);<a name="line.633"></a>
-<span class="sourceLineNo">634</span> cm = cm.getSerializedClassMeta();<a name="line.634"></a>
-<span class="sourceLineNo">635</span> }<a name="line.635"></a>
-<span class="sourceLineNo">636</span> if (prevC.contains(cm))<a name="line.636"></a>
-<span class="sourceLineNo">637</span> continue;<a name="line.637"></a>
-<span class="sourceLineNo">638</span> if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.638"></a>
-<span class="sourceLineNo">639</span> return null;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.640"></a>
-<span class="sourceLineNo">641</span> return null;<a name="line.641"></a>
-<span class="sourceLineNo">642</span> if (session.canIgnoreValue(cm, null, o))<a name="line.642"></a>
-<span class="sourceLineNo">643</span> return null;<a name="line.643"></a>
-<span class="sourceLineNo">644</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> Map m = (Map)o;<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (th.length != m.keySet().size())<a name="line.646"></a>
-<span class="sourceLineNo">647</span> return null;<a name="line.647"></a>
-<span class="sourceLineNo">648</span> for (Object k : m.keySet())<a name="line.648"></a>
-<span class="sourceLineNo">649</span> if (! s.contains(k.toString()))<a name="line.649"></a>
-<span class="sourceLineNo">650</span> return null;<a name="line.650"></a>
-<span class="sourceLineNo">651</span> } else {<a name="line.651"></a>
-<span class="sourceLineNo">652</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.652"></a>
-<span class="sourceLineNo">653</span> int l = 0;<a name="line.653"></a>
-<span class="sourceLineNo">654</span> for (String k : bm.keySet()) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> if (! s.contains(k))<a name="line.655"></a>
+<span class="sourceLineNo">588</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.588"></a>
+<span class="sourceLineNo">589</span> return null;<a name="line.589"></a>
+<span class="sourceLineNo">590</span> HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.590"></a>
+<span class="sourceLineNo">591</span> if (h.isNoTables() || (hbpMeta != null && hbpMeta.isNoTables()))<a name="line.591"></a>
+<span class="sourceLineNo">592</span> return null;<a name="line.592"></a>
+<span class="sourceLineNo">593</span> if (h.isNoTableHeaders() || (hbpMeta != null && hbpMeta.isNoTableHeaders()))<a name="line.593"></a>
+<span class="sourceLineNo">594</span> return new Object[0];<a name="line.594"></a>
+<span class="sourceLineNo">595</span> if (session.canIgnoreValue(cm, null, o1))<a name="line.595"></a>
+<span class="sourceLineNo">596</span> return null;<a name="line.596"></a>
+<span class="sourceLineNo">597</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.597"></a>
+<span class="sourceLineNo">598</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.598"></a>
+<span class="sourceLineNo">599</span> for (Object o : c) {<a name="line.599"></a>
+<span class="sourceLineNo">600</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.600"></a>
+<span class="sourceLineNo">601</span> if (! cm.isInstance(o))<a name="line.601"></a>
+<span class="sourceLineNo">602</span> return null;<a name="line.602"></a>
+<span class="sourceLineNo">603</span> Map m = session.sort((Map)o);<a name="line.603"></a>
+<span class="sourceLineNo">604</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span> if (e.getValue() != null)<a name="line.605"></a>
+<span class="sourceLineNo">606</span> set.add(e.getKey() == null ? null : e.getKey());<a name="line.606"></a>
+<span class="sourceLineNo">607</span> }<a name="line.607"></a>
+<span class="sourceLineNo">608</span> }<a name="line.608"></a>
+<span class="sourceLineNo">609</span> }<a name="line.609"></a>
+<span class="sourceLineNo">610</span> th = set.toArray(new Object[set.size()]);<a name="line.610"></a>
+<span class="sourceLineNo">611</span> } else {<a name="line.611"></a>
+<span class="sourceLineNo">612</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.612"></a>
+<span class="sourceLineNo">613</span> for (Object o : c) {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.614"></a>
+<span class="sourceLineNo">615</span> if (! cm.isInstance(o))<a name="line.615"></a>
+<span class="sourceLineNo">616</span> return null;<a name="line.616"></a>
+<span class="sourceLineNo">617</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.617"></a>
+<span class="sourceLineNo">618</span> for (Map.Entry<String,Object> e : bm.entrySet()) {<a name="line.618"></a>
+<span class="sourceLineNo">619</span> if (e.getValue() != null)<a name="line.619"></a>
+<span class="sourceLineNo">620</span> set.add(e.getKey());<a name="line.620"></a>
+<span class="sourceLineNo">621</span> }<a name="line.621"></a>
+<span class="sourceLineNo">622</span> }<a name="line.622"></a>
+<span class="sourceLineNo">623</span> }<a name="line.623"></a>
+<span class="sourceLineNo">624</span> th = set.toArray(new Object[set.size()]);<a name="line.624"></a>
+<span class="sourceLineNo">625</span> }<a name="line.625"></a>
+<span class="sourceLineNo">626</span> prevC.add(cm);<a name="line.626"></a>
+<span class="sourceLineNo">627</span> boolean isSortable = true;<a name="line.627"></a>
+<span class="sourceLineNo">628</span> for (Object o : th)<a name="line.628"></a>
+<span class="sourceLineNo">629</span> isSortable &= (o instanceof Comparable);<a name="line.629"></a>
+<span class="sourceLineNo">630</span> Set<Object> s = (isSortable ? new TreeSet<Object>() : new LinkedHashSet<Object>());<a name="line.630"></a>
+<span class="sourceLineNo">631</span> s.addAll(Arrays.asList(th));<a name="line.631"></a>
+<span class="sourceLineNo">632</span><a name="line.632"></a>
+<span class="sourceLineNo">633</span> for (Object o : c) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span> if (o == null)<a name="line.634"></a>
+<span class="sourceLineNo">635</span> continue;<a name="line.635"></a>
+<span class="sourceLineNo">636</span> cm = session.getClassMetaForObject(o);<a name="line.636"></a>
+<span class="sourceLineNo">637</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.637"></a>
+<span class="sourceLineNo">638</span> PojoSwap f = cm.getPojoSwap();<a name="line.638"></a>
+<span class="sourceLineNo">639</span> o = f.swap(session, o);<a name="line.639"></a>
+<span class="sourceLineNo">640</span> cm = cm.getSerializedClassMeta();<a name="line.640"></a>
+<span class="sourceLineNo">641</span> }<a name="line.641"></a>
+<span class="sourceLineNo">642</span> if (prevC.contains(cm))<a name="line.642"></a>
+<span class="sourceLineNo">643</span> continue;<a name="line.643"></a>
+<span class="sourceLineNo">644</span> if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.644"></a>
+<span class="sourceLineNo">645</span> return null;<a name="line.645"></a>
+<span class="sourceLineNo">646</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.646"></a>
+<span class="sourceLineNo">647</span> return null;<a name="line.647"></a>
+<span class="sourceLineNo">648</span> if (session.canIgnoreValue(cm, null, o))<a name="line.648"></a>
+<span class="sourceLineNo">649</span> return null;<a name="line.649"></a>
+<span class="sourceLineNo">650</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> Map m = (Map)o;<a name="line.651"></a>
+<span class="sourceLineNo">652</span> if (th.length != m.keySet().size())<a name="line.652"></a>
+<span class="sourceLineNo">653</span> return null;<a name="line.653"></a>
+<span class="sourceLineNo">654</span> for (Object k : m.keySet())<a name="line.654"></a>
+<span class="sourceLineNo">655</span> if (! s.contains(k.toString()))<a name="line.655"></a>
<span class="sourceLineNo">656</span> return null;<a name="line.656"></a>
-<span class="sourceLineNo">657</span> l++;<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> if (s.size() != l)<a name="line.659"></a>
-<span class="sourceLineNo">660</span> return null;<a name="line.660"></a>
-<span class="sourceLineNo">661</span> }<a name="line.661"></a>
-<span class="sourceLineNo">662</span> }<a name="line.662"></a>
-<span class="sourceLineNo">663</span> return th;<a name="line.663"></a>
-<span class="sourceLineNo">664</span> }<a name="line.664"></a>
-<span class="sourceLineNo">665</span><a name="line.665"></a>
-<span class="sourceLineNo">666</span> /**<a name="line.666"></a>
-<span class="sourceLineNo">667</span> * Returns the schema serializer based on the settings of this serializer.<a name="line.667"></a>
-<span class="sourceLineNo">668</span> * @return The schema serializer.<a name="line.668"></a>
-<span class="sourceLineNo">669</span> */<a name="line.669"></a>
-<span class="sourceLineNo">670</span> @Override /* XmlSerializer */<a name="line.670"></a>
-<span class="sourceLineNo">671</span> public HtmlSerializer getSchemaSerializer() {<a name="line.671"></a>
-<span class="sourceLineNo">672</span> if (schemaSerializer == null)<a name="line.672"></a>
-<span class="sourceLineNo">673</span> schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.673"></a>
-<span class="sourceLineNo">674</span> return schemaSerializer;<a name="line.674"></a>
-<span class="sourceLineNo">675</span> }<a name="line.675"></a>
-<span class="sourceLineNo">676</span><a name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span> //--------------------------------------------------------------------------------<a name="line.678"></a>
-<span class="sourceLineNo">679</span> // Entry point methods<a name="line.679"></a>
-<span class="sourceLineNo">680</span> //--------------------------------------------------------------------------------<a name="line.680"></a>
-<span class="sourceLineNo">681</span><a name="line.681"></a>
-<span class="sourceLineNo">682</span> @Override /* Serializer */<a name="line.682"></a>
-<span class="sourceLineNo">683</span> public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.683"></a>
-<span class="sourceLineNo">684</span> return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.684"></a>
-<span class="sourceLineNo">685</span> }<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span> @Override /* Serializer */<a name="line.687"></a>
-<span class="sourceLineNo">688</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.688"></a>
-<span class="sourceLineNo">689</span> HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.689"></a>
-<span class="sourceLineNo">690</span> doSerialize(s, o, s.getWriter());<a name="line.690"></a>
+<span class="sourceLineNo">657</span> } else {<a name="line.657"></a>
+<span class="sourceLineNo">658</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.658"></a>
+<span class="sourceLineNo">659</span> int l = 0;<a name="line.659"></a>
+<span class="sourceLineNo">660</span> for (String k : bm.keySet()) {<a name="line.660"></a>
+<span class="sourceLineNo">661</span> if (! s.contains(k))<a name="line.661"></a>
+<span class="sourceLineNo">662</span> return null;<a name="line.662"></a>
+<span class="sourceLineNo">663</span> l++;<a name="line.663"></a>
+<span class="sourceLineNo">664</span> }<a name="line.664"></a>
+<span class="sourceLineNo">665</span> if (s.size() != l)<a name="line.665"></a>
+<span class="sourceLineNo">666</span> return null;<a name="line.666"></a>
+<span class="sourceLineNo">667</span> }<a name="line.667"></a>
+<span class="sourceLineNo">668</span> }<a name="line.668"></a>
+<span class="sourceLineNo">669</span> return th;<a name="line.669"></a>
+<span class="sourceLineNo">670</span> }<a name="line.670"></a>
+<span class="sourceLineNo">671</span><a name="line.671"></a>
+<span class="sourceLineNo">672</span> /**<a name="line.672"></a>
+<span class="sourceLineNo">673</span> * Returns the schema serializer based on the settings of this serializer.<a name="line.673"></a>
+<span class="sourceLineNo">674</span> * @return The schema serializer.<a name="line.674"></a>
+<span class="sourceLineNo">675</span> */<a name="line.675"></a>
+<span class="sourceLineNo">676</span> @Override /* XmlSerializer */<a name="line.676"></a>
+<span class="sourceLineNo">677</span> public HtmlSerializer getSchemaSerializer() {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> if (schemaSerializer == null)<a name="line.678"></a>
+<span class="sourceLineNo">679</span> schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.679"></a>
+<span class="sourceLineNo">680</span> return schemaSerializer;<a name="line.680"></a>
+<span class="sourceLineNo">681</span> }<a name="line.681"></a>
+<span class="sourceLineNo">682</span><a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span> //--------------------------------------------------------------------------------<a name="line.684"></a>
+<span class="sourceLineNo">685</span> // Entry point methods<a name="line.685"></a>
+<span class="sourceLineNo">686</span> //--------------------------------------------------------------------------------<a name="line.686"></a>
+<span class="sourceLineNo">687</span><a name="line.687"></a>
+<span class="sourceLineNo">688</span> @Override /* Serializer */<a name="line.688"></a>
+<span class="sourceLineNo">689</span> public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.689"></a>
+<span class="sourceLineNo">690</span> return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.690"></a>
<span class="sourceLineNo">691</span> }<a name="line.691"></a>
-<span class="sourceLineNo">692</span>}<a name="line.692"></a>
+<span class="sourceLineNo">692</span><a name="line.692"></a>
+<span class="sourceLineNo">693</span> @Override /* Serializer */<a name="line.693"></a>
+<span class="sourceLineNo">694</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.694"></a>
+<span class="sourceLineNo">695</span> HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.695"></a>
+<span class="sourceLineNo">696</span> doSerialize(s, o, s.getWriter());<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span>}<a name="line.698"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.SqReadable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.SqReadable.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.SqReadable.html
index 3aa18df..63dfc3a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.SqReadable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.SqReadable.html
@@ -398,7 +398,7 @@
<span class="sourceLineNo">390</span> out.i(i+2);<a name="line.390"></a>
<span class="sourceLineNo">391</span> out.eTag("td").nl();<a name="line.391"></a>
<span class="sourceLineNo">392</span> out.sTag(i+2, "td");<a name="line.392"></a>
-<span class="sourceLineNo">393</span> cr = serializeAnything(session, out, value, valueType, (key == null ? "_x0000_" : key.toString()), 2, null, false);<a name="line.393"></a>
+<span class="sourceLineNo">393</span> cr = serializeAnything(session, out, value, valueType, (key == null ? "_x0000_" : session.toString(key)), 2, null, false);<a name="line.393"></a>
<span class="sourceLineNo">394</span> if (cr == CR_NORMAL)<a name="line.394"></a>
<span class="sourceLineNo">395</span> out.i(i+2);<a name="line.395"></a>
<span class="sourceLineNo">396</span> out.eTag("td").nl();<a name="line.396"></a>
@@ -493,211 +493,217 @@
<span class="sourceLineNo">485</span><a name="line.485"></a>
<span class="sourceLineNo">486</span> out.oTag(i, "table").attr(btpn, type2).append('>').nl();<a name="line.486"></a>
<span class="sourceLineNo">487</span> out.sTag(i+1, "tr").nl();<a name="line.487"></a>
-<span class="sourceLineNo">488</span> for (Object key : th)<a name="line.488"></a>
-<span class="sourceLineNo">489</span> out.sTag(i+2, "th").append(key).eTag("th").nl();<a name="line.489"></a>
-<span class="sourceLineNo">490</span> out.eTag(i+1, "tr").nl();<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> for (Object o : c) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> ClassMeta<?> cm = session.getClassMetaForObject(o);<a name="line.493"></a>
+<span class="sourceLineNo">488</span> for (Object key : th) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span> out.sTag(i+2, "th");<a name="line.489"></a>
+<span class="sourceLineNo">490</span> out.text(session.convertToType(key, String.class));<a name="line.490"></a>
+<span class="sourceLineNo">491</span> out.eTag("th").nl();<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span> out.eTag(i+1, "tr").nl();<a name="line.493"></a>
<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> PojoSwap f = cm.getPojoSwap();<a name="line.496"></a>
-<span class="sourceLineNo">497</span> o = f.swap(session, o);<a name="line.497"></a>
-<span class="sourceLineNo">498</span> cm = cm.getSerializedClassMeta();<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> out.oTag(i+1, "tr");<a name="line.501"></a>
-<span class="sourceLineNo">502</span> String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.502"></a>
-<span class="sourceLineNo">503</span> if (typeName != null && sType.getElementType() != cm)<a name="line.503"></a>
-<span class="sourceLineNo">504</span> out.attr(btpn, typeName);<a name="line.504"></a>
-<span class="sourceLineNo">505</span> out.cTag().nl();<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span> if (cm == null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span> serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.508"></a>
+<span class="sourceLineNo">495</span> for (Object o : c) {<a name="line.495"></a>
+<span class="sourceLineNo">496</span> ClassMeta<?> cm = session.getClassMetaForObject(o);<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> PojoSwap f = cm.getPojoSwap();<a name="line.499"></a>
+<span class="sourceLineNo">500</span> o = f.swap(session, o);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> cm = cm.getSerializedClassMeta();<a name="line.501"></a>
+<span class="sourceLineNo">502</span> }<a name="line.502"></a>
+<span class="sourceLineNo">503</span><a name="line.503"></a>
+<span class="sourceLineNo">504</span> out.oTag(i+1, "tr");<a name="line.504"></a>
+<span class="sourceLineNo">505</span> String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.505"></a>
+<span class="sourceLineNo">506</span> if (typeName != null && sType.getElementType() != cm)<a name="line.506"></a>
+<span class="sourceLineNo">507</span> out.attr(btpn, typeName);<a name="line.507"></a>
+<span class="sourceLineNo">508</span> out.cTag().nl();<a name="line.508"></a>
<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span> } else if (cm.isMap() && ! (cm.isBeanMap())) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> Map m2 = session.sort((Map)o);<a name="line.511"></a>
+<span class="sourceLineNo">510</span> if (cm == null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span> serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.511"></a>
<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span> for (Object k : th) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> out.sTag(i+2, "td");<a name="line.514"></a>
-<span class="sourceLineNo">515</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, session.toString(k), 2, null, false);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> if (cr == CR_NORMAL)<a name="line.516"></a>
-<span class="sourceLineNo">517</span> out.i(i+2);<a name="line.517"></a>
-<span class="sourceLineNo">518</span> out.eTag("td").nl();<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> } else {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> BeanMap m2 = null;<a name="line.521"></a>
-<span class="sourceLineNo">522</span> if (o instanceof BeanMap)<a name="line.522"></a>
-<span class="sourceLineNo">523</span> m2 = (BeanMap)o;<a name="line.523"></a>
-<span class="sourceLineNo">524</span> else<a name="line.524"></a>
-<span class="sourceLineNo">525</span> m2 = session.toBeanMap(o);<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span> for (Object k : th) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.528"></a>
-<span class="sourceLineNo">529</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.529"></a>
-<span class="sourceLineNo">530</span> out.sTag(i+2, "td");<a name="line.530"></a>
-<span class="sourceLineNo">531</span> ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.531"></a>
-<span class="sourceLineNo">532</span> if (cr == CR_NORMAL)<a name="line.532"></a>
-<span class="sourceLineNo">533</span> out.i(i+2);<a name="line.533"></a>
-<span class="sourceLineNo">534</span> out.eTag("td").nl();<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span> }<a name="line.536"></a>
-<span class="sourceLineNo">537</span> out.eTag(i+1, "tr").nl();<a name="line.537"></a>
-<span class="sourceLineNo">538</span> }<a name="line.538"></a>
-<span class="sourceLineNo">539</span> out.eTag(i, "table").nl();<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> } else {<a name="line.541"></a>
-<span class="sourceLineNo">542</span> out.oTag(i, "ul");<a name="line.542"></a>
-<span class="sourceLineNo">543</span> if (! type2.equals("array"))<a name="line.543"></a>
-<span class="sourceLineNo">544</span> out.attr(btpn, type2);<a name="line.544"></a>
-<span class="sourceLineNo">545</span> out.append('>').nl();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> for (Object o : c) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> out.sTag(i+1, "li");<a name="line.547"></a>
-<span class="sourceLineNo">548</span> ContentResult cr = serializeAnything(session, out, o, seType, name, 1, null, false);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> if (cr == CR_NORMAL)<a name="line.549"></a>
-<span class="sourceLineNo">550</span> out.i(i+1);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> out.eTag("li").nl();<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span> out.eTag(i, "ul").nl();<a name="line.553"></a>
-<span class="sourceLineNo">554</span> }<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span> /*<a name="line.557"></a>
-<span class="sourceLineNo">558</span> * Returns the table column headers for the specified collection of objects.<a name="line.558"></a>
-<span class="sourceLineNo">559</span> * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.559"></a>
-<span class="sourceLineNo">560</span> * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.560"></a>
-<span class="sourceLineNo">561</span> */<a name="line.561"></a>
-<span class="sourceLineNo">562</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.562"></a>
-<span class="sourceLineNo">563</span> private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.563"></a>
-<span class="sourceLineNo">564</span> if (c.size() == 0)<a name="line.564"></a>
-<span class="sourceLineNo">565</span> return null;<a name="line.565"></a>
-<span class="sourceLineNo">566</span> c = session.sort(c);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> Object[] th;<a name="line.567"></a>
-<span class="sourceLineNo">568</span> Set<Object> s = new TreeSet<Object>();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> Set<ClassMeta> prevC = new HashSet<ClassMeta>();<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Object o1 = null;<a name="line.570"></a>
-<span class="sourceLineNo">571</span> for (Object o : c)<a name="line.571"></a>
-<span class="sourceLineNo">572</span> if (o != null) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span> o1 = o;<a name="line.573"></a>
-<span class="sourceLineNo">574</span> break;<a name="line.574"></a>
-<span class="sourceLineNo">575</span> }<a name="line.575"></a>
-<span class="sourceLineNo">576</span> if (o1 == null)<a name="line.576"></a>
-<span class="sourceLineNo">577</span> return null;<a name="line.577"></a>
-<span class="sourceLineNo">578</span> ClassMeta<?> cm = session.getClassMetaForObject(o1);<a name="line.578"></a>
-<span class="sourceLineNo">579</span> if (cm.getPojoSwap() != null) {<a name="line.579"></a>
-<span class="sourceLineNo">580</span> PojoSwap f = cm.getPojoSwap();<a name="line.580"></a>
-<span class="sourceLineNo">581</span> o1 = f.swap(session, o1);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> cm = cm.getSerializedClassMeta();<a name="line.582"></a>
-<span class="sourceLineNo">583</span> }<a name="line.583"></a>
-<span class="sourceLineNo">584</span> if (cm == null || ! cm.isMapOrBean())<a name="line.584"></a>
-<span class="sourceLineNo">585</span> return null;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.586"></a>
+<span class="sourceLineNo">513</span> } else if (cm.isMap() && ! (cm.isBeanMap())) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> Map m2 = session.sort((Map)o);<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span> for (Object k : th) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span> out.sTag(i+2, "td");<a name="line.517"></a>
+<span class="sourceLineNo">518</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, session.toString(k), 2, null, false);<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (cr == CR_NORMAL)<a name="line.519"></a>
+<span class="sourceLineNo">520</span> out.i(i+2);<a name="line.520"></a>
+<span class="sourceLineNo">521</span> out.eTag("td").nl();<a name="line.521"></a>
+<span class="sourceLineNo">522</span> }<a name="line.522"></a>
+<span class="sourceLineNo">523</span> } else {<a name="line.523"></a>
+<span class="sourceLineNo">524</span> BeanMap m2 = null;<a name="line.524"></a>
+<span class="sourceLineNo">525</span> if (o instanceof BeanMap)<a name="line.525"></a>
+<span class="sourceLineNo">526</span> m2 = (BeanMap)o;<a name="line.526"></a>
+<span class="sourceLineNo">527</span> else<a name="line.527"></a>
+<span class="sourceLineNo">528</span> m2 = session.toBeanMap(o);<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span> for (Object k : th) {<a name="line.530"></a>
+<span class="sourceLineNo">531</span> BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.531"></a>
+<span class="sourceLineNo">532</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.532"></a>
+<span class="sourceLineNo">533</span> out.sTag(i+2, "td");<a name="line.533"></a>
+<span class="sourceLineNo">534</span> ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.534"></a>
+<span class="sourceLineNo">535</span> if (cr == CR_NORMAL)<a name="line.535"></a>
+<span class="sourceLineNo">536</span> out.i(i+2);<a name="line.536"></a>
+<span class="sourceLineNo">537</span> out.eTag("td").nl();<a name="line.537"></a>
+<span class="sourceLineNo">538</span> }<a name="line.538"></a>
+<span class="sourceLineNo">539</span> }<a name="line.539"></a>
+<span class="sourceLineNo">540</span> out.eTag(i+1, "tr").nl();<a name="line.540"></a>
+<span class="sourceLineNo">541</span> }<a name="line.541"></a>
+<span class="sourceLineNo">542</span> out.eTag(i, "table").nl();<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span> } else {<a name="line.544"></a>
+<span class="sourceLineNo">545</span> out.oTag(i, "ul");<a name="line.545"></a>
+<span class="sourceLineNo">546</span> if (! type2.equals("array"))<a name="line.546"></a>
+<span class="sourceLineNo">547</span> out.attr(btpn, type2);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> out.append('>').nl();<a name="line.548"></a>
+<span class="sourceLineNo">549</span> for (Object o : c) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span> out.sTag(i+1, "li");<a name="line.550"></a>
+<span class="sourceLineNo">551</span> ContentResult cr = serializeAnything(session, out, o, seType, name, 1, null, false);<a name="line.551"></a>
+<span class="sourceLineNo">552</span> if (cr == CR_NORMAL)<a name="line.552"></a>
+<span class="sourceLineNo">553</span> out.i(i+1);<a name="line.553"></a>
+<span class="sourceLineNo">554</span> out.eTag("li").nl();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> }<a name="line.555"></a>
+<span class="sourceLineNo">556</span> out.eTag(i, "ul").nl();<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span> }<a name="line.558"></a>
+<span class="sourceLineNo">559</span><a name="line.559"></a>
+<span class="sourceLineNo">560</span> /*<a name="line.560"></a>
+<span class="sourceLineNo">561</span> * Returns the table column headers for the specified collection of objects.<a name="line.561"></a>
+<span class="sourceLineNo">562</span> * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.562"></a>
+<span class="sourceLineNo">563</span> * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.563"></a>
+<span class="sourceLineNo">564</span> */<a name="line.564"></a>
+<span class="sourceLineNo">565</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.565"></a>
+<span class="sourceLineNo">566</span> private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.566"></a>
+<span class="sourceLineNo">567</span> if (c.size() == 0)<a name="line.567"></a>
+<span class="sourceLineNo">568</span> return null;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> c = session.sort(c);<a name="line.569"></a>
+<span class="sourceLineNo">570</span> Object[] th;<a name="line.570"></a>
+<span class="sourceLineNo">571</span> Set<ClassMeta> prevC = new HashSet<ClassMeta>();<a name="line.571"></a>
+<span class="sourceLineNo">572</span> Object o1 = null;<a name="line.572"></a>
+<span class="sourceLineNo">573</span> for (Object o : c)<a name="line.573"></a>
+<span class="sourceLineNo">574</span> if (o != null) {<a name="line.574"></a>
+<span class="sourceLineNo">575</span> o1 = o;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> break;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span> if (o1 == null)<a name="line.578"></a>
+<span class="sourceLineNo">579</span> return null;<a name="line.579"></a>
+<span class="sourceLineNo">580</span> ClassMeta<?> cm = session.getClassMetaForObject(o1);<a name="line.580"></a>
+<span class="sourceLineNo">581</span> if (cm.getPojoSwap() != null) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span> PojoSwap f = cm.getPojoSwap();<a name="line.582"></a>
+<span class="sourceLineNo">583</span> o1 = f.swap(session, o1);<a name="line.583"></a>
+<span class="sourceLineNo">584</span> cm = cm.getSerializedClassMeta();<a name="line.584"></a>
+<span class="sourceLineNo">585</span> }<a name="line.585"></a>
+<span class="sourceLineNo">586</span> if (cm == null || ! cm.isMapOrBean())<a name="line.586"></a>
<span class="sourceLineNo">587</span> return null;<a name="line.587"></a>
-<span class="sourceLineNo">588</span> HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> if (h.isNoTables() || (hbpMeta != null && hbpMeta.isNoTables()))<a name="line.589"></a>
-<span class="sourceLineNo">590</span> return null;<a name="line.590"></a>
-<span class="sourceLineNo">591</span> if (h.isNoTableHeaders() || (hbpMeta != null && hbpMeta.isNoTableHeaders()))<a name="line.591"></a>
-<span class="sourceLineNo">592</span> return new Object[0];<a name="line.592"></a>
-<span class="sourceLineNo">593</span> if (session.canIgnoreValue(cm, null, o1))<a name="line.593"></a>
-<span class="sourceLineNo">594</span> return null;<a name="line.594"></a>
-<span class="sourceLineNo">595</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.596"></a>
-<span class="sourceLineNo">597</span> for (Object o : c) {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> if (! cm.isInstance(o))<a name="line.599"></a>
-<span class="sourceLineNo">600</span> return null;<a name="line.600"></a>
-<span class="sourceLineNo">601</span> Map m = session.sort((Map)o);<a name="line.601"></a>
-<span class="sourceLineNo">602</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (e.getValue() != null)<a name="line.603"></a>
-<span class="sourceLineNo">604</span> set.add(e.getKey() == null ? null : e.getKey());<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span> th = set.toArray(new Object[set.size()]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> } else {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.610"></a>
-<span class="sourceLineNo">611</span> for (Object o : c) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.612"></a>
-<span class="sourceLineNo">613</span> if (! cm.isInstance(o))<a name="line.613"></a>
-<span class="sourceLineNo">614</span> return null;<a name="line.614"></a>
-<span class="sourceLineNo">615</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.615"></a>
-<span class="sourceLineNo">616</span> for (Map.Entry<String,Object> e : bm.entrySet()) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span> if (e.getValue() != null)<a name="line.617"></a>
-<span class="sourceLineNo">618</span> set.add(e.getKey());<a name="line.618"></a>
-<span class="sourceLineNo">619</span> }<a name="line.619"></a>
-<span class="sourceLineNo">620</span> }<a name="line.620"></a>
-<span class="sourceLineNo">621</span> }<a name="line.621"></a>
-<span class="sourceLineNo">622</span> th = set.toArray(new Object[set.size()]);<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span> prevC.add(cm);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> s.addAll(Arrays.asList(th));<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> for (Object o : c) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> if (o == null)<a name="line.628"></a>
-<span class="sourceLineNo">629</span> continue;<a name="line.629"></a>
-<span class="sourceLineNo">630</span> cm = session.getClassMetaForObject(o);<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> PojoSwap f = cm.getPojoSwap();<a name="line.632"></a>
-<span class="sourceLineNo">633</span> o = f.swap(session, o);<a name="line.633"></a>
-<span class="sourceLineNo">634</span> cm = cm.getSerializedClassMeta();<a name="line.634"></a>
-<span class="sourceLineNo">635</span> }<a name="line.635"></a>
-<span class="sourceLineNo">636</span> if (prevC.contains(cm))<a name="line.636"></a>
-<span class="sourceLineNo">637</span> continue;<a name="line.637"></a>
-<span class="sourceLineNo">638</span> if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.638"></a>
-<span class="sourceLineNo">639</span> return null;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.640"></a>
-<span class="sourceLineNo">641</span> return null;<a name="line.641"></a>
-<span class="sourceLineNo">642</span> if (session.canIgnoreValue(cm, null, o))<a name="line.642"></a>
-<span class="sourceLineNo">643</span> return null;<a name="line.643"></a>
-<span class="sourceLineNo">644</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> Map m = (Map)o;<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (th.length != m.keySet().size())<a name="line.646"></a>
-<span class="sourceLineNo">647</span> return null;<a name="line.647"></a>
-<span class="sourceLineNo">648</span> for (Object k : m.keySet())<a name="line.648"></a>
-<span class="sourceLineNo">649</span> if (! s.contains(k.toString()))<a name="line.649"></a>
-<span class="sourceLineNo">650</span> return null;<a name="line.650"></a>
-<span class="sourceLineNo">651</span> } else {<a name="line.651"></a>
-<span class="sourceLineNo">652</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.652"></a>
-<span class="sourceLineNo">653</span> int l = 0;<a name="line.653"></a>
-<span class="sourceLineNo">654</span> for (String k : bm.keySet()) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> if (! s.contains(k))<a name="line.655"></a>
+<span class="sourceLineNo">588</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.588"></a>
+<span class="sourceLineNo">589</span> return null;<a name="line.589"></a>
+<span class="sourceLineNo">590</span> HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.590"></a>
+<span class="sourceLineNo">591</span> if (h.isNoTables() || (hbpMeta != null && hbpMeta.isNoTables()))<a name="line.591"></a>
+<span class="sourceLineNo">592</span> return null;<a name="line.592"></a>
+<span class="sourceLineNo">593</span> if (h.isNoTableHeaders() || (hbpMeta != null && hbpMeta.isNoTableHeaders()))<a name="line.593"></a>
+<span class="sourceLineNo">594</span> return new Object[0];<a name="line.594"></a>
+<span class="sourceLineNo">595</span> if (session.canIgnoreValue(cm, null, o1))<a name="line.595"></a>
+<span class="sourceLineNo">596</span> return null;<a name="line.596"></a>
+<span class="sourceLineNo">597</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.597"></a>
+<span class="sourceLineNo">598</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.598"></a>
+<span class="sourceLineNo">599</span> for (Object o : c) {<a name="line.599"></a>
+<span class="sourceLineNo">600</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.600"></a>
+<span class="sourceLineNo">601</span> if (! cm.isInstance(o))<a name="line.601"></a>
+<span class="sourceLineNo">602</span> return null;<a name="line.602"></a>
+<span class="sourceLineNo">603</span> Map m = session.sort((Map)o);<a name="line.603"></a>
+<span class="sourceLineNo">604</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span> if (e.getValue() != null)<a name="line.605"></a>
+<span class="sourceLineNo">606</span> set.add(e.getKey() == null ? null : e.getKey());<a name="line.606"></a>
+<span class="sourceLineNo">607</span> }<a name="line.607"></a>
+<span class="sourceLineNo">608</span> }<a name="line.608"></a>
+<span class="sourceLineNo">609</span> }<a name="line.609"></a>
+<span class="sourceLineNo">610</span> th = set.toArray(new Object[set.size()]);<a name="line.610"></a>
+<span class="sourceLineNo">611</span> } else {<a name="line.611"></a>
+<span class="sourceLineNo">612</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.612"></a>
+<span class="sourceLineNo">613</span> for (Object o : c) {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.614"></a>
+<span class="sourceLineNo">615</span> if (! cm.isInstance(o))<a name="line.615"></a>
+<span class="sourceLineNo">616</span> return null;<a name="line.616"></a>
+<span class="sourceLineNo">617</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.617"></a>
+<span class="sourceLineNo">618</span> for (Map.Entry<String,Object> e : bm.entrySet()) {<a name="line.618"></a>
+<span class="sourceLineNo">619</span> if (e.getValue() != null)<a name="line.619"></a>
+<span class="sourceLineNo">620</span> set.add(e.getKey());<a name="line.620"></a>
+<span class="sourceLineNo">621</span> }<a name="line.621"></a>
+<span class="sourceLineNo">622</span> }<a name="line.622"></a>
+<span class="sourceLineNo">623</span> }<a name="line.623"></a>
+<span class="sourceLineNo">624</span> th = set.toArray(new Object[set.size()]);<a name="line.624"></a>
+<span class="sourceLineNo">625</span> }<a name="line.625"></a>
+<span class="sourceLineNo">626</span> prevC.add(cm);<a name="line.626"></a>
+<span class="sourceLineNo">627</span> boolean isSortable = true;<a name="line.627"></a>
+<span class="sourceLineNo">628</span> for (Object o : th)<a name="line.628"></a>
+<span class="sourceLineNo">629</span> isSortable &= (o instanceof Comparable);<a name="line.629"></a>
+<span class="sourceLineNo">630</span> Set<Object> s = (isSortable ? new TreeSet<Object>() : new LinkedHashSet<Object>());<a name="line.630"></a>
+<span class="sourceLineNo">631</span> s.addAll(Arrays.asList(th));<a name="line.631"></a>
+<span class="sourceLineNo">632</span><a name="line.632"></a>
+<span class="sourceLineNo">633</span> for (Object o : c) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span> if (o == null)<a name="line.634"></a>
+<span class="sourceLineNo">635</span> continue;<a name="line.635"></a>
+<span class="sourceLineNo">636</span> cm = session.getClassMetaForObject(o);<a name="line.636"></a>
+<span class="sourceLineNo">637</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.637"></a>
+<span class="sourceLineNo">638</span> PojoSwap f = cm.getPojoSwap();<a name="line.638"></a>
+<span class="sourceLineNo">639</span> o = f.swap(session, o);<a name="line.639"></a>
+<span class="sourceLineNo">640</span> cm = cm.getSerializedClassMeta();<a name="line.640"></a>
+<span class="sourceLineNo">641</span> }<a name="line.641"></a>
+<span class="sourceLineNo">642</span> if (prevC.contains(cm))<a name="line.642"></a>
+<span class="sourceLineNo">643</span> continue;<a name="line.643"></a>
+<span class="sourceLineNo">644</span> if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.644"></a>
+<span class="sourceLineNo">645</span> return null;<a name="line.645"></a>
+<span class="sourceLineNo">646</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.646"></a>
+<span class="sourceLineNo">647</span> return null;<a name="line.647"></a>
+<span class="sourceLineNo">648</span> if (session.canIgnoreValue(cm, null, o))<a name="line.648"></a>
+<span class="sourceLineNo">649</span> return null;<a name="line.649"></a>
+<span class="sourceLineNo">650</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> Map m = (Map)o;<a name="line.651"></a>
+<span class="sourceLineNo">652</span> if (th.length != m.keySet().size())<a name="line.652"></a>
+<span class="sourceLineNo">653</span> return null;<a name="line.653"></a>
+<span class="sourceLineNo">654</span> for (Object k : m.keySet())<a name="line.654"></a>
+<span class="sourceLineNo">655</span> if (! s.contains(k.toString()))<a name="line.655"></a>
<span class="sourceLineNo">656</span> return null;<a name="line.656"></a>
-<span class="sourceLineNo">657</span> l++;<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> if (s.size() != l)<a name="line.659"></a>
-<span class="sourceLineNo">660</span> return null;<a name="line.660"></a>
-<span class="sourceLineNo">661</span> }<a name="line.661"></a>
-<span class="sourceLineNo">662</span> }<a name="line.662"></a>
-<span class="sourceLineNo">663</span> return th;<a name="line.663"></a>
-<span class="sourceLineNo">664</span> }<a name="line.664"></a>
-<span class="sourceLineNo">665</span><a name="line.665"></a>
-<span class="sourceLineNo">666</span> /**<a name="line.666"></a>
-<span class="sourceLineNo">667</span> * Returns the schema serializer based on the settings of this serializer.<a name="line.667"></a>
-<span class="sourceLineNo">668</span> * @return The schema serializer.<a name="line.668"></a>
-<span class="sourceLineNo">669</span> */<a name="line.669"></a>
-<span class="sourceLineNo">670</span> @Override /* XmlSerializer */<a name="line.670"></a>
-<span class="sourceLineNo">671</span> public HtmlSerializer getSchemaSerializer() {<a name="line.671"></a>
-<span class="sourceLineNo">672</span> if (schemaSerializer == null)<a name="line.672"></a>
-<span class="sourceLineNo">673</span> schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.673"></a>
-<span class="sourceLineNo">674</span> return schemaSerializer;<a name="line.674"></a>
-<span class="sourceLineNo">675</span> }<a name="line.675"></a>
-<span class="sourceLineNo">676</span><a name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span> //--------------------------------------------------------------------------------<a name="line.678"></a>
-<span class="sourceLineNo">679</span> // Entry point methods<a name="line.679"></a>
-<span class="sourceLineNo">680</span> //--------------------------------------------------------------------------------<a name="line.680"></a>
-<span class="sourceLineNo">681</span><a name="line.681"></a>
-<span class="sourceLineNo">682</span> @Override /* Serializer */<a name="line.682"></a>
-<span class="sourceLineNo">683</span> public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.683"></a>
-<span class="sourceLineNo">684</span> return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.684"></a>
-<span class="sourceLineNo">685</span> }<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span> @Override /* Serializer */<a name="line.687"></a>
-<span class="sourceLineNo">688</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.688"></a>
-<span class="sourceLineNo">689</span> HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.689"></a>
-<span class="sourceLineNo">690</span> doSerialize(s, o, s.getWriter());<a name="line.690"></a>
+<span class="sourceLineNo">657</span> } else {<a name="line.657"></a>
+<span class="sourceLineNo">658</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.658"></a>
+<span class="sourceLineNo">659</span> int l = 0;<a name="line.659"></a>
+<span class="sourceLineNo">660</span> for (String k : bm.keySet()) {<a name="line.660"></a>
+<span class="sourceLineNo">661</span> if (! s.contains(k))<a name="line.661"></a>
+<span class="sourceLineNo">662</span> return null;<a name="line.662"></a>
+<span class="sourceLineNo">663</span> l++;<a name="line.663"></a>
+<span class="sourceLineNo">664</span> }<a name="line.664"></a>
+<span class="sourceLineNo">665</span> if (s.size() != l)<a name="line.665"></a>
+<span class="sourceLineNo">666</span> return null;<a name="line.666"></a>
+<span class="sourceLineNo">667</span> }<a name="line.667"></a>
+<span class="sourceLineNo">668</span> }<a name="line.668"></a>
+<span class="sourceLineNo">669</span> return th;<a name="line.669"></a>
+<span class="sourceLineNo">670</span> }<a name="line.670"></a>
+<span class="sourceLineNo">671</span><a name="line.671"></a>
+<span class="sourceLineNo">672</span> /**<a name="line.672"></a>
+<span class="sourceLineNo">673</span> * Returns the schema serializer based on the settings of this serializer.<a name="line.673"></a>
+<span class="sourceLineNo">674</span> * @return The schema serializer.<a name="line.674"></a>
+<span class="sourceLineNo">675</span> */<a name="line.675"></a>
+<span class="sourceLineNo">676</span> @Override /* XmlSerializer */<a name="line.676"></a>
+<span class="sourceLineNo">677</span> public HtmlSerializer getSchemaSerializer() {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> if (schemaSerializer == null)<a name="line.678"></a>
+<span class="sourceLineNo">679</span> schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.679"></a>
+<span class="sourceLineNo">680</span> return schemaSerializer;<a name="line.680"></a>
+<span class="sourceLineNo">681</span> }<a name="line.681"></a>
+<span class="sourceLineNo">682</span><a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span> //--------------------------------------------------------------------------------<a name="line.684"></a>
+<span class="sourceLineNo">685</span> // Entry point methods<a name="line.685"></a>
+<span class="sourceLineNo">686</span> //--------------------------------------------------------------------------------<a name="line.686"></a>
+<span class="sourceLineNo">687</span><a name="line.687"></a>
+<span class="sourceLineNo">688</span> @Override /* Serializer */<a name="line.688"></a>
+<span class="sourceLineNo">689</span> public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.689"></a>
+<span class="sourceLineNo">690</span> return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.690"></a>
<span class="sourceLineNo">691</span> }<a name="line.691"></a>
-<span class="sourceLineNo">692</span>}<a name="line.692"></a>
+<span class="sourceLineNo">692</span><a name="line.692"></a>
+<span class="sourceLineNo">693</span> @Override /* Serializer */<a name="line.693"></a>
+<span class="sourceLineNo">694</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.694"></a>
+<span class="sourceLineNo">695</span> HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.695"></a>
+<span class="sourceLineNo">696</span> doSerialize(s, o, s.getWriter());<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span>}<a name="line.698"></a>
[39/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/rest/RestConfig.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestConfig.html b/content/site/apidocs/org/apache/juneau/rest/RestConfig.html
index 6168f49..9f12db2 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestConfig.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestConfig.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -434,67 +434,85 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
</tr>
<tr id="i45" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setPageLinks-java.lang.String-">setPageLinks</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pageLinks)</code>
+<div class="block">Sets the page links to use on HTML views of pages.</div>
+</td>
+</tr>
+<tr id="i46" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setPageText-java.lang.String-">setPageText</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pageText)</code>
+<div class="block">Sets the page text to use on HTML views of pages.</div>
+</td>
+</tr>
+<tr id="i47" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setPageTitle-java.lang.String-">setPageTitle</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pageTitle)</code>
+<div class="block">Sets the page title to use on HTML views of pages.</div>
+</td>
+</tr>
+<tr id="i48" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setPath-java.lang.String-">setPath</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</code>
<div class="block">Sets the URL path of the resource <js>"/foobar"</js>.</div>
</td>
</tr>
-<tr id="i46" class="altColor">
+<tr id="i49" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setProperties-java.util.Map-">setProperties</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> properties)</code>
<div class="block">Sets multiple properties on this resource.</div>
</td>
</tr>
-<tr id="i47" class="rowColor">
+<tr id="i50" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setProperty-java.lang.String-java.lang.Object-">setProperty</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets a property on this resource.</div>
</td>
</tr>
-<tr id="i48" class="altColor">
+<tr id="i51" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setResourceResolver-java.lang.Class-">setResourceResolver</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/rest/RestResourceResolver.html" title="class in org.apache.juneau.rest">RestResourceResolver</a>> resourceResolver)</code>
<div class="block">Overrides the default REST resource resolver.</div>
</td>
</tr>
-<tr id="i49" class="rowColor">
+<tr id="i52" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setResourceResolver-org.apache.juneau.rest.RestResourceResolver-">setResourceResolver</a></span>(<a href="../../../../org/apache/juneau/rest/RestResourceResolver.html" title="class in org.apache.juneau.rest">RestResourceResolver</a> resourceResolver)</code>
<div class="block">Overrides the default REST resource resolver.</div>
</td>
</tr>
-<tr id="i50" class="altColor">
+<tr id="i53" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setStyleSheet-java.lang.Class-java.lang.String-">setStyleSheet</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> resourceClass,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> resourcePath)</code>
<div class="block">Specifies the stylesheet that make up the contents of the page <js>"/resource-path/styles.css"</js>.</div>
</td>
</tr>
-<tr id="i51" class="rowColor">
+<tr id="i54" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setStyleSheet-java.lang.Object...-">setStyleSheet</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... styleSheets)</code>
<div class="block">Specifies the stylesheets that make up the contents of the page <js>"/resource-path/styles.css"</js>.</div>
</td>
</tr>
-<tr id="i52" class="altColor">
+<tr id="i55" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setSupportedAcceptTypes-org.apache.juneau.MediaType...-">setSupportedAcceptTypes</a></span>(<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... mediaTypes)</code>
<div class="block">Specifies the list of supported <code>Accept</code> media types for this resource.</div>
</td>
</tr>
-<tr id="i53" class="rowColor">
+<tr id="i56" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setSupportedAcceptTypes-java.lang.String...-">setSupportedAcceptTypes</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... mediaTypes)</code>
<div class="block">Specifies the list of supported <code>Accept</code> media types for this resource.</div>
</td>
</tr>
-<tr id="i54" class="altColor">
+<tr id="i57" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setSupportedContentTypes-org.apache.juneau.MediaType...-">setSupportedContentTypes</a></span>(<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... mediaTypes)</code>
<div class="block">Specifies the list of supported <code>Content-Type</code> media types for this resource.</div>
</td>
</tr>
-<tr id="i55" class="rowColor">
+<tr id="i58" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestConfig.html#setSupportedContentTypes-java.lang.String...-">setSupportedContentTypes</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... mediaTypes)</code>
<div class="block">Specifies the list of supported <code>Content-Type</code> media types for this resource.</div>
@@ -528,7 +546,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addVars</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.255">addVars</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... vars)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.263">addVars</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... vars)</pre>
<div class="block">Adds the specified <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> classes to this config.
<p>
These variables affect the variable resolver returned by <a href="../../../../org/apache/juneau/rest/RestRequest.html#getVarResolverSession--"><code>RestRequest.getVarResolverSession()</code></a> which is
@@ -565,7 +583,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addVarContextObject</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.277">addVarContextObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.285">addVarContextObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> object)</pre>
<div class="block">Adds a var context object to this config.
<p>
@@ -593,7 +611,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setConfigFile</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.291">setConfigFile</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> configFile)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.299">setConfigFile</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> configFile)</pre>
<div class="block">Overwrites the default config file with a custom config file.
<p>
By default, the config file is determined using the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#config--"><code>@RestResource.config()</code></a> annotation.
@@ -612,7 +630,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setProperty</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.305">setProperty</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key,
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.313">setProperty</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets a property on this resource.
<p>
@@ -632,7 +650,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setProperties</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.320">setProperties</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> properties)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.328">setProperties</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> properties)</pre>
<div class="block">Sets multiple properties on this resource.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#properties--"><code>@RestResource.properties()</code></a> annotation.
@@ -652,7 +670,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addBeanFilters</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.335">addBeanFilters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... beanFilters)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.343">addBeanFilters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... beanFilters)</pre>
<div class="block">Adds class-level bean filters to this resource.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#beanFilters--"><code>@RestResource.beanFilters()</code></a> annotation.
@@ -672,7 +690,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addPojoSwaps</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.350">addPojoSwaps</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... pojoSwaps)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.358">addPojoSwaps</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... pojoSwaps)</pre>
<div class="block">Adds class-level pojo swaps to this resource.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pojoSwaps--"><code>@RestResource.pojoSwaps()</code></a> annotation.
@@ -692,7 +710,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addSerializers</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.365">addSerializers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... serializers)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.373">addSerializers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... serializers)</pre>
<div class="block">Adds class-level serializers to this resource.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#serializers--"><code>@RestResource.serializers()</code></a> annotation.
@@ -712,7 +730,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addSerializers</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.384">addSerializers</a>(<a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>... serializers)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.392">addSerializers</a>(<a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>... serializers)</pre>
<div class="block">Adds class-level serializers to this resource.
<p>
Same as <a href="../../../../org/apache/juneau/rest/RestConfig.html#addSerializers-java.lang.Class...-"><code>addSerializers(Class...)</code></a> except allows you to pass in serializer instances.
@@ -736,7 +754,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addParsers</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.399">addParsers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... parsers)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.407">addParsers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... parsers)</pre>
<div class="block">Adds class-level parsers to this resource.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#parsers--"><code>@RestResource.parsers()</code></a> annotation.
@@ -756,7 +774,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addParsers</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.418">addParsers</a>(<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>... parsers)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.426">addParsers</a>(<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>... parsers)</pre>
<div class="block">Adds class-level parsers to this resource.
<p>
Same as <a href="../../../../org/apache/juneau/rest/RestConfig.html#addParsers-java.lang.Class...-"><code>addParsers(Class...)</code></a> except allows you to pass in parser instances.
@@ -780,7 +798,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addEncoders</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.435">addEncoders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... encoders)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.443">addEncoders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... encoders)</pre>
<div class="block">Adds class-level encoders to this resource.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#encoders--"><code>@RestResource.encoders()</code></a> annotation.
@@ -802,7 +820,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addEncoders</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.448">addEncoders</a>(<a href="../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a>... encoders)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.456">addEncoders</a>(<a href="../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a>... encoders)</pre>
<div class="block">Adds class-level encoders to this resource.
<p>
Same as <a href="../../../../org/apache/juneau/rest/RestConfig.html#addEncoders-java.lang.Class...-"><code>addEncoders(Class...)</code></a> except allows you to pass in encoder instances.</div>
@@ -820,7 +838,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addConverters</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.473">addConverters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... converters)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.481">addConverters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... converters)</pre>
<div class="block">Adds class-level converters to this resource.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#converters--"><code>@RestResource.converters()</code></a> annotation.
@@ -850,7 +868,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addConverters</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.486">addConverters</a>(<a href="../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>... converters)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.494">addConverters</a>(<a href="../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>... converters)</pre>
<div class="block">Adds class-level encoders to this resource.
<p>
Same as <a href="../../../../org/apache/juneau/rest/RestConfig.html#addConverters-java.lang.Class...-"><code>addConverters(Class...)</code></a> except allows you to pass in converter instances.</div>
@@ -868,7 +886,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addGuards</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.501">addGuards</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... guards)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.509">addGuards</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... guards)</pre>
<div class="block">Adds class-level guards to this resource.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#guards--"><code>@RestResource.guards()</code></a> annotation.
@@ -888,7 +906,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addGuards</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.514">addGuards</a>(<a href="../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>... guards)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.522">addGuards</a>(<a href="../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>... guards)</pre>
<div class="block">Adds class-level guards to this resource.
<p>
Same as <a href="../../../../org/apache/juneau/rest/RestConfig.html#addGuards-java.lang.Class...-"><code>addGuards(Class...)</code></a> except allows you to pass in guard instances.</div>
@@ -906,7 +924,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addMimeTypes</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.545">addMimeTypes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... mimeTypes)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.553">addMimeTypes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... mimeTypes)</pre>
<div class="block">Adds MIME-type definitions.
<p>
These definitions are used in the following locations for setting the media type on responses:
@@ -942,7 +960,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addDefaultRequestHeader</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.563">addDefaultRequestHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.571">addDefaultRequestHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Adds class-level default HTTP request headers to this resource.
<p>
@@ -965,7 +983,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addDefaultRequestHeaders</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.580">addDefaultRequestHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... headers)
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.588">addDefaultRequestHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... headers)
throws <a href="../../../../org/apache/juneau/rest/RestServletException.html" title="class in org.apache.juneau.rest">RestServletException</a></pre>
<div class="block">Adds class-level default HTTP request headers to this resource.
<p>
@@ -989,7 +1007,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addDefaultResponseHeader</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.604">addDefaultResponseHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.612">addDefaultResponseHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Adds class-level default HTTP response headers to this resource.
<p>
@@ -1014,7 +1032,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addDefaultResponseHeaders</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.621">addDefaultResponseHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... headers)
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.629">addDefaultResponseHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... headers)
throws <a href="../../../../org/apache/juneau/rest/RestServletException.html" title="class in org.apache.juneau.rest">RestServletException</a></pre>
<div class="block">Adds class-level default HTTP response headers to this resource.
<p>
@@ -1038,7 +1056,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addResponseHandlers</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.651">addResponseHandlers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... responseHandlers)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.659">addResponseHandlers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... responseHandlers)</pre>
<div class="block">Adds class-level response handler classes to this resource.
<p>
Response handlers are responsible for converting various POJOs returned by REST methods into actual HTTP responses.
@@ -1068,7 +1086,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addResponseHandlers</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.664">addResponseHandlers</a>(<a href="../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>... responseHandlers)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.672">addResponseHandlers</a>(<a href="../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>... responseHandlers)</pre>
<div class="block">Adds class-level response handlers to this resource.
<p>
Same as <a href="../../../../org/apache/juneau/rest/RestConfig.html#addResponseHandlers-java.lang.Class...-"><code>addResponseHandlers(Class...)</code></a> except allows you to pass in response handler instances.</div>
@@ -1086,7 +1104,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addChildResource</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.680">addChildResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.688">addChildResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> child)</pre>
<div class="block">Adds a child resource to this resource.
<p>
@@ -1108,7 +1126,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addChildResources</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.696">addChildResources</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... children)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.704">addChildResources</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... children)</pre>
<div class="block">Add child resources to this resource.
<p>
Child resources are resources that are accessed under the path of the parent resource.
@@ -1129,7 +1147,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addChildResources</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.712">addChildResources</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... children)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.720">addChildResources</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>... children)</pre>
<div class="block">Add child resources to this resource.
<p>
Child resources are resources that are accessed under the path of the parent resource.
@@ -1150,7 +1168,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setSupportedAcceptTypes</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.727">setSupportedAcceptTypes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... mediaTypes)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.735">setSupportedAcceptTypes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... mediaTypes)</pre>
<div class="block">Specifies the list of supported <code>Accept</code> media types for this resource.
<p>
This overrides the media types inferred from the parsers on this resource.
@@ -1170,7 +1188,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setSupportedAcceptTypes</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.744">setSupportedAcceptTypes</a>(<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... mediaTypes)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.752">setSupportedAcceptTypes</a>(<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... mediaTypes)</pre>
<div class="block">Specifies the list of supported <code>Accept</code> media types for this resource.
<p>
This overrides the media types inferred from the parsers on this resource.
@@ -1190,7 +1208,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setSupportedContentTypes</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.759">setSupportedContentTypes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... mediaTypes)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.767">setSupportedContentTypes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... mediaTypes)</pre>
<div class="block">Specifies the list of supported <code>Content-Type</code> media types for this resource.
<p>
This overrides the media types inferred from the serializers on this resource.
@@ -1210,7 +1228,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setSupportedContentTypes</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.776">setSupportedContentTypes</a>(<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... mediaTypes)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.784">setSupportedContentTypes</a>(<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... mediaTypes)</pre>
<div class="block">Specifies the list of supported <code>Content-Type</code> media types for this resource.
<p>
This overrides the media types inferred from the serializers on this resource.
@@ -1230,7 +1248,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setStyleSheet</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.799">setStyleSheet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... styleSheets)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.807">setStyleSheet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... styleSheets)</pre>
<div class="block">Specifies the stylesheets that make up the contents of the page <js>"/resource-path/styles.css"</js>.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#stylesheet--"><code>@RestResource.stylesheet()</code></a> annotation.
@@ -1258,7 +1276,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setStyleSheet</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.817">setStyleSheet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> resourceClass,
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.825">setStyleSheet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> resourceClass,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> resourcePath)</pre>
<div class="block">Specifies the stylesheet that make up the contents of the page <js>"/resource-path/styles.css"</js>.
<p>
@@ -1282,7 +1300,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addStyleSheet</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.831">addStyleSheet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... styleSheets)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.839">addStyleSheet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... styleSheets)</pre>
<div class="block">Adds to the stylesheet that make up the contents of the page <js>"/resource-path/styles.css"</js>.
<p>
Same as <a href="../../../../org/apache/juneau/rest/RestConfig.html#setStyleSheet-java.lang.Object...-"><code>setStyleSheet(Object...)</code></a> except appends to the existing list instead of replacing.</div>
@@ -1300,7 +1318,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addStyleSheet</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.847">addStyleSheet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> resourceClass,
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.855">addStyleSheet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> resourceClass,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> resourcePath)</pre>
<div class="block">Adds to the stylesheet that make up the contents of the page <js>"/resource-path/styles.css"</js>.
<p>
@@ -1320,7 +1338,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setFavIcon</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.869">setFavIcon</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> favIcon)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.877">setFavIcon</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> favIcon)</pre>
<div class="block">Specifies the icon contents that make up the contents of the page <js>"/resource-path/favicon.ico"</js>.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#favicon--"><code>@RestResource.favicon()</code></a> annotation.
@@ -1345,7 +1363,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setFavIcon</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.887">setFavIcon</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> resourceClass,
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.895">setFavIcon</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> resourceClass,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> resourcePath)</pre>
<div class="block">Specifies the icon contents that make up the contents of the page <js>"/resource-path/favicon.ico"</js>.
<p>
@@ -1369,7 +1387,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>addStaticFiles</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.905">addStaticFiles</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> resourceClass,
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.913">addStaticFiles</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> resourceClass,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> staticFilesString)</pre>
<div class="block">Appends to the static files resource map.
<p>
@@ -1393,7 +1411,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setResourceResolver</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.923">setResourceResolver</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/rest/RestResourceResolver.html" title="class in org.apache.juneau.rest">RestResourceResolver</a>> resourceResolver)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.931">setResourceResolver</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/rest/RestResourceResolver.html" title="class in org.apache.juneau.rest">RestResourceResolver</a>> resourceResolver)</pre>
<div class="block">Overrides the default REST resource resolver.
<p>
The resource resolver is used to resolve instances from <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> objects defined in the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#children--"><code>RestResource.children()</code></a> annotation.
@@ -1414,7 +1432,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setResourceResolver</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.936">setResourceResolver</a>(<a href="../../../../org/apache/juneau/rest/RestResourceResolver.html" title="class in org.apache.juneau.rest">RestResourceResolver</a> resourceResolver)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.944">setResourceResolver</a>(<a href="../../../../org/apache/juneau/rest/RestResourceResolver.html" title="class in org.apache.juneau.rest">RestResourceResolver</a> resourceResolver)</pre>
<div class="block">Overrides the default REST resource resolver.
<p>
Same as <a href="../../../../org/apache/juneau/rest/RestConfig.html#setResourceResolver-java.lang.Class-"><code>setResourceResolver(Class)</code></a> except allows you to specify an instance instead of a class.</div>
@@ -1432,7 +1450,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setPath</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.949">setPath</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.957">setPath</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</pre>
<div class="block">Sets the URL path of the resource <js>"/foobar"</js>.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#path--"><code>@RestResource.path()</code></a> annotation.</div>
@@ -1450,7 +1468,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setClientVersionHeader</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.964">setClientVersionHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> clientVersionHeader)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.972">setClientVersionHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> clientVersionHeader)</pre>
<div class="block">Sets name of the header used to denote the client version on HTTP requests.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#clientVersionHeader--"><code>@RestResource.clientVersionHeader()</code></a> annotation.</div>
@@ -1462,13 +1480,67 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
</dl>
</li>
</ul>
+<a name="setPageTitle-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPageTitle</h4>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.985">setPageTitle</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pageTitle)</pre>
+<div class="block">Sets the page title to use on HTML views of pages.
+ <p>
+ This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageTitle--"><code>@RestResource.pageTitle()</code></a> annotation.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>pageTitle</code> - The page title text.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
+<a name="setPageText-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPageText</h4>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.998">setPageText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pageText)</pre>
+<div class="block">Sets the page text to use on HTML views of pages.
+ <p>
+ This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageText--"><code>@RestResource.pageText()</code></a> annotation.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>pageText</code> - The page text.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
+<a name="setPageLinks-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPageLinks</h4>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1011">setPageLinks</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pageLinks)</pre>
+<div class="block">Sets the page links to use on HTML views of pages.
+ <p>
+ This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageLinks--"><code>@RestResource.pageLinks()</code></a> annotation.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>pageLinks</code> - The page links.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
<a name="setLogger-java.lang.Class-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>setLogger</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.977">setLogger</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/rest/RestLogger.html" title="class in org.apache.juneau.rest">RestLogger</a>> logger)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1024">setLogger</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/rest/RestLogger.html" title="class in org.apache.juneau.rest">RestLogger</a>> logger)</pre>
<div class="block">Overrides the logger for the resource.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#logger--"><code>@RestResource.logger()</code></a> annotation.</div>
@@ -1486,7 +1558,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setLogger</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.990">setLogger</a>(<a href="../../../../org/apache/juneau/rest/RestLogger.html" title="class in org.apache.juneau.rest">RestLogger</a> logger)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1037">setLogger</a>(<a href="../../../../org/apache/juneau/rest/RestLogger.html" title="class in org.apache.juneau.rest">RestLogger</a> logger)</pre>
<div class="block">Overrides the logger for the resource.
<p>
This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#logger--"><code>@RestResource.logger()</code></a> annotation.</div>
@@ -1504,7 +1576,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setCallHandler</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1006">setCallHandler</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest">RestCallHandler</a>> restHandler)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1053">setCallHandler</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest">RestCallHandler</a>> restHandler)</pre>
<div class="block">Overrides the call handler for the resource.
<p>
The call handler is the object that handles execution of REST HTTP calls.
@@ -1525,7 +1597,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setCallHandler</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1022">setCallHandler</a>(<a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest">RestCallHandler</a> restHandler)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1069">setCallHandler</a>(<a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest">RestCallHandler</a> restHandler)</pre>
<div class="block">Overrides the call handler for the resource.
<p>
The call handler is the object that handles execution of REST HTTP calls.
@@ -1546,7 +1618,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setInfoProvider</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1038">setInfoProvider</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest">RestInfoProvider</a>> infoProvider)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1085">setInfoProvider</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest">RestInfoProvider</a>> infoProvider)</pre>
<div class="block">Overrides the info provider for the resource.
<p>
The info provider provides all the various information about a resource such as the Swagger documentation.
@@ -1567,7 +1639,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>setInfoProvider</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1054">setInfoProvider</a>(<a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest">RestInfoProvider</a> infoProvider)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1101">setInfoProvider</a>(<a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest">RestInfoProvider</a> infoProvider)</pre>
<div class="block">Overrides the info provider for the resource.
<p>
The info provider provides all the various information about a resource such as the Swagger documentation.
@@ -1588,7 +1660,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>createPropertyStore</h4>
-<pre>protected <a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1063">createPropertyStore</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1110">createPropertyStore</a>()</pre>
<div class="block">Creates a new <a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau"><code>PropertyStore</code></a> object initialized with the properties defined in this config.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1602,7 +1674,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>getConfigFile</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1086">getConfigFile</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1133">getConfigFile</a>()</pre>
<div class="block">Returns the external configuration file for this resource.
<p>
The configuration file location is determined via the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#config--"><code>@RestResource.config()</code></a> annotation on the resource.
@@ -1625,7 +1697,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>getProperties</h4>
-<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1105">getProperties</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1152">getProperties</a>()</pre>
<div class="block">Returns the configuration properties for this resource.
<p>
The configuration properties are determined via the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#properties--"><code>RestResource.properties()</code></a> annotation on the resource.
@@ -1649,7 +1721,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>getVarResolverBuilder</h4>
-<pre>public <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1125">getVarResolverBuilder</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1172">getVarResolverBuilder</a>()</pre>
<div class="block">Creates the variable resolver for this resource.
<p>
The variable resolver returned by this method can resolve the following variables:
@@ -1674,7 +1746,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>getInitParameter</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/RestConfig.html#line.1135">getInitParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</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/RestConfig.html#line.1182">getInitParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true#getInitParameter-java.lang.String-" title="class or interface in javax.servlet">getInitParameter</a></code> in interface <code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a></code></dd>
@@ -1687,7 +1759,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>getInitParameterNames</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</a><<a href="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/RestConfig.html#line.1140">getInitParameterNames</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</a><<a href="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/RestConfig.html#line.1187">getInitParameterNames</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true#getInitParameterNames--" title="class or interface in javax.servlet">getInitParameterNames</a></code> in interface <code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a></code></dd>
@@ -1700,7 +1772,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockList">
<li class="blockList">
<h4>getServletContext</h4>
-<pre>public <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletContext.html?is-external=true" title="class or interface in javax.servlet">ServletContext</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1145">getServletContext</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletContext.html?is-external=true" title="class or interface in javax.servlet">ServletContext</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1192">getServletContext</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true#getServletContext--" title="class or interface in javax.servlet">getServletContext</a></code> in interface <code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a></code></dd>
@@ -1713,7 +1785,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul class="blockListLast">
<li class="blockList">
<h4>getServletName</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/RestConfig.html#line.1150">getServletName</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RestConfig.html#line.1197">getServletName</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true#getServletName--" title="class or interface in javax.servlet">getServletName</a></code> in interface <code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a></code></dd>
[04/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/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 8045c44..ee0cb53 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,206 +20,199 @@
<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.html.HtmlDocSerializerContext.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import static org.apache.juneau.rest.RestContext.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.dto.swagger.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.html.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.jso.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.json.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.msgpack.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.plaintext.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.rest.annotation.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.soap.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.uon.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.urlencoding.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.xml.*;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Subclass of {@link RestServlet} with default serializers and parsers defined.<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> * </p><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <table class='styled'><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <tr><a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <th>Accept</th><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <th>Content-Type</th><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <th>Serializer</th><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * </tr><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <tr><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <td class='code'>application/json<br>text/json</td><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <td class='code'>application/json</td><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <td>{@link JsonSerializer}</td><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * </tr><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <tr><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <td class='code'>application/json+simple<br>text/json+simple</td><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * <td class='code'>application/json</td><a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <td>{@link org.apache.juneau.json.JsonSerializer.Simple}</td><a name="line.49"></a>
-<span class="sourceLineNo">050</span> * </tr><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <tr><a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <td class='code'>application/json+schema<br>text/json+schema</td><a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <td class='code'>application/json</td><a name="line.53"></a>
-<span class="sourceLineNo">054</span> * <td>{@link JsonSchemaSerializer}</td><a name="line.54"></a>
-<span class="sourceLineNo">055</span> * </tr><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <tr><a name="line.56"></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> * <p><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * </p><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 class='code'>text/xml</td><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * <td>{@link XmlDocSerializer}</td><a name="line.59"></a>
-<span class="sourceLineNo">060</span> * </tr><a name="line.60"></a>
-<span class="sourceLineNo">061</span> * <tr><a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <td class='code'>text/xml+schema</td><a name="line.62"></a>
-<span class="sourceLineNo">063</span> * <td class='code'>text/xml</td><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * <td>{@link XmlSchemaDocSerializer}</td><a name="line.64"></a>
-<span class="sourceLineNo">065</span> * </tr><a name="line.65"></a>
-<span class="sourceLineNo">066</span> * <tr><a name="line.66"></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 class='code'>text/html</td><a name="line.68"></a>
-<span class="sourceLineNo">069</span> * <td>{@link HtmlDocSerializer}</td><a name="line.69"></a>
-<span class="sourceLineNo">070</span> * </tr><a name="line.70"></a>
-<span class="sourceLineNo">071</span> * <tr><a name="line.71"></a>
-<span class="sourceLineNo">072</span> * <td class='code'>text/html+stripped</td><a name="line.72"></a>
-<span class="sourceLineNo">073</span> * <td class='code'>text/html</td><a name="line.73"></a>
-<span class="sourceLineNo">074</span> * <td>{@link HtmlStrippedDocSerializer}</td><a name="line.74"></a>
-<span class="sourceLineNo">075</span> * </tr><a name="line.75"></a>
-<span class="sourceLineNo">076</span> * <tr><a name="line.76"></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 class='code'>text/uon</td><a name="line.78"></a>
-<span class="sourceLineNo">079</span> * <td>{@link UonSerializer}</td><a name="line.79"></a>
-<span class="sourceLineNo">080</span> * </tr><a name="line.80"></a>
-<span class="sourceLineNo">081</span> * <tr><a name="line.81"></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 class='code'>application/x-www-form-urlencoded</td><a name="line.83"></a>
-<span class="sourceLineNo">084</span> * <td>{@link UrlEncodingSerializer}</td><a name="line.84"></a>
-<span class="sourceLineNo">085</span> * </tr><a name="line.85"></a>
-<span class="sourceLineNo">086</span> * <tr><a name="line.86"></a>
-<span class="sourceLineNo">087</span> * <td class='code'>text/xml+soap</td><a name="line.87"></a>
-<span class="sourceLineNo">088</span> * <td class='code'>text/xml</td><a name="line.88"></a>
-<span class="sourceLineNo">089</span> * <td>{@link SoapXmlSerializer}</td><a name="line.89"></a>
-<span class="sourceLineNo">090</span> * </tr><a name="line.90"></a>
-<span class="sourceLineNo">091</span> * <tr><a name="line.91"></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 class='code'>text/plain</td><a name="line.93"></a>
-<span class="sourceLineNo">094</span> * <td>{@link PlainTextSerializer}</td><a name="line.94"></a>
-<span class="sourceLineNo">095</span> * </tr><a name="line.95"></a>
-<span class="sourceLineNo">096</span> * <tr><a name="line.96"></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> * <tr><a name="line.95"></a>
+<span class="sourceLineNo">096</span> * <td class='code'>application/x-java-serialized-object</td><a name="line.96"></a>
<span class="sourceLineNo">097</span> * <td class='code'>application/x-java-serialized-object</td><a name="line.97"></a>
-<span class="sourceLineNo">098</span> * <td class='code'>application/x-java-serialized-object</td><a name="line.98"></a>
-<span class="sourceLineNo">099</span> * <td>{@link JsoSerializer}</td><a name="line.99"></a>
-<span class="sourceLineNo">100</span> * </tr><a name="line.100"></a>
-<span class="sourceLineNo">101</span> * </table><a name="line.101"></a>
-<span class="sourceLineNo">102</span> * <p><a name="line.102"></a>
-<span class="sourceLineNo">103</span> * Supports the following request <code>Content-Type</code> header values:<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * </p><a name="line.104"></a>
-<span class="sourceLineNo">105</span> * <table class='styled'><a name="line.105"></a>
-<span class="sourceLineNo">106</span> * <tr><a name="line.106"></a>
-<span class="sourceLineNo">107</span> * <th>Content-Type</th><a name="line.107"></a>
-<span class="sourceLineNo">108</span> * <th>Parser</th><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'>application/json<br>text/json</td><a name="line.111"></a>
-<span class="sourceLineNo">112</span> * <td>{@link JsonParser}</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/xml<br>application/xml</td><a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <td>{@link XmlParser}</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'>text/html<br>text/html+stripped</td><a name="line.119"></a>
-<span class="sourceLineNo">120</span> * <td>{@link HtmlParser}</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/uon</td><a name="line.123"></a>
-<span class="sourceLineNo">124</span> * <td>{@link UonParser}</td><a name="line.124"></a>
-<span class="sourceLineNo">125</span> * </tr><a name="line.125"></a>
-<span class="sourceLineNo">126</span> * <tr><a name="line.126"></a>
-<span class="sourceLineNo">127</span> * <td class='code'>application/x-www-form-urlencoded</td><a name="line.127"></a>
-<span class="sourceLineNo">128</span> * <td>{@link UrlEncodingParser}</td><a name="line.128"></a>
-<span class="sourceLineNo">129</span> * </tr><a name="line.129"></a>
-<span class="sourceLineNo">130</span> * <tr><a name="line.130"></a>
-<span class="sourceLineNo">131</span> * <td class='code'>text/plain</td><a name="line.131"></a>
-<span class="sourceLineNo">132</span> * <td>{@link PlainTextParser}</td><a name="line.132"></a>
-<span class="sourceLineNo">133</span> * </tr><a name="line.133"></a>
-<span class="sourceLineNo">134</span> * </table><a name="line.134"></a>
-<span class="sourceLineNo">135</span> * <p><a name="line.135"></a>
-<span class="sourceLineNo">136</span> * It should be noted that we do NOT add {@link JsoParser} to the list of parsers since this could<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * cause security issues. Use caution when using this particular parser as it could inadvertantly cause<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * code execution security holes.<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * <p><a name="line.139"></a>
-<span class="sourceLineNo">140</span> * The list of serializers and parsers can be appended to using the {@link RestResource#serializers() @RestResource.serializers()}<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * and {@link RestResource#parsers() @RestResource.parsers()} annotations on subclasses.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * <p><a name="line.142"></a>
-<span class="sourceLineNo">143</span> * This subclass also provides a default OPTIONS page by implementing a {@link #getOptions(RestRequest)} that returns a POJO consisting<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * of beans describing the class.<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * <img class='bordered' src='doc-files/OptionsPage.png'><a name="line.145"></a>
-<span class="sourceLineNo">146</span> * <p><a name="line.146"></a>
-<span class="sourceLineNo">147</span> * The OPTIONS page can be modified or augmented by overriding this method and providing your own data.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> *<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * <h6 class='topic'>Other Notes</h6><a name="line.149"></a>
-<span class="sourceLineNo">150</span> * <ul class='spaced-list'><a name="line.150"></a>
-<span class="sourceLineNo">151</span> * <li>Provides a default HTML stylesheet by setting {@link RestResource#stylesheet() @RestResource.stylesheet()} to <js>"styles/juneau.css"</js>.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * <li>Provides a default favicon by setting {@link RestResource#favicon() @RestResource.favicon()} to <js>"juneau.ico"</js>.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * <li>Provides a default classpath entry "htdocs" by setting {@link RestResource#staticFiles() @RestResource.staticFiles()} to <js>"{htdocs:'htdocs'}"</js>.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * This allows files inside the <code>[servletPackage].htdocs</code> package to be served up under the URL <code>/servletPath/htdocs</code>.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * </ul><a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span>@RestResource(<a name="line.157"></a>
-<span class="sourceLineNo">158</span> serializers={<a name="line.158"></a>
-<span class="sourceLineNo">159</span> HtmlDocSerializer.class, // HTML must be listed first because Internet Explore does not include text/html in their Accept header.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> HtmlStrippedDocSerializer.class,<a name="line.160"></a>
-<span class="sourceLineNo">161</span> HtmlSchemaDocSerializer.class,<a name="line.161"></a>
-<span class="sourceLineNo">162</span> JsonSerializer.class,<a name="line.162"></a>
-<span class="sourceLineNo">163</span> JsonSerializer.Simple.class,<a name="line.163"></a>
-<span class="sourceLineNo">164</span> JsonSchemaSerializer.class,<a name="line.164"></a>
-<span class="sourceLineNo">165</span> XmlDocSerializer.class,<a name="line.165"></a>
-<span class="sourceLineNo">166</span> XmlSchemaDocSerializer.class,<a name="line.166"></a>
-<span class="sourceLineNo">167</span> UonSerializer.class,<a name="line.167"></a>
-<span class="sourceLineNo">168</span> UrlEncodingSerializer.class,<a name="line.168"></a>
-<span class="sourceLineNo">169</span> MsgPackSerializer.class,<a name="line.169"></a>
-<span class="sourceLineNo">170</span> SoapXmlSerializer.class,<a name="line.170"></a>
-<span class="sourceLineNo">171</span> PlainTextSerializer.class,<a name="line.171"></a>
-<span class="sourceLineNo">172</span> JsoSerializer.class<a name="line.172"></a>
-<span class="sourceLineNo">173</span> },<a name="line.173"></a>
-<span class="sourceLineNo">174</span> parsers={<a name="line.174"></a>
-<span class="sourceLineNo">175</span> JsonParser.class,<a name="line.175"></a>
-<span class="sourceLineNo">176</span> XmlParser.class,<a name="line.176"></a>
-<span class="sourceLineNo">177</span> HtmlParser.class,<a name="line.177"></a>
-<span class="sourceLineNo">178</span> UonParser.class,<a name="line.178"></a>
-<span class="sourceLineNo">179</span> UrlEncodingParser.class,<a name="line.179"></a>
-<span class="sourceLineNo">180</span> MsgPackParser.class,<a name="line.180"></a>
-<span class="sourceLineNo">181</span> PlainTextParser.class<a name="line.181"></a>
-<span class="sourceLineNo">182</span> },<a name="line.182"></a>
-<span class="sourceLineNo">183</span> properties={<a name="line.183"></a>
-<span class="sourceLineNo">184</span> // Allow &method parameter on safe HTTP methods.<a name="line.184"></a>
-<span class="sourceLineNo">185</span> @Property(name=REST_allowMethodParam, value="OPTIONS"),<a name="line.185"></a>
-<span class="sourceLineNo">186</span> // Provide a default title on HTML pages.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> @Property(name=HTMLDOC_title, value="$R{servletTitle}"),<a name="line.187"></a>
-<span class="sourceLineNo">188</span> // Provide a default description on HTML pages.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> @Property(name=HTMLDOC_description, value="$R{servletDescription}")<a name="line.189"></a>
-<span class="sourceLineNo">190</span> },<a name="line.190"></a>
-<span class="sourceLineNo">191</span> stylesheet="styles/juneau.css",<a name="line.191"></a>
-<span class="sourceLineNo">192</span> favicon="juneau.png",<a name="line.192"></a>
-<span class="sourceLineNo">193</span> staticFiles="{htdocs:'htdocs'}"<a name="line.193"></a>
-<span class="sourceLineNo">194</span>)<a name="line.194"></a>
-<span class="sourceLineNo">195</span>public abstract class RestServletDefault extends RestServlet {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> private static final long serialVersionUID = 1L;<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> /**<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * [OPTIONS /*] - Show resource options.<a name="line.199"></a>
-<span class="sourceLineNo">200</span> *<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * @param req The HTTP request.<a name="line.201"></a>
-<span class="sourceLineNo">202</span> * @return A bean containing the contents for the OPTIONS page.<a name="line.202"></a>
-<span class="sourceLineNo">203</span> */<a name="line.203"></a>
-<span class="sourceLineNo">204</span> @RestMethod(name="OPTIONS", path="/*",<a name="line.204"></a>
-<span class="sourceLineNo">205</span> properties={<a name="line.205"></a>
-<span class="sourceLineNo">206</span> @Property(name=HTMLDOC_links, value="{back:'$R{servletURI}'}"),<a name="line.206"></a>
-<span class="sourceLineNo">207</span> @Property(name=HTMLDOC_description, value="Resource options")<a name="line.207"></a>
-<span class="sourceLineNo">208</span> },<a name="line.208"></a>
-<span class="sourceLineNo">209</span> description="Resource options"<a name="line.209"></a>
-<span class="sourceLineNo">210</span> )<a name="line.210"></a>
-<span class="sourceLineNo">211</span> public Swagger getOptions(RestRequest req) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> return req.getSwagger();<a name="line.212"></a>
-<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span>}<a name="line.214"></a>
+<span class="sourceLineNo">098</span> * <td>{@link JsoSerializer}</td><a name="line.98"></a>
+<span class="sourceLineNo">099</span> * </tr><a name="line.99"></a>
+<span class="sourceLineNo">100</span> * </table><a name="line.100"></a>
+<span class="sourceLineNo">101</span> * <p><a name="line.101"></a>
+<span class="sourceLineNo">102</span> * Supports the following request <code>Content-Type</code> header values:<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * </p><a name="line.103"></a>
+<span class="sourceLineNo">104</span> * <table class='styled'><a name="line.104"></a>
+<span class="sourceLineNo">105</span> * <tr><a name="line.105"></a>
+<span class="sourceLineNo">106</span> * <th>Content-Type</th><a name="line.106"></a>
+<span class="sourceLineNo">107</span> * <th>Parser</th><a name="line.107"></a>
+<span class="sourceLineNo">108</span> * </tr><a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <tr><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * <td class='code'>application/json<br>text/json</td><a name="line.110"></a>
+<span class="sourceLineNo">111</span> * <td>{@link JsonParser}</td><a name="line.111"></a>
+<span class="sourceLineNo">112</span> * </tr><a name="line.112"></a>
+<span class="sourceLineNo">113</span> * <tr><a name="line.113"></a>
+<span class="sourceLineNo">114</span> * <td class='code'>text/xml<br>application/xml</td><a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <td>{@link XmlParser}</td><a name="line.115"></a>
+<span class="sourceLineNo">116</span> * </tr><a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <tr><a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <td class='code'>text/html<br>text/html+stripped</td><a name="line.118"></a>
+<span class="sourceLineNo">119</span> * <td>{@link HtmlParser}</td><a name="line.119"></a>
+<span class="sourceLineNo">120</span> * </tr><a name="line.120"></a>
+<span class="sourceLineNo">121</span> * <tr><a name="line.121"></a>
+<span class="sourceLineNo">122</span> * <td class='code'>text/uon</td><a name="line.122"></a>
+<span class="sourceLineNo">123</span> * <td>{@link UonParser}</td><a name="line.123"></a>
+<span class="sourceLineNo">124</span> * </tr><a name="line.124"></a>
+<span class="sourceLineNo">125</span> * <tr><a name="line.125"></a>
+<span class="sourceLineNo">126</span> * <td class='code'>application/x-www-form-urlencoded</td><a name="line.126"></a>
+<span class="sourceLineNo">127</span> * <td>{@link UrlEncodingParser}</td><a name="line.127"></a>
+<span class="sourceLineNo">128</span> * </tr><a name="line.128"></a>
+<span class="sourceLineNo">129</span> * <tr><a name="line.129"></a>
+<span class="sourceLineNo">130</span> * <td class='code'>text/plain</td><a name="line.130"></a>
+<span class="sourceLineNo">131</span> * <td>{@link PlainTextParser}</td><a name="line.131"></a>
+<span class="sourceLineNo">132</span> * </tr><a name="line.132"></a>
+<span class="sourceLineNo">133</span> * </table><a name="line.133"></a>
+<span class="sourceLineNo">134</span> * <p><a name="line.134"></a>
+<span class="sourceLineNo">135</span> * It should be noted that we do NOT add {@link JsoParser} to the list of parsers since this could<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * cause security issues. Use caution when using this particular parser as it could inadvertantly cause<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * code execution security holes.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * <p><a name="line.138"></a>
+<span class="sourceLineNo">139</span> * The list of serializers and parsers can be appended to using the {@link RestResource#serializers() @RestResource.serializers()}<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * and {@link RestResource#parsers() @RestResource.parsers()} annotations on subclasses.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * <p><a name="line.141"></a>
+<span class="sourceLineNo">142</span> * This subclass also provides a default OPTIONS page by implementing a {@link #getOptions(RestRequest)} that returns a POJO consisting<a name="line.142"></a>
+<span class="sourceLineNo">143</span> * of beans describing the class.<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * <img class='bordered' src='doc-files/OptionsPage.png'><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>Provides a default HTML stylesheet by setting {@link RestResource#stylesheet() @RestResource.stylesheet()} to <js>"styles/juneau.css"</js>.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * <li>Provides a default favicon by setting {@link RestResource#favicon() @RestResource.favicon()} to <js>"juneau.ico"</js>.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * <li>Provides a default classpath entry "htdocs" by setting {@link RestResource#staticFiles() @RestResource.staticFiles()} to <js>"{htdocs:'htdocs'}"</js>.<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * This allows files inside the <code>[servletPackage].htdocs</code> package to be served up under the URL <code>/servletPath/htdocs</code>.<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * </ul><a name="line.154"></a>
+<span class="sourceLineNo">155</span> */<a name="line.155"></a>
+<span class="sourceLineNo">156</span>@RestResource(<a name="line.156"></a>
+<span class="sourceLineNo">157</span> serializers={<a name="line.157"></a>
+<span class="sourceLineNo">158</span> HtmlDocSerializer.class, // HTML must be listed first because Internet Explore does not include text/html in their Accept header.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> HtmlStrippedDocSerializer.class,<a name="line.159"></a>
+<span class="sourceLineNo">160</span> HtmlSchemaDocSerializer.class,<a name="line.160"></a>
+<span class="sourceLineNo">161</span> JsonSerializer.class,<a name="line.161"></a>
+<span class="sourceLineNo">162</span> JsonSerializer.Simple.class,<a name="line.162"></a>
+<span class="sourceLineNo">163</span> JsonSchemaSerializer.class,<a name="line.163"></a>
+<span class="sourceLineNo">164</span> XmlDocSerializer.class,<a name="line.164"></a>
+<span class="sourceLineNo">165</span> XmlSchemaDocSerializer.class,<a name="line.165"></a>
+<span class="sourceLineNo">166</span> UonSerializer.class,<a name="line.166"></a>
+<span class="sourceLineNo">167</span> UrlEncodingSerializer.class,<a name="line.167"></a>
+<span class="sourceLineNo">168</span> MsgPackSerializer.class,<a name="line.168"></a>
+<span class="sourceLineNo">169</span> SoapXmlSerializer.class,<a name="line.169"></a>
+<span class="sourceLineNo">170</span> PlainTextSerializer.class,<a name="line.170"></a>
+<span class="sourceLineNo">171</span> JsoSerializer.class<a name="line.171"></a>
+<span class="sourceLineNo">172</span> },<a name="line.172"></a>
+<span class="sourceLineNo">173</span> parsers={<a name="line.173"></a>
+<span class="sourceLineNo">174</span> JsonParser.class,<a name="line.174"></a>
+<span class="sourceLineNo">175</span> XmlParser.class,<a name="line.175"></a>
+<span class="sourceLineNo">176</span> HtmlParser.class,<a name="line.176"></a>
+<span class="sourceLineNo">177</span> UonParser.class,<a name="line.177"></a>
+<span class="sourceLineNo">178</span> UrlEncodingParser.class,<a name="line.178"></a>
+<span class="sourceLineNo">179</span> MsgPackParser.class,<a name="line.179"></a>
+<span class="sourceLineNo">180</span> PlainTextParser.class<a name="line.180"></a>
+<span class="sourceLineNo">181</span> },<a name="line.181"></a>
+<span class="sourceLineNo">182</span> properties={<a name="line.182"></a>
+<span class="sourceLineNo">183</span> // Allow &method parameter on safe HTTP methods.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> @Property(name=REST_allowMethodParam, value="OPTIONS"),<a name="line.184"></a>
+<span class="sourceLineNo">185</span> },<a name="line.185"></a>
+<span class="sourceLineNo">186</span> stylesheet="styles/juneau.css",<a name="line.186"></a>
+<span class="sourceLineNo">187</span> favicon="juneau.png",<a name="line.187"></a>
+<span class="sourceLineNo">188</span> staticFiles="{htdocs:'htdocs'}"<a name="line.188"></a>
+<span class="sourceLineNo">189</span>)<a name="line.189"></a>
+<span class="sourceLineNo">190</span>public abstract class RestServletDefault extends RestServlet {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> private static final long serialVersionUID = 1L;<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span> /**<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * [OPTIONS /*] - Show resource options.<a name="line.194"></a>
+<span class="sourceLineNo">195</span> *<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * @param req The HTTP request.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * @return A bean containing the contents for the OPTIONS page.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> */<a name="line.198"></a>
+<span class="sourceLineNo">199</span> @RestMethod(name="OPTIONS", path="/*",<a name="line.199"></a>
+<span class="sourceLineNo">200</span> pageLinks="{back:'$R{servletURI}'}",<a name="line.200"></a>
+<span class="sourceLineNo">201</span> summary="Resource options",<a name="line.201"></a>
+<span class="sourceLineNo">202</span> description="Description of this resource"<a name="line.202"></a>
+<span class="sourceLineNo">203</span> )<a name="line.203"></a>
+<span class="sourceLineNo">204</span> public Swagger getOptions(RestRequest req) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> return req.getSwagger();<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span>}<a name="line.207"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
index 615286d..1ea40ae 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
@@ -27,61 +27,61 @@
<span class="sourceLineNo">019</span>import javax.servlet.http.*;<a name="line.19"></a>
<span class="sourceLineNo">020</span><a name="line.20"></a>
<span class="sourceLineNo">021</span>import org.apache.juneau.internal.*;<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> * Various reusable utility methods.<a name="line.24"></a>
-<span class="sourceLineNo">025</span> */<a name="line.25"></a>
-<span class="sourceLineNo">026</span>public final class RestUtils {<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span> /**<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * Returns readable text for an HTTP response code.<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * @param rc The HTTP response code.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * @return Readable text for an HTTP response code, or <jk>null</jk> if it's an invalid code.<a name="line.32"></a>
-<span class="sourceLineNo">033</span> */<a name="line.33"></a>
-<span class="sourceLineNo">034</span> public static String getHttpResponseText(int rc) {<a name="line.34"></a>
-<span class="sourceLineNo">035</span> return httpMsgs.get(rc);<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> @SuppressWarnings("serial")<a name="line.38"></a>
-<span class="sourceLineNo">039</span> private static Map<Integer,String> httpMsgs = new HashMap<Integer,String>() {{<a name="line.39"></a>
-<span class="sourceLineNo">040</span> put(200, "OK");<a name="line.40"></a>
-<span class="sourceLineNo">041</span> put(201, "Created");<a name="line.41"></a>
-<span class="sourceLineNo">042</span> put(202, "Accepted");<a name="line.42"></a>
-<span class="sourceLineNo">043</span> put(203, "Non-Authoritative Information");<a name="line.43"></a>
-<span class="sourceLineNo">044</span> put(204, "No Content");<a name="line.44"></a>
-<span class="sourceLineNo">045</span> put(205, "Reset Content");<a name="line.45"></a>
-<span class="sourceLineNo">046</span> put(206, "Partial Content");<a name="line.46"></a>
-<span class="sourceLineNo">047</span> put(300, "Multiple Choices");<a name="line.47"></a>
-<span class="sourceLineNo">048</span> put(301, "Moved Permanently");<a name="line.48"></a>
-<span class="sourceLineNo">049</span> put(302, "Temporary Redirect");<a name="line.49"></a>
-<span class="sourceLineNo">050</span> put(303, "See Other");<a name="line.50"></a>
-<span class="sourceLineNo">051</span> put(304, "Not Modified");<a name="line.51"></a>
-<span class="sourceLineNo">052</span> put(305, "Use Proxy");<a name="line.52"></a>
-<span class="sourceLineNo">053</span> put(307, "Temporary Redirect");<a name="line.53"></a>
-<span class="sourceLineNo">054</span> put(400, "Bad Request");<a name="line.54"></a>
-<span class="sourceLineNo">055</span> put(401, "Unauthorized");<a name="line.55"></a>
-<span class="sourceLineNo">056</span> put(402, "Payment Required");<a name="line.56"></a>
-<span class="sourceLineNo">057</span> put(403, "Forbidden");<a name="line.57"></a>
-<span class="sourceLineNo">058</span> put(404, "Not Found");<a name="line.58"></a>
-<span class="sourceLineNo">059</span> put(405, "Method Not Allowed");<a name="line.59"></a>
-<span class="sourceLineNo">060</span> put(406, "Not Acceptable");<a name="line.60"></a>
-<span class="sourceLineNo">061</span> put(407, "Proxy Authentication Required");<a name="line.61"></a>
-<span class="sourceLineNo">062</span> put(408, "Request Time-Out");<a name="line.62"></a>
-<span class="sourceLineNo">063</span> put(409, "Conflict");<a name="line.63"></a>
-<span class="sourceLineNo">064</span> put(410, "Gone");<a name="line.64"></a>
-<span class="sourceLineNo">065</span> put(411, "Length Required");<a name="line.65"></a>
-<span class="sourceLineNo">066</span> put(412, "Precondition Failed");<a name="line.66"></a>
-<span class="sourceLineNo">067</span> put(413, "Request Entity Too Large");<a name="line.67"></a>
-<span class="sourceLineNo">068</span> put(414, "Request-URI Too Large");<a name="line.68"></a>
-<span class="sourceLineNo">069</span> put(415, "Unsupported Media Type");<a name="line.69"></a>
-<span class="sourceLineNo">070</span> put(500, "Internal Server Error");<a name="line.70"></a>
-<span class="sourceLineNo">071</span> put(501, "Not Implemented");<a name="line.71"></a>
-<span class="sourceLineNo">072</span> put(502, "Bad Gateway");<a name="line.72"></a>
-<span class="sourceLineNo">073</span> put(503, "Service Unavailable");<a name="line.73"></a>
-<span class="sourceLineNo">074</span> put(504, "Gateway Timeout");<a name="line.74"></a>
-<span class="sourceLineNo">075</span> put(505, "HTTP Version Not Supported");<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }};<a name="line.76"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.utils.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Various reusable utility methods.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> */<a name="line.26"></a>
+<span class="sourceLineNo">027</span>public final class RestUtils {<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> * Returns readable text for an HTTP response code.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> *<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * @param rc The HTTP response code.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * @return Readable text for an HTTP response code, or <jk>null</jk> if it's an invalid code.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> */<a name="line.34"></a>
+<span class="sourceLineNo">035</span> public static String getHttpResponseText(int rc) {<a name="line.35"></a>
+<span class="sourceLineNo">036</span> return httpMsgs.get(rc);<a name="line.36"></a>
+<span class="sourceLineNo">037</span> }<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span> private static Map<Integer,String> httpMsgs = new AMap<Integer,String>()<a name="line.39"></a>
+<span class="sourceLineNo">040</span> .append(200, "OK")<a name="line.40"></a>
+<span class="sourceLineNo">041</span> .append(201, "Created")<a name="line.41"></a>
+<span class="sourceLineNo">042</span> .append(202, "Accepted")<a name="line.42"></a>
+<span class="sourceLineNo">043</span> .append(203, "Non-Authoritative Information")<a name="line.43"></a>
+<span class="sourceLineNo">044</span> .append(204, "No Content")<a name="line.44"></a>
+<span class="sourceLineNo">045</span> .append(205, "Reset Content")<a name="line.45"></a>
+<span class="sourceLineNo">046</span> .append(206, "Partial Content")<a name="line.46"></a>
+<span class="sourceLineNo">047</span> .append(300, "Multiple Choices")<a name="line.47"></a>
+<span class="sourceLineNo">048</span> .append(301, "Moved Permanently")<a name="line.48"></a>
+<span class="sourceLineNo">049</span> .append(302, "Temporary Redirect")<a name="line.49"></a>
+<span class="sourceLineNo">050</span> .append(303, "See Other")<a name="line.50"></a>
+<span class="sourceLineNo">051</span> .append(304, "Not Modified")<a name="line.51"></a>
+<span class="sourceLineNo">052</span> .append(305, "Use Proxy")<a name="line.52"></a>
+<span class="sourceLineNo">053</span> .append(307, "Temporary Redirect")<a name="line.53"></a>
+<span class="sourceLineNo">054</span> .append(400, "Bad Request")<a name="line.54"></a>
+<span class="sourceLineNo">055</span> .append(401, "Unauthorized")<a name="line.55"></a>
+<span class="sourceLineNo">056</span> .append(402, "Payment Required")<a name="line.56"></a>
+<span class="sourceLineNo">057</span> .append(403, "Forbidden")<a name="line.57"></a>
+<span class="sourceLineNo">058</span> .append(404, "Not Found")<a name="line.58"></a>
+<span class="sourceLineNo">059</span> .append(405, "Method Not Allowed")<a name="line.59"></a>
+<span class="sourceLineNo">060</span> .append(406, "Not Acceptable")<a name="line.60"></a>
+<span class="sourceLineNo">061</span> .append(407, "Proxy Authentication Required")<a name="line.61"></a>
+<span class="sourceLineNo">062</span> .append(408, "Request Time-Out")<a name="line.62"></a>
+<span class="sourceLineNo">063</span> .append(409, "Conflict")<a name="line.63"></a>
+<span class="sourceLineNo">064</span> .append(410, "Gone")<a name="line.64"></a>
+<span class="sourceLineNo">065</span> .append(411, "Length Required")<a name="line.65"></a>
+<span class="sourceLineNo">066</span> .append(412, "Precondition Failed")<a name="line.66"></a>
+<span class="sourceLineNo">067</span> .append(413, "Request Entity Too Large")<a name="line.67"></a>
+<span class="sourceLineNo">068</span> .append(414, "Request-URI Too Large")<a name="line.68"></a>
+<span class="sourceLineNo">069</span> .append(415, "Unsupported Media Type")<a name="line.69"></a>
+<span class="sourceLineNo">070</span> .append(500, "Internal Server Error")<a name="line.70"></a>
+<span class="sourceLineNo">071</span> .append(501, "Not Implemented")<a name="line.71"></a>
+<span class="sourceLineNo">072</span> .append(502, "Bad Gateway")<a name="line.72"></a>
+<span class="sourceLineNo">073</span> .append(503, "Service Unavailable")<a name="line.73"></a>
+<span class="sourceLineNo">074</span> .append(504, "Gateway Timeout")<a name="line.74"></a>
+<span class="sourceLineNo">075</span> .append(505, "HTTP Version Not Supported")<a name="line.75"></a>
+<span class="sourceLineNo">076</span> ;<a name="line.76"></a>
<span class="sourceLineNo">077</span><a name="line.77"></a>
<span class="sourceLineNo">078</span> /**<a name="line.78"></a>
<span class="sourceLineNo">079</span> * Trims <js>'/'</js> characters from both the start and end of the specified string.<a name="line.79"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Path.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Path.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Path.html
index 59a5549..80d5d4f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Path.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Path.html
@@ -64,20 +64,29 @@
<span class="sourceLineNo">056</span> * ...<a name="line.56"></a>
<span class="sourceLineNo">057</span> * }<a name="line.57"></a>
<span class="sourceLineNo">058</span> * </p><a name="line.58"></a>
-<span class="sourceLineNo">059</span> */<a name="line.59"></a>
-<span class="sourceLineNo">060</span>@Documented<a name="line.60"></a>
-<span class="sourceLineNo">061</span>@Target(PARAMETER)<a name="line.61"></a>
-<span class="sourceLineNo">062</span>@Retention(RUNTIME)<a name="line.62"></a>
-<span class="sourceLineNo">063</span>@Inherited<a name="line.63"></a>
-<span class="sourceLineNo">064</span>public @interface Path {<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span> /**<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * URL variable name.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * <p><a name="line.68"></a>
-<span class="sourceLineNo">069</span> * Optional if the attributes are specified in the same order as in the URL path pattern.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> */<a name="line.70"></a>
-<span class="sourceLineNo">071</span> String value() default "";<a name="line.71"></a>
-<span class="sourceLineNo">072</span>}<a name="line.72"></a>
+<span class="sourceLineNo">059</span> * You can also use <code>{#}</code> notation to specify path parameters without specifying names.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * <p><a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <p class='bcode'><a name="line.61"></a>
+<span class="sourceLineNo">062</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{0}/{1}/{2}/*"</js>)<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * <jk>public void</jk> doGet(RestRequest req, RestResponse res,<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * <ja>@Path</ja> String foo, <ja>@Path</ja> <jk>int</jk> bar, <ja>@Path</ja> UUID baz) {<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * ...<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * }<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * </p><a name="line.67"></a>
+<span class="sourceLineNo">068</span> */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>@Documented<a name="line.69"></a>
+<span class="sourceLineNo">070</span>@Target(PARAMETER)<a name="line.70"></a>
+<span class="sourceLineNo">071</span>@Retention(RUNTIME)<a name="line.71"></a>
+<span class="sourceLineNo">072</span>@Inherited<a name="line.72"></a>
+<span class="sourceLineNo">073</span>public @interface Path {<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> /**<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * URL variable name.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * <p><a name="line.77"></a>
+<span class="sourceLineNo">078</span> * Optional if the attributes are specified in the same order as in the URL path pattern.<a name="line.78"></a>
+<span class="sourceLineNo">079</span> */<a name="line.79"></a>
+<span class="sourceLineNo">080</span> String value() default "";<a name="line.80"></a>
+<span class="sourceLineNo">081</span>}<a name="line.81"></a>
[24/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html
index 54afe32..a41172b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html
@@ -217,11 +217,11 @@
<span class="sourceLineNo">209</span><a name="line.209"></a>
<span class="sourceLineNo">210</span> } else if (typeName.equals("array")) {<a name="line.210"></a>
<span class="sourceLineNo">211</span> if (sType.isObject())<a name="line.211"></a>
-<span class="sourceLineNo">212</span> o = parseTableIntoCollection(session, r, (Collection)new ObjectList(session), sType.getElementType(), pMeta);<a name="line.212"></a>
+<span class="sourceLineNo">212</span> o = parseTableIntoCollection(session, r, (Collection)new ObjectList(session), sType, pMeta);<a name="line.212"></a>
<span class="sourceLineNo">213</span> else if (sType.isCollection())<a name="line.213"></a>
-<span class="sourceLineNo">214</span> o = parseTableIntoCollection(session, r, (Collection)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new ObjectList(session)), sType.getElementType(), pMeta);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> else if (sType.isArray()) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> ArrayList l = (ArrayList)parseTableIntoCollection(session, r, new ArrayList(), sType.getElementType(), pMeta);<a name="line.216"></a>
+<span class="sourceLineNo">214</span> o = parseTableIntoCollection(session, r, (Collection)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new ObjectList(session)), sType, pMeta);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> else if (sType.isArray() || sType.isArgs()) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> ArrayList l = (ArrayList)parseTableIntoCollection(session, r, new ArrayList(), sType, pMeta);<a name="line.216"></a>
<span class="sourceLineNo">217</span> o = session.toArray(sType, l);<a name="line.217"></a>
<span class="sourceLineNo">218</span> }<a name="line.218"></a>
<span class="sourceLineNo">219</span> else<a name="line.219"></a>
@@ -239,11 +239,11 @@
<span class="sourceLineNo">231</span> sType = eType = cm;<a name="line.231"></a>
<span class="sourceLineNo">232</span><a name="line.232"></a>
<span class="sourceLineNo">233</span> if (sType.isObject())<a name="line.233"></a>
-<span class="sourceLineNo">234</span> o = parseIntoCollection(session, r, (Collection)new ObjectList(session), sType.getElementType(), pMeta);<a name="line.234"></a>
+<span class="sourceLineNo">234</span> o = parseIntoCollection(session, r, new ObjectList(session), sType, pMeta);<a name="line.234"></a>
<span class="sourceLineNo">235</span> else if (sType.isCollection() || sType.isObject())<a name="line.235"></a>
-<span class="sourceLineNo">236</span> o = parseIntoCollection(session, r, (Collection)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new ObjectList(session)), sType.getElementType(), pMeta);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> else if (sType.isArray())<a name="line.237"></a>
-<span class="sourceLineNo">238</span> o = session.toArray(sType, parseIntoCollection(session, r, new ArrayList(), sType.getElementType(), pMeta));<a name="line.238"></a>
+<span class="sourceLineNo">236</span> o = parseIntoCollection(session, r, (Collection)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new ObjectList(session)), sType, pMeta);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> else if (sType.isArray() || sType.isArgs())<a name="line.237"></a>
+<span class="sourceLineNo">238</span> o = session.toArray(sType, parseIntoCollection(session, r, new ArrayList(), sType, pMeta));<a name="line.238"></a>
<span class="sourceLineNo">239</span> else<a name="line.239"></a>
<span class="sourceLineNo">240</span> isValid = false;<a name="line.240"></a>
<span class="sourceLineNo">241</span> skipTag(r, xUL);<a name="line.241"></a>
@@ -348,270 +348,242 @@
<span class="sourceLineNo">340</span> * Precondition: Must be pointing at event following <ul> event.<a name="line.340"></a>
<span class="sourceLineNo">341</span> * Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.<a name="line.341"></a>
<span class="sourceLineNo">342</span> */<a name="line.342"></a>
-<span class="sourceLineNo">343</span> private <E> Collection<E> parseIntoCollection(HtmlParserSession session, XMLStreamReader r, Collection<E> l, ClassMeta<E> elementType, BeanPropertyMeta pMeta) throws Exception {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> while (true) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> HtmlTag tag = nextTag(r, LI, xUL);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (tag == xUL)<a name="line.346"></a>
-<span class="sourceLineNo">347</span> break;<a name="line.347"></a>
-<span class="sourceLineNo">348</span> l.add(parseAnything(session, elementType, r, l, false, pMeta));<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return l;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> /*<a name="line.353"></a>
-<span class="sourceLineNo">354</span> * Reads contents of <ul> element into an Object array.<a name="line.354"></a>
-<span class="sourceLineNo">355</span> * Precondition: Must be pointing at event following <ul> event.<a name="line.355"></a>
-<span class="sourceLineNo">356</span> * Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.<a name="line.356"></a>
-<span class="sourceLineNo">357</span> */<a name="line.357"></a>
-<span class="sourceLineNo">358</span> private Object[] parseArgs(HtmlParserSession session, XMLStreamReader r, ClassMeta<?>[] argTypes) throws Exception {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> HtmlTag tag = HtmlTag.forEvent(r);<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> // Special case:<a name="line.361"></a>
-<span class="sourceLineNo">362</span> // Serializing args containing a single bean (or multiple beans of the same type) will end up serialized as a <table _type='array'><a name="line.362"></a>
-<span class="sourceLineNo">363</span> if (tag == TABLE) {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> List<Object> l = (List<Object>)parseAnything(session, session.getClassMeta(List.class, argTypes[0]), r, session.getOuter(), true, null);<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return l.toArray(new Object[l.size()]);<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> Object[] o = new Object[argTypes.length];<a name="line.368"></a>
-<span class="sourceLineNo">369</span> int i = 0;<a name="line.369"></a>
-<span class="sourceLineNo">370</span> while (true) {<a name="line.370"></a>
-<span class="sourceLineNo">371</span> tag = nextTag(r, LI, xUL);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> if (tag == xUL)<a name="line.372"></a>
-<span class="sourceLineNo">373</span> break;<a name="line.373"></a>
-<span class="sourceLineNo">374</span> o[i] = parseAnything(session, argTypes[i], r, session.getOuter(), false, null);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> i++;<a name="line.375"></a>
-<span class="sourceLineNo">376</span> }<a name="line.376"></a>
-<span class="sourceLineNo">377</span> return o;<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> /*<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Reads contents of <ul> element.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * Precondition: Must be pointing at event following <ul> event.<a name="line.382"></a>
-<span class="sourceLineNo">383</span> * Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.<a name="line.383"></a>
-<span class="sourceLineNo">384</span> */<a name="line.384"></a>
-<span class="sourceLineNo">385</span> private <E> Collection<E> parseTableIntoCollection(HtmlParserSession session, XMLStreamReader r, Collection<E> l, ClassMeta<E> elementType, BeanPropertyMeta pMeta) throws Exception {<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> if (elementType == null)<a name="line.387"></a>
-<span class="sourceLineNo">388</span> elementType = (ClassMeta<E>)object();<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span> HtmlTag tag = nextTag(r, TR);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> List<String> keys = new ArrayList<String>();<a name="line.391"></a>
-<span class="sourceLineNo">392</span> while (true) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> tag = nextTag(r, TH, xTR);<a name="line.393"></a>
-<span class="sourceLineNo">394</span> if (tag == xTR)<a name="line.394"></a>
-<span class="sourceLineNo">395</span> break;<a name="line.395"></a>
-<span class="sourceLineNo">396</span> keys.add(session.getElementText(r));<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span> while (true) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> r.nextTag();<a name="line.400"></a>
-<span class="sourceLineNo">401</span> tag = HtmlTag.forEvent(r);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> if (tag == xTABLE)<a name="line.402"></a>
-<span class="sourceLineNo">403</span> break;<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span> String type = getAttribute(r, session.getBeanTypePropertyName(), null);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> ClassMeta elementType2 = session.getClassMeta(type, pMeta, null);<a name="line.406"></a>
-<span class="sourceLineNo">407</span> if (elementType2 != null)<a name="line.407"></a>
-<span class="sourceLineNo">408</span> elementType = elementType2;<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> if (elementType.canCreateNewBean(l)) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> BeanMap m = session.newBeanMap(l, elementType.getInnerClass());<a name="line.411"></a>
-<span class="sourceLineNo">412</span> for (int i = 0; i < keys.size(); i++) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> tag = nextTag(r, TD, NULL);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> if (tag == NULL) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> m = null;<a name="line.415"></a>
-<span class="sourceLineNo">416</span> nextTag(r, xNULL);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> break;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span> String key = keys.get(i);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> BeanMapEntry e = m.getProperty(key);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> if (e == null) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> //onUnknownProperty(key, m, -1, -1);<a name="line.422"></a>
-<span class="sourceLineNo">423</span> parseAnything(session, object(), r, l, false, null);<a name="line.423"></a>
-<span class="sourceLineNo">424</span> } else {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> BeanPropertyMeta bpm = e.getMeta();<a name="line.425"></a>
-<span class="sourceLineNo">426</span> ClassMeta<?> cm = bpm.getClassMeta();<a name="line.426"></a>
-<span class="sourceLineNo">427</span> Object value = parseAnything(session, cm, r, m.getBean(false), false, bpm);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> setName(cm, value, key);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> bpm.set(m, value);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> l.add(m == null ? null : (E)m.getBean());<a name="line.432"></a>
-<span class="sourceLineNo">433</span> } else {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> String c = getAttributes(r).get(session.getBeanTypePropertyName());<a name="line.434"></a>
-<span class="sourceLineNo">435</span> Map m = (Map)(elementType.isMap() && elementType.canCreateNewInstance(l) ? elementType.newInstance(l) : new ObjectMap(session));<a name="line.435"></a>
-<span class="sourceLineNo">436</span> for (int i = 0; i < keys.size(); i++) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> tag = nextTag(r, TD, NULL);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> if (tag == NULL) {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> m = null;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> nextTag(r, xNULL);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> break;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span> String key = keys.get(i);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> if (m != null) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> ClassMeta<?> kt = elementType.getKeyType(), vt = elementType.getValueType();<a name="line.445"></a>
-<span class="sourceLineNo">446</span> Object value = parseAnything(session, vt, r, l, false, pMeta);<a name="line.446"></a>
-<span class="sourceLineNo">447</span> setName(vt, value, key);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> m.put(session.convertToType(key, kt), value);<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span> if (m != null && c != null) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> ObjectMap m2 = (m instanceof ObjectMap ? (ObjectMap)m : new ObjectMap(m).setBeanSession(session));<a name="line.452"></a>
-<span class="sourceLineNo">453</span> m2.put(session.getBeanTypePropertyName(), c);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> l.add((E)session.cast(m2, pMeta, null));<a name="line.454"></a>
-<span class="sourceLineNo">455</span> } else {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> l.add((E)m);<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span> nextTag(r, xTR);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> }<a name="line.460"></a>
-<span class="sourceLineNo">461</span> return l;<a name="line.461"></a>
-<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span> /*<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * Reads contents of <table> element.<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * Precondition: Must be pointing at event following <table> event.<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.<a name="line.467"></a>
-<span class="sourceLineNo">468</span> */<a name="line.468"></a>
-<span class="sourceLineNo">469</span> private <T> BeanMap<T> parseIntoBean(HtmlParserSession session, XMLStreamReader r, BeanMap<T> m) throws Exception {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> while (true) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span> HtmlTag tag = nextTag(r, TR, xTABLE);<a name="line.471"></a>
-<span class="sourceLineNo">472</span> if (tag == xTABLE)<a name="line.472"></a>
-<span class="sourceLineNo">473</span> break;<a name="line.473"></a>
-<span class="sourceLineNo">474</span> tag = nextTag(r, TD, TH);<a name="line.474"></a>
-<span class="sourceLineNo">475</span> // Skip over the column headers.<a name="line.475"></a>
-<span class="sourceLineNo">476</span> if (tag == TH) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> skipTag(r);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> r.nextTag();<a name="line.478"></a>
-<span class="sourceLineNo">479</span> skipTag(r);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> } else {<a name="line.480"></a>
-<span class="sourceLineNo">481</span> String key = session.getElementText(r);<a name="line.481"></a>
-<span class="sourceLineNo">482</span> nextTag(r, TD);<a name="line.482"></a>
-<span class="sourceLineNo">483</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> if (pMeta == null) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> parseAnything(session, object(), r, null, false, null);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> } else {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.488"></a>
-<span class="sourceLineNo">489</span> Object value = parseAnything(session, cm, r, m.getBean(false), false, pMeta);<a name="line.489"></a>
-<span class="sourceLineNo">490</span> setName(cm, value, key);<a name="line.490"></a>
-<span class="sourceLineNo">491</span> pMeta.set(m, value);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span> nextTag(r, xTR);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span> return m;<a name="line.496"></a>
-<span class="sourceLineNo">497</span> }<a name="line.497"></a>
+<span class="sourceLineNo">343</span> private <E> Collection<E> parseIntoCollection(HtmlParserSession session, XMLStreamReader r, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> int argIndex = 0;<a name="line.344"></a>
+<span class="sourceLineNo">345</span> while (true) {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> HtmlTag tag = nextTag(r, LI, xUL);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> if (tag == xUL)<a name="line.347"></a>
+<span class="sourceLineNo">348</span> break;<a name="line.348"></a>
+<span class="sourceLineNo">349</span> ClassMeta<?> elementType = type.isArgs() ? type.getArg(argIndex++) : type.getElementType();<a name="line.349"></a>
+<span class="sourceLineNo">350</span> l.add((E)parseAnything(session, elementType, r, l, false, pMeta));<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
+<span class="sourceLineNo">352</span> return l;<a name="line.352"></a>
+<span class="sourceLineNo">353</span> }<a name="line.353"></a>
+<span class="sourceLineNo">354</span><a name="line.354"></a>
+<span class="sourceLineNo">355</span> /*<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * Reads contents of <ul> element.<a name="line.356"></a>
+<span class="sourceLineNo">357</span> * Precondition: Must be pointing at event following <ul> event.<a name="line.357"></a>
+<span class="sourceLineNo">358</span> * Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.<a name="line.358"></a>
+<span class="sourceLineNo">359</span> */<a name="line.359"></a>
+<span class="sourceLineNo">360</span> private <E> Collection<E> parseTableIntoCollection(HtmlParserSession session, XMLStreamReader r, Collection<E> l, ClassMeta<E> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span> HtmlTag tag = nextTag(r, TR);<a name="line.362"></a>
+<span class="sourceLineNo">363</span> List<String> keys = new ArrayList<String>();<a name="line.363"></a>
+<span class="sourceLineNo">364</span> while (true) {<a name="line.364"></a>
+<span class="sourceLineNo">365</span> tag = nextTag(r, TH, xTR);<a name="line.365"></a>
+<span class="sourceLineNo">366</span> if (tag == xTR)<a name="line.366"></a>
+<span class="sourceLineNo">367</span> break;<a name="line.367"></a>
+<span class="sourceLineNo">368</span> keys.add(session.getElementText(r));<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> int argIndex = 0;<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span> while (true) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> r.nextTag();<a name="line.374"></a>
+<span class="sourceLineNo">375</span> tag = HtmlTag.forEvent(r);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> if (tag == xTABLE)<a name="line.376"></a>
+<span class="sourceLineNo">377</span> break;<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> ClassMeta elementType = null;<a name="line.379"></a>
+<span class="sourceLineNo">380</span> String beanType = getAttribute(r, session.getBeanTypePropertyName(), null);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> if (beanType != null)<a name="line.381"></a>
+<span class="sourceLineNo">382</span> elementType = session.getClassMeta(beanType, pMeta, null);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (elementType == null)<a name="line.383"></a>
+<span class="sourceLineNo">384</span> elementType = type.isArgs() ? type.getArg(argIndex++) : type.getElementType();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (elementType == null)<a name="line.385"></a>
+<span class="sourceLineNo">386</span> elementType = session.object();<a name="line.386"></a>
+<span class="sourceLineNo">387</span><a name="line.387"></a>
+<span class="sourceLineNo">388</span> if (elementType.canCreateNewBean(l)) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> BeanMap m = session.newBeanMap(l, elementType.getInnerClass());<a name="line.389"></a>
+<span class="sourceLineNo">390</span> for (int i = 0; i < keys.size(); i++) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> tag = nextTag(r, TD, NULL);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> if (tag == NULL) {<a name="line.392"></a>
+<span class="sourceLineNo">393</span> m = null;<a name="line.393"></a>
+<span class="sourceLineNo">394</span> nextTag(r, xNULL);<a name="line.394"></a>
+<span class="sourceLineNo">395</span> break;<a name="line.395"></a>
+<span class="sourceLineNo">396</span> }<a name="line.396"></a>
+<span class="sourceLineNo">397</span> String key = keys.get(i);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> BeanMapEntry e = m.getProperty(key);<a name="line.398"></a>
+<span class="sourceLineNo">399</span> if (e == null) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> //onUnknownProperty(key, m, -1, -1);<a name="line.400"></a>
+<span class="sourceLineNo">401</span> parseAnything(session, object(), r, l, false, null);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> } else {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> BeanPropertyMeta bpm = e.getMeta();<a name="line.403"></a>
+<span class="sourceLineNo">404</span> ClassMeta<?> cm = bpm.getClassMeta();<a name="line.404"></a>
+<span class="sourceLineNo">405</span> Object value = parseAnything(session, cm, r, m.getBean(false), false, bpm);<a name="line.405"></a>
+<span class="sourceLineNo">406</span> setName(cm, value, key);<a name="line.406"></a>
+<span class="sourceLineNo">407</span> bpm.set(m, value);<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span> }<a name="line.409"></a>
+<span class="sourceLineNo">410</span> l.add(m == null ? null : (E)m.getBean());<a name="line.410"></a>
+<span class="sourceLineNo">411</span> } else {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> String c = getAttributes(r).get(session.getBeanTypePropertyName());<a name="line.412"></a>
+<span class="sourceLineNo">413</span> Map m = (Map)(elementType.isMap() && elementType.canCreateNewInstance(l) ? elementType.newInstance(l) : new ObjectMap(session));<a name="line.413"></a>
+<span class="sourceLineNo">414</span> for (int i = 0; i < keys.size(); i++) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> tag = nextTag(r, TD, NULL);<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (tag == NULL) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> m = null;<a name="line.417"></a>
+<span class="sourceLineNo">418</span> nextTag(r, xNULL);<a name="line.418"></a>
+<span class="sourceLineNo">419</span> break;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span> String key = keys.get(i);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> if (m != null) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> ClassMeta<?> kt = elementType.getKeyType(), vt = elementType.getValueType();<a name="line.423"></a>
+<span class="sourceLineNo">424</span> Object value = parseAnything(session, vt, r, l, false, pMeta);<a name="line.424"></a>
+<span class="sourceLineNo">425</span> setName(vt, value, key);<a name="line.425"></a>
+<span class="sourceLineNo">426</span> m.put(session.convertToType(key, kt), value);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> }<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span> if (m != null && c != null) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> ObjectMap m2 = (m instanceof ObjectMap ? (ObjectMap)m : new ObjectMap(m).setBeanSession(session));<a name="line.430"></a>
+<span class="sourceLineNo">431</span> m2.put(session.getBeanTypePropertyName(), c);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> l.add((E)session.cast(m2, pMeta, null));<a name="line.432"></a>
+<span class="sourceLineNo">433</span> } else {<a name="line.433"></a>
+<span class="sourceLineNo">434</span> l.add((E)m);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> }<a name="line.436"></a>
+<span class="sourceLineNo">437</span> nextTag(r, xTR);<a name="line.437"></a>
+<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">439</span> return l;<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span> /*<a name="line.442"></a>
+<span class="sourceLineNo">443</span> * Reads contents of <table> element.<a name="line.443"></a>
+<span class="sourceLineNo">444</span> * Precondition: Must be pointing at event following <table> event.<a name="line.444"></a>
+<span class="sourceLineNo">445</span> * Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.<a name="line.445"></a>
+<span class="sourceLineNo">446</span> */<a name="line.446"></a>
+<span class="sourceLineNo">447</span> private <T> BeanMap<T> parseIntoBean(HtmlParserSession session, XMLStreamReader r, BeanMap<T> m) throws Exception {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> while (true) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> HtmlTag tag = nextTag(r, TR, xTABLE);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (tag == xTABLE)<a name="line.450"></a>
+<span class="sourceLineNo">451</span> break;<a name="line.451"></a>
+<span class="sourceLineNo">452</span> tag = nextTag(r, TD, TH);<a name="line.452"></a>
+<span class="sourceLineNo">453</span> // Skip over the column headers.<a name="line.453"></a>
+<span class="sourceLineNo">454</span> if (tag == TH) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> skipTag(r);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> r.nextTag();<a name="line.456"></a>
+<span class="sourceLineNo">457</span> skipTag(r);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> } else {<a name="line.458"></a>
+<span class="sourceLineNo">459</span> String key = session.getElementText(r);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> nextTag(r, TD);<a name="line.460"></a>
+<span class="sourceLineNo">461</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> if (pMeta == null) {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.463"></a>
+<span class="sourceLineNo">464</span> parseAnything(session, object(), r, null, false, null);<a name="line.464"></a>
+<span class="sourceLineNo">465</span> } else {<a name="line.465"></a>
+<span class="sourceLineNo">466</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.466"></a>
+<span class="sourceLineNo">467</span> Object value = parseAnything(session, cm, r, m.getBean(false), false, pMeta);<a name="line.467"></a>
+<span class="sourceLineNo">468</span> setName(cm, value, key);<a name="line.468"></a>
+<span class="sourceLineNo">469</span> pMeta.set(m, value);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> }<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span> nextTag(r, xTR);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
+<span class="sourceLineNo">474</span> return m;<a name="line.474"></a>
+<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">477</span> /*<a name="line.477"></a>
+<span class="sourceLineNo">478</span> * Reads the next tag. Advances past anything that's not a start or end tag. Throws an exception if<a name="line.478"></a>
+<span class="sourceLineNo">479</span> * it's not one of the expected tags.<a name="line.479"></a>
+<span class="sourceLineNo">480</span> * Precondition: Must be pointing before the event we want to parse.<a name="line.480"></a>
+<span class="sourceLineNo">481</span> * Postcondition: Pointing at the tag just parsed.<a name="line.481"></a>
+<span class="sourceLineNo">482</span> */<a name="line.482"></a>
+<span class="sourceLineNo">483</span> private static HtmlTag nextTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> int et = r.next();<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span> while (et != START_ELEMENT && et != END_ELEMENT && et != END_DOCUMENT)<a name="line.486"></a>
+<span class="sourceLineNo">487</span> et = r.next();<a name="line.487"></a>
+<span class="sourceLineNo">488</span><a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (et == END_DOCUMENT)<a name="line.489"></a>
+<span class="sourceLineNo">490</span> throw new XMLStreamException("Unexpected end of document: " + r.getLocation());<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span> HtmlTag tag = HtmlTag.forEvent(r);<a name="line.492"></a>
+<span class="sourceLineNo">493</span> if (expected.length == 0)<a name="line.493"></a>
+<span class="sourceLineNo">494</span> return tag;<a name="line.494"></a>
+<span class="sourceLineNo">495</span> for (HtmlTag t : expected)<a name="line.495"></a>
+<span class="sourceLineNo">496</span> if (t == tag)<a name="line.496"></a>
+<span class="sourceLineNo">497</span> return tag;<a name="line.497"></a>
<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span> /*<a name="line.499"></a>
-<span class="sourceLineNo">500</span> * Reads the next tag. Advances past anything that's not a start or end tag. Throws an exception if<a name="line.500"></a>
-<span class="sourceLineNo">501</span> * it's not one of the expected tags.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> * Precondition: Must be pointing before the event we want to parse.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> * Postcondition: Pointing at the tag just parsed.<a name="line.503"></a>
-<span class="sourceLineNo">504</span> */<a name="line.504"></a>
-<span class="sourceLineNo">505</span> private static HtmlTag nextTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {<a name="line.505"></a>
-<span class="sourceLineNo">506</span> int et = r.next();<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> while (et != START_ELEMENT && et != END_ELEMENT && et != END_DOCUMENT)<a name="line.508"></a>
-<span class="sourceLineNo">509</span> et = r.next();<a name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span> if (et == END_DOCUMENT)<a name="line.511"></a>
-<span class="sourceLineNo">512</span> throw new XMLStreamException("Unexpected end of document: " + r.getLocation());<a name="line.512"></a>
+<span class="sourceLineNo">499</span> throw new XMLStreamException("Unexpected tag: " + tag + ". Expected one of the following: " + JsonSerializer.DEFAULT.toString(expected), r.getLocation());<a name="line.499"></a>
+<span class="sourceLineNo">500</span> }<a name="line.500"></a>
+<span class="sourceLineNo">501</span><a name="line.501"></a>
+<span class="sourceLineNo">502</span> /**<a name="line.502"></a>
+<span class="sourceLineNo">503</span> * Skips over the current element and advances to the next element.<a name="line.503"></a>
+<span class="sourceLineNo">504</span> * <p><a name="line.504"></a>
+<span class="sourceLineNo">505</span> * Precondition: Pointing to opening tag.<a name="line.505"></a>
+<span class="sourceLineNo">506</span> * Postcondition: Pointing to next opening tag.<a name="line.506"></a>
+<span class="sourceLineNo">507</span> *<a name="line.507"></a>
+<span class="sourceLineNo">508</span> * @param r The stream being read from.<a name="line.508"></a>
+<span class="sourceLineNo">509</span> * @throws XMLStreamException<a name="line.509"></a>
+<span class="sourceLineNo">510</span> */<a name="line.510"></a>
+<span class="sourceLineNo">511</span> private static void skipTag(XMLStreamReader r) throws XMLStreamException {<a name="line.511"></a>
+<span class="sourceLineNo">512</span> int et = r.getEventType();<a name="line.512"></a>
<span class="sourceLineNo">513</span><a name="line.513"></a>
-<span class="sourceLineNo">514</span> HtmlTag tag = HtmlTag.forEvent(r);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> if (expected.length == 0)<a name="line.515"></a>
-<span class="sourceLineNo">516</span> return tag;<a name="line.516"></a>
-<span class="sourceLineNo">517</span> for (HtmlTag t : expected)<a name="line.517"></a>
-<span class="sourceLineNo">518</span> if (t == tag)<a name="line.518"></a>
-<span class="sourceLineNo">519</span> return tag;<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span> throw new XMLStreamException("Unexpected tag: " + tag + ". Expected one of the following: " + JsonSerializer.DEFAULT.toString(expected), r.getLocation());<a name="line.521"></a>
-<span class="sourceLineNo">522</span> }<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span> /**<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * Skips over the current element and advances to the next element.<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * <p><a name="line.526"></a>
-<span class="sourceLineNo">527</span> * Precondition: Pointing to opening tag.<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * Postcondition: Pointing to next opening tag.<a name="line.528"></a>
-<span class="sourceLineNo">529</span> *<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * @param r The stream being read from.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * @throws XMLStreamException<a name="line.531"></a>
-<span class="sourceLineNo">532</span> */<a name="line.532"></a>
-<span class="sourceLineNo">533</span> private static void skipTag(XMLStreamReader r) throws XMLStreamException {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> int et = r.getEventType();<a name="line.534"></a>
+<span class="sourceLineNo">514</span> if (et != START_ELEMENT)<a name="line.514"></a>
+<span class="sourceLineNo">515</span> throw new XMLStreamException("skipToNextTag() call on invalid event ["+XmlUtils.toReadableEvent(r)+"]. Must only be called on START_ELEMENT events.");<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span> String n = r.getLocalName();<a name="line.517"></a>
+<span class="sourceLineNo">518</span><a name="line.518"></a>
+<span class="sourceLineNo">519</span> int depth = 0;<a name="line.519"></a>
+<span class="sourceLineNo">520</span> while (true) {<a name="line.520"></a>
+<span class="sourceLineNo">521</span> et = r.next();<a name="line.521"></a>
+<span class="sourceLineNo">522</span> if (et == START_ELEMENT) {<a name="line.522"></a>
+<span class="sourceLineNo">523</span> String n2 = r.getLocalName();<a name="line.523"></a>
+<span class="sourceLineNo">524</span> if (n.equals(n2))<a name="line.524"></a>
+<span class="sourceLineNo">525</span> depth++;<a name="line.525"></a>
+<span class="sourceLineNo">526</span> } else if (et == END_ELEMENT) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span> String n2 = r.getLocalName();<a name="line.527"></a>
+<span class="sourceLineNo">528</span> if (n.equals(n2))<a name="line.528"></a>
+<span class="sourceLineNo">529</span> depth--;<a name="line.529"></a>
+<span class="sourceLineNo">530</span> if (depth < 0)<a name="line.530"></a>
+<span class="sourceLineNo">531</span> return;<a name="line.531"></a>
+<span class="sourceLineNo">532</span> }<a name="line.532"></a>
+<span class="sourceLineNo">533</span> }<a name="line.533"></a>
+<span class="sourceLineNo">534</span> }<a name="line.534"></a>
<span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span> if (et != START_ELEMENT)<a name="line.536"></a>
-<span class="sourceLineNo">537</span> throw new XMLStreamException("skipToNextTag() call on invalid event ["+XmlUtils.toReadableEvent(r)+"]. Must only be called on START_ELEMENT events.");<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> String n = r.getLocalName();<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> int depth = 0;<a name="line.541"></a>
-<span class="sourceLineNo">542</span> while (true) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span> et = r.next();<a name="line.543"></a>
-<span class="sourceLineNo">544</span> if (et == START_ELEMENT) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span> String n2 = r.getLocalName();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (n.equals(n2))<a name="line.546"></a>
-<span class="sourceLineNo">547</span> depth++;<a name="line.547"></a>
-<span class="sourceLineNo">548</span> } else if (et == END_ELEMENT) {<a name="line.548"></a>
-<span class="sourceLineNo">549</span> String n2 = r.getLocalName();<a name="line.549"></a>
-<span class="sourceLineNo">550</span> if (n.equals(n2))<a name="line.550"></a>
-<span class="sourceLineNo">551</span> depth--;<a name="line.551"></a>
-<span class="sourceLineNo">552</span> if (depth < 0)<a name="line.552"></a>
-<span class="sourceLineNo">553</span> return;<a name="line.553"></a>
-<span class="sourceLineNo">554</span> }<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span> }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> private static void skipTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {<a name="line.558"></a>
-<span class="sourceLineNo">559</span> HtmlTag tag = HtmlTag.forEvent(r);<a name="line.559"></a>
-<span class="sourceLineNo">560</span> if (tag.isOneOf(expected))<a name="line.560"></a>
-<span class="sourceLineNo">561</span> r.next();<a name="line.561"></a>
-<span class="sourceLineNo">562</span> else<a name="line.562"></a>
-<span class="sourceLineNo">563</span> throw new XMLStreamException("Unexpected tag: " + tag + ". Expected one of the following: " + JsonSerializer.DEFAULT.toString(expected), r.getLocation());<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span> private static int skipWs(XMLStreamReader r) throws XMLStreamException {<a name="line.566"></a>
-<span class="sourceLineNo">567</span> int event = r.getEventType();<a name="line.567"></a>
-<span class="sourceLineNo">568</span> while (event != START_ELEMENT && event != END_ELEMENT && event != END_DOCUMENT && r.isWhiteSpace())<a name="line.568"></a>
-<span class="sourceLineNo">569</span> event = r.next();<a name="line.569"></a>
-<span class="sourceLineNo">570</span> return event;<a name="line.570"></a>
+<span class="sourceLineNo">536</span> private static void skipTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> HtmlTag tag = HtmlTag.forEvent(r);<a name="line.537"></a>
+<span class="sourceLineNo">538</span> if (tag.isOneOf(expected))<a name="line.538"></a>
+<span class="sourceLineNo">539</span> r.next();<a name="line.539"></a>
+<span class="sourceLineNo">540</span> else<a name="line.540"></a>
+<span class="sourceLineNo">541</span> throw new XMLStreamException("Unexpected tag: " + tag + ". Expected one of the following: " + JsonSerializer.DEFAULT.toString(expected), r.getLocation());<a name="line.541"></a>
+<span class="sourceLineNo">542</span> }<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span> private static int skipWs(XMLStreamReader r) throws XMLStreamException {<a name="line.544"></a>
+<span class="sourceLineNo">545</span> int event = r.getEventType();<a name="line.545"></a>
+<span class="sourceLineNo">546</span> while (event != START_ELEMENT && event != END_ELEMENT && event != END_DOCUMENT && r.isWhiteSpace())<a name="line.546"></a>
+<span class="sourceLineNo">547</span> event = r.next();<a name="line.547"></a>
+<span class="sourceLineNo">548</span> return event;<a name="line.548"></a>
+<span class="sourceLineNo">549</span> }<a name="line.549"></a>
+<span class="sourceLineNo">550</span><a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span> //--------------------------------------------------------------------------------<a name="line.552"></a>
+<span class="sourceLineNo">553</span> // Entry point methods<a name="line.553"></a>
+<span class="sourceLineNo">554</span> //--------------------------------------------------------------------------------<a name="line.554"></a>
+<span class="sourceLineNo">555</span><a name="line.555"></a>
+<span class="sourceLineNo">556</span> @Override /* Parser */<a name="line.556"></a>
+<span class="sourceLineNo">557</span> public HtmlParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.557"></a>
+<span class="sourceLineNo">558</span> return new HtmlParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.558"></a>
+<span class="sourceLineNo">559</span> }<a name="line.559"></a>
+<span class="sourceLineNo">560</span><a name="line.560"></a>
+<span class="sourceLineNo">561</span> @Override /* Parser */<a name="line.561"></a>
+<span class="sourceLineNo">562</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.562"></a>
+<span class="sourceLineNo">563</span> HtmlParserSession s = (HtmlParserSession)session;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> return parseAnything(s, type, s.getXmlStreamReader(), s.getOuter(), true, null);<a name="line.564"></a>
+<span class="sourceLineNo">565</span> }<a name="line.565"></a>
+<span class="sourceLineNo">566</span><a name="line.566"></a>
+<span class="sourceLineNo">567</span> @Override /* ReaderParser */<a name="line.567"></a>
+<span class="sourceLineNo">568</span> protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {<a name="line.568"></a>
+<span class="sourceLineNo">569</span> HtmlParserSession s = (HtmlParserSession)session;<a name="line.569"></a>
+<span class="sourceLineNo">570</span> return parseIntoMap(s, s.getXmlStreamReader(), m, (ClassMeta<K>)s.getClassMeta(keyType), (ClassMeta<V>)s.getClassMeta(valueType), null);<a name="line.570"></a>
<span class="sourceLineNo">571</span> }<a name="line.571"></a>
<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span><a name="line.573"></a>
-<span class="sourceLineNo">574</span> //--------------------------------------------------------------------------------<a name="line.574"></a>
-<span class="sourceLineNo">575</span> // Entry point methods<a name="line.575"></a>
-<span class="sourceLineNo">576</span> //--------------------------------------------------------------------------------<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> @Override /* Parser */<a name="line.578"></a>
-<span class="sourceLineNo">579</span> public HtmlParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.579"></a>
-<span class="sourceLineNo">580</span> return new HtmlParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.580"></a>
-<span class="sourceLineNo">581</span> }<a name="line.581"></a>
-<span class="sourceLineNo">582</span><a name="line.582"></a>
-<span class="sourceLineNo">583</span> @Override /* Parser */<a name="line.583"></a>
-<span class="sourceLineNo">584</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> HtmlParserSession s = (HtmlParserSession)session;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> return parseAnything(s, type, s.getXmlStreamReader(), s.getOuter(), true, null);<a name="line.586"></a>
-<span class="sourceLineNo">587</span> }<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span> @Override /* ReaderParser */<a name="line.589"></a>
-<span class="sourceLineNo">590</span> protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {<a name="line.590"></a>
-<span class="sourceLineNo">591</span> HtmlParserSession s = (HtmlParserSession)session;<a name="line.591"></a>
-<span class="sourceLineNo">592</span> return parseIntoMap(s, s.getXmlStreamReader(), m, (ClassMeta<K>)s.getClassMeta(keyType), (ClassMeta<V>)s.getClassMeta(valueType), null);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> }<a name="line.593"></a>
-<span class="sourceLineNo">594</span><a name="line.594"></a>
-<span class="sourceLineNo">595</span> @Override /* ReaderParser */<a name="line.595"></a>
-<span class="sourceLineNo">596</span> protected <E> Collection<E> doParseIntoCollection(ParserSession session, Collection<E> c, Type elementType) throws Exception {<a name="line.596"></a>
-<span class="sourceLineNo">597</span> HtmlParserSession s = (HtmlParserSession)session;<a name="line.597"></a>
-<span class="sourceLineNo">598</span> return parseIntoCollection(s, s.getXmlStreamReader(), c, (ClassMeta<E>)s.getClassMeta(elementType), null);<a name="line.598"></a>
-<span class="sourceLineNo">599</span> }<a name="line.599"></a>
-<span class="sourceLineNo">600</span><a name="line.600"></a>
-<span class="sourceLineNo">601</span> @Override /* ReaderParser */<a name="line.601"></a>
-<span class="sourceLineNo">602</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> HtmlParserSession s = (HtmlParserSession)session;<a name="line.603"></a>
-<span class="sourceLineNo">604</span> return parseArgs(s, s.getXmlStreamReader(), argTypes);<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span>}<a name="line.606"></a>
+<span class="sourceLineNo">573</span> @Override /* ReaderParser */<a name="line.573"></a>
+<span class="sourceLineNo">574</span> protected <E> Collection<E> doParseIntoCollection(ParserSession session, Collection<E> c, Type elementType) throws Exception {<a name="line.574"></a>
+<span class="sourceLineNo">575</span> HtmlParserSession s = (HtmlParserSession)session;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> return parseIntoCollection(s, s.getXmlStreamReader(), c, s.getClassMeta(elementType), null);<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span>}<a name="line.578"></a>
[19/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.NTriple.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.NTriple.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.NTriple.html
index 675f202..9d7976b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.NTriple.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.NTriple.html
@@ -177,314 +177,315 @@
<span class="sourceLineNo">169</span> // Special case where we're parsing a loose collection of resources.<a name="line.169"></a>
<span class="sourceLineNo">170</span> if (s.isLooseCollections() && type.isCollectionOrArray()) {<a name="line.170"></a>
<span class="sourceLineNo">171</span> Collection c = null;<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if (type.isArray())<a name="line.172"></a>
+<span class="sourceLineNo">172</span> if (type.isArray() || type.isArgs())<a name="line.172"></a>
<span class="sourceLineNo">173</span> c = new ArrayList();<a name="line.173"></a>
<span class="sourceLineNo">174</span> else<a name="line.174"></a>
<span class="sourceLineNo">175</span> c = (type.canCreateNewInstance(session.getOuter()) ? (Collection<?>)type.newInstance(session.getOuter()) : new ObjectList(session));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (Resource resource : roots)<a name="line.176"></a>
-<span class="sourceLineNo">177</span> c.add(parseAnything(s, type.getElementType(), resource, session.getOuter(), null));<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> if (type.isArray())<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return (T)session.toArray(type, c);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> return (T)c;<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (roots.isEmpty())<a name="line.184"></a>
-<span class="sourceLineNo">185</span> return null;<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (roots.size() > 1)<a name="line.186"></a>
-<span class="sourceLineNo">187</span> throw new ParseException(session, "Too many root nodes found in model: {0}", roots.size());<a name="line.187"></a>
-<span class="sourceLineNo">188</span> Resource resource = roots.get(0);<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> return parseAnything(s, type, resource, session.getOuter(), null);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> /*<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * Finds the roots in the model using either the "root" property to identify it,<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * or by resorting to scanning the model for all nodes with no incoming predicates.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> */<a name="line.196"></a>
-<span class="sourceLineNo">197</span> private static List<Resource> getRoots(RdfParserSession session, Model m) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> List<Resource> l = new LinkedList<Resource>();<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> // First try to find the root using the "http://www.apache.org/juneau/root" property.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> Property root = m.createProperty(session.getJuneauNsUri(), RDF_juneauNs_ROOT);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> for (ResIterator i = m.listResourcesWithProperty(root); i.hasNext();)<a name="line.202"></a>
-<span class="sourceLineNo">203</span> l.add(i.next());<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span> if (! l.isEmpty())<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return l;<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> // Otherwise, we need to find all resources that aren't objects.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // We want to explicitly ignore statements where the subject<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // and object are the same node.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> Set<RDFNode> objects = new HashSet<RDFNode>();<a name="line.211"></a>
-<span class="sourceLineNo">212</span> for (StmtIterator i = m.listStatements(); i.hasNext();) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> Statement st = i.next();<a name="line.213"></a>
-<span class="sourceLineNo">214</span> RDFNode subject = st.getSubject();<a name="line.214"></a>
-<span class="sourceLineNo">215</span> RDFNode object = st.getObject();<a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (object.isResource() && ! object.equals(subject))<a name="line.216"></a>
-<span class="sourceLineNo">217</span> objects.add(object);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> for (ResIterator i = m.listSubjects(); i.hasNext();) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> Resource r = i.next();<a name="line.220"></a>
-<span class="sourceLineNo">221</span> if (! objects.contains(r))<a name="line.221"></a>
-<span class="sourceLineNo">222</span> l.add(r);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> return l;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> private <T> BeanMap<T> parseIntoBeanMap(RdfParserSession session, Resource r2, BeanMap<T> m) throws Exception {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> BeanMeta<T> bm = m.getMeta();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.230"></a>
-<span class="sourceLineNo">231</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> Statement st = i.next();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> Property p = st.getPredicate();<a name="line.234"></a>
-<span class="sourceLineNo">235</span> String key = session.decodeString(p.getLocalName());<a name="line.235"></a>
-<span class="sourceLineNo">236</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> session.setCurrentProperty(pMeta);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (pMeta != null) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> RDFNode o = st.getObject();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> if (cm.isCollectionOrArray() && isMultiValuedCollections(session, pMeta)) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> ClassMeta<?> et = cm.getElementType();<a name="line.242"></a>
-<span class="sourceLineNo">243</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> setName(et, value, key);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> pMeta.add(m, value);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> setName(cm, value, key);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> pMeta.set(m, value);<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> session.setCurrentProperty(null);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m;<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> private static boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (pMeta != null && pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> return session.getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.265"></a>
-<span class="sourceLineNo">266</span> private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> if (eType == null)<a name="line.268"></a>
-<span class="sourceLineNo">269</span> eType = (ClassMeta<T>)object();<a name="line.269"></a>
-<span class="sourceLineNo">270</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> session.setCurrentClass(sType);<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (! sType.canCreateNewInstance(outer)) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> if (n.isResource()) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> Statement st = n.asResource().getProperty(session.getTypeProperty());<a name="line.276"></a>
-<span class="sourceLineNo">277</span> if (st != null) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> String c = st.getLiteral().getString();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> ClassMeta tcm = session.getClassMeta(c, pMeta, eType);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (tcm != null)<a name="line.280"></a>
-<span class="sourceLineNo">281</span> sType = eType = tcm;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> Object o = null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> // Do nothing. Leave o == null.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> } else if (sType.isObject()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> if (n.isLiteral()) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> o = n.asLiteral().getValue();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> if (o instanceof String) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> o = session.decodeString(o);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> else if (n.isResource()) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> Resource r = n.asResource();<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (session.wasAlreadyProcessed(r))<a name="line.298"></a>
-<span class="sourceLineNo">299</span> o = r.getURI();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> else if (r.getProperty(session.getValueProperty()) != null) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer, null);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> } else if (isSeq(session, r)) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> o = new ObjectList(session);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.304"></a>
-<span class="sourceLineNo">305</span> } else if (isBag(session, r)) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> o = new ObjectList(session);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> } else if (r.canAs(RDFList.class)) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> o = new ObjectList(session);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> } else {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> // If it has a URI and no child properties, we interpret this as an<a name="line.312"></a>
-<span class="sourceLineNo">313</span> // external resource, and convert it to just a URL.<a name="line.313"></a>
-<span class="sourceLineNo">314</span> String uri = r.getURI();<a name="line.314"></a>
-<span class="sourceLineNo">315</span> if (uri != null && ! r.listProperties().hasNext()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> o = r.getURI();<a name="line.316"></a>
-<span class="sourceLineNo">317</span> } else {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> ObjectMap m2 = new ObjectMap(session);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> parseIntoMap(session, r, m2, null, null, pMeta);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> o = session.cast(m2, pMeta, eType);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span> } else {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } else if (sType.isBoolean()) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> o = session.convertToType(getValue(session, n, outer), boolean.class);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> } else if (sType.isCharSequence()) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> o = session.decodeString(getValue(session, n, outer));<a name="line.329"></a>
-<span class="sourceLineNo">330</span> } else if (sType.isChar()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> o = session.decodeString(getValue(session, n, outer)).charAt(0);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> } else if (sType.isNumber()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass());<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } else if (sType.isMap()) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> Resource r = n.asResource();<a name="line.335"></a>
-<span class="sourceLineNo">336</span> if (session.wasAlreadyProcessed(r))<a name="line.336"></a>
-<span class="sourceLineNo">337</span> return null;<a name="line.337"></a>
-<span class="sourceLineNo">338</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.338"></a>
-<span class="sourceLineNo">339</span> o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType(), pMeta);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> } else if (sType.isCollectionOrArray()) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> if (sType.isArray())<a name="line.341"></a>
-<span class="sourceLineNo">342</span> o = new ArrayList();<a name="line.342"></a>
-<span class="sourceLineNo">343</span> else<a name="line.343"></a>
-<span class="sourceLineNo">344</span> o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(session));<a name="line.344"></a>
-<span class="sourceLineNo">345</span> Resource r = n.asResource();<a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (session.wasAlreadyProcessed(r))<a name="line.346"></a>
-<span class="sourceLineNo">347</span> return null;<a name="line.347"></a>
-<span class="sourceLineNo">348</span> if (isSeq(session, r)) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> } else if (isBag(session, r)) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> } else if (r.canAs(RDFList.class)) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> } else {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> throw new ParseException("Unrecognized node type ''{0}'' for collection", n);<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (sType.isArray())<a name="line.357"></a>
-<span class="sourceLineNo">358</span> o = session.toArray(sType, (Collection)o);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> Resource r = n.asResource();<a name="line.360"></a>
-<span class="sourceLineNo">361</span> if (session.wasAlreadyProcessed(r))<a name="line.361"></a>
-<span class="sourceLineNo">362</span> return null;<a name="line.362"></a>
-<span class="sourceLineNo">363</span> BeanMap<?> bm = session.newBeanMap(outer, sType.getInnerClass());<a name="line.363"></a>
-<span class="sourceLineNo">364</span> o = parseIntoBeanMap(session, r, bm).getBean();<a name="line.364"></a>
-<span class="sourceLineNo">365</span> } else if (sType.isUri() && n.isResource()) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));<a name="line.366"></a>
-<span class="sourceLineNo">367</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass()));<a name="line.370"></a>
-<span class="sourceLineNo">371</span> } else if (n.isResource()) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> Resource r = n.asResource();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> Map m = new ObjectMap(session);<a name="line.373"></a>
-<span class="sourceLineNo">374</span> parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.375"></a>
-<span class="sourceLineNo">376</span> o = session.cast((ObjectMap)m, pMeta, eType);<a name="line.376"></a>
-<span class="sourceLineNo">377</span> else<a name="line.377"></a>
-<span class="sourceLineNo">378</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.378"></a>
-<span class="sourceLineNo">379</span> } else {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> if (transform != null && o != null)<a name="line.383"></a>
-<span class="sourceLineNo">384</span> o = transform.unswap(session, o, eType);<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (outer != null)<a name="line.386"></a>
-<span class="sourceLineNo">387</span> setParent(eType, o, outer);<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> return (T)o;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> private static boolean isSeq(RdfParserSession session, RDFNode n) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (n.isResource()) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.394"></a>
-<span class="sourceLineNo">395</span> if (st != null)<a name="line.395"></a>
-<span class="sourceLineNo">396</span> return RDF_SEQ.equals(st.getResource().getURI());<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span> return false;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> private static boolean isBag(RdfParserSession session, RDFNode n) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> if (n.isResource()) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (st != null)<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return RDF_BAG.equals(st.getResource().getURI());<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return false;<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> private Object getValue(RdfParserSession session, RDFNode n, Object outer) throws Exception {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> if (n.isLiteral())<a name="line.411"></a>
-<span class="sourceLineNo">412</span> return n.asLiteral().getValue();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (n.isResource()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> Statement st = n.asResource().getProperty(session.getValueProperty());<a name="line.414"></a>
-<span class="sourceLineNo">415</span> if (st != null) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> n = st.getObject();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (n.isLiteral())<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return n.asLiteral().getValue();<a name="line.418"></a>
-<span class="sourceLineNo">419</span> return parseAnything(session, object(), st.getObject(), outer, null);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> throw new ParseException(session, "Unknown value type for node ''{0}''", n);<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> private <K,V> Map<K,V> parseIntoMap(RdfParserSession session, Resource r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> // Add URI as "uri" to generic maps.<a name="line.426"></a>
-<span class="sourceLineNo">427</span> if (r.getURI() != null) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> K uri = convertAttrToType(session, m, "uri", keyType);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> V value = convertAttrToType(session, m, r.getURI(), valueType);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> m.put(uri, value);<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for (StmtIterator i = r.listProperties(); i.hasNext();) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> Statement st = i.next();<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Property p = st.getPredicate();<a name="line.434"></a>
-<span class="sourceLineNo">435</span> String key = p.getLocalName();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (! (key.equals("root") && p.getURI().equals(session.getJuneauNsUri()))) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> key = session.decodeString(key);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> RDFNode o = st.getObject();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> K key2 = convertAttrToType(session, m, key, keyType);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> V value = parseAnything(session, valueType, o, m, pMeta);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> setName(valueType, value, key);<a name="line.441"></a>
-<span class="sourceLineNo">442</span> m.put(key2, value);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> return m;<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, Container c, Collection<E> l, ClassMeta<E> et, BeanPropertyMeta pMeta) throws Exception {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> for (NodeIterator ni = c.iterator(); ni.hasNext();) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> E e = parseAnything(session, et, ni.next(), l, pMeta);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> l.add(e);<a name="line.452"></a>
-<span class="sourceLineNo">453</span> }<a name="line.453"></a>
-<span class="sourceLineNo">454</span> return l;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, RDFList list, Collection<E> l, ClassMeta<E> et, BeanPropertyMeta pMeta) throws Exception {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> for (ExtendedIterator<RDFNode> ni = list.iterator(); ni.hasNext();) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span> E e = parseAnything(session, et, ni.next(), l, pMeta);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> l.add(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span> return l;<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> @Override /* Parser */<a name="line.465"></a>
-<span class="sourceLineNo">466</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> throw new UnsupportedOperationException("Parser '"+getClass().getName()+"' does not support this method.");<a name="line.467"></a>
-<span class="sourceLineNo">468</span> }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span> <a name="line.470"></a>
-<span class="sourceLineNo">471</span> //--------------------------------------------------------------------------------<a name="line.471"></a>
-<span class="sourceLineNo">472</span> // Entry point methods<a name="line.472"></a>
-<span class="sourceLineNo">473</span> //--------------------------------------------------------------------------------<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> @Override /* Parser */<a name="line.475"></a>
-<span class="sourceLineNo">476</span> public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span>}<a name="line.479"></a>
+<span class="sourceLineNo">176</span> <a name="line.176"></a>
+<span class="sourceLineNo">177</span> int argIndex = 0;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> for (Resource resource : roots)<a name="line.178"></a>
+<span class="sourceLineNo">179</span> c.add(parseAnything(s, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), resource, session.getOuter(), null));<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> if (type.isArray() || type.isArgs())<a name="line.181"></a>
+<span class="sourceLineNo">182</span> return (T)session.toArray(type, c);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> return (T)c;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (roots.isEmpty())<a name="line.186"></a>
+<span class="sourceLineNo">187</span> return null;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (roots.size() > 1)<a name="line.188"></a>
+<span class="sourceLineNo">189</span> throw new ParseException(session, "Too many root nodes found in model: {0}", roots.size());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> Resource resource = roots.get(0);<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> return parseAnything(s, type, resource, session.getOuter(), null);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<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> * Finds the roots in the model using either the "root" property to identify it,<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * or by resorting to scanning the model for all nodes with no incoming predicates.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> */<a name="line.198"></a>
+<span class="sourceLineNo">199</span> private static List<Resource> getRoots(RdfParserSession session, Model m) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> List<Resource> l = new LinkedList<Resource>();<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> // First try to find the root using the "http://www.apache.org/juneau/root" property.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> Property root = m.createProperty(session.getJuneauNsUri(), RDF_juneauNs_ROOT);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> for (ResIterator i = m.listResourcesWithProperty(root); i.hasNext();)<a name="line.204"></a>
+<span class="sourceLineNo">205</span> l.add(i.next());<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> if (! l.isEmpty())<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return l;<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> // Otherwise, we need to find all resources that aren't objects.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> // We want to explicitly ignore statements where the subject<a name="line.211"></a>
+<span class="sourceLineNo">212</span> // and object are the same node.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> Set<RDFNode> objects = new HashSet<RDFNode>();<a name="line.213"></a>
+<span class="sourceLineNo">214</span> for (StmtIterator i = m.listStatements(); i.hasNext();) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> Statement st = i.next();<a name="line.215"></a>
+<span class="sourceLineNo">216</span> RDFNode subject = st.getSubject();<a name="line.216"></a>
+<span class="sourceLineNo">217</span> RDFNode object = st.getObject();<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (object.isResource() && ! object.equals(subject))<a name="line.218"></a>
+<span class="sourceLineNo">219</span> objects.add(object);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> for (ResIterator i = m.listSubjects(); i.hasNext();) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> Resource r = i.next();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> if (! objects.contains(r))<a name="line.223"></a>
+<span class="sourceLineNo">224</span> l.add(r);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span> return l;<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> private <T> BeanMap<T> parseIntoBeanMap(RdfParserSession session, Resource r2, BeanMap<T> m) throws Exception {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> BeanMeta<T> bm = m.getMeta();<a name="line.230"></a>
+<span class="sourceLineNo">231</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.232"></a>
+<span class="sourceLineNo">233</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.233"></a>
+<span class="sourceLineNo">234</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> Statement st = i.next();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> Property p = st.getPredicate();<a name="line.236"></a>
+<span class="sourceLineNo">237</span> String key = session.decodeString(p.getLocalName());<a name="line.237"></a>
+<span class="sourceLineNo">238</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> session.setCurrentProperty(pMeta);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (pMeta != null) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> RDFNode o = st.getObject();<a name="line.241"></a>
+<span class="sourceLineNo">242</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> if (cm.isCollectionOrArray() && isMultiValuedCollections(session, pMeta)) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> ClassMeta<?> et = cm.getElementType();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> setName(et, value, key);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> pMeta.add(m, value);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> } else {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> setName(cm, value, key);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> pMeta.set(m, value);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> session.setCurrentProperty(null);<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return m;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> private static boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> if (pMeta != null && pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.262"></a>
+<span class="sourceLineNo">263</span> return pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> return session.getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.267"></a>
+<span class="sourceLineNo">268</span> private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> if (eType == null)<a name="line.270"></a>
+<span class="sourceLineNo">271</span> eType = (ClassMeta<T>)object();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.273"></a>
+<span class="sourceLineNo">274</span> session.setCurrentClass(sType);<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> if (! sType.canCreateNewInstance(outer)) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (n.isResource()) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> Statement st = n.asResource().getProperty(session.getTypeProperty());<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (st != null) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> String c = st.getLiteral().getString();<a name="line.280"></a>
+<span class="sourceLineNo">281</span> ClassMeta tcm = session.getClassMeta(c, pMeta, eType);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (tcm != null)<a name="line.282"></a>
+<span class="sourceLineNo">283</span> sType = eType = tcm;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> Object o = null;<a name="line.288"></a>
+<span class="sourceLineNo">289</span> if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // Do nothing. Leave o == null.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> } else if (sType.isObject()) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (n.isLiteral()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> o = n.asLiteral().getValue();<a name="line.293"></a>
+<span class="sourceLineNo">294</span> if (o instanceof String) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> o = session.decodeString(o);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> else if (n.isResource()) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> Resource r = n.asResource();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> if (session.wasAlreadyProcessed(r))<a name="line.300"></a>
+<span class="sourceLineNo">301</span> o = r.getURI();<a name="line.301"></a>
+<span class="sourceLineNo">302</span> else if (r.getProperty(session.getValueProperty()) != null) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer, null);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> } else if (isSeq(session, r)) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> o = new ObjectList(session);<a name="line.305"></a>
+<span class="sourceLineNo">306</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType, pMeta);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> } else if (isBag(session, r)) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> o = new ObjectList(session);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType, pMeta);<a name="line.309"></a>
+<span class="sourceLineNo">310</span> } else if (r.canAs(RDFList.class)) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> o = new ObjectList(session);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType, pMeta);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> } else {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> // If it has a URI and no child properties, we interpret this as an<a name="line.314"></a>
+<span class="sourceLineNo">315</span> // external resource, and convert it to just a URL.<a name="line.315"></a>
+<span class="sourceLineNo">316</span> String uri = r.getURI();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (uri != null && ! r.listProperties().hasNext()) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> o = r.getURI();<a name="line.318"></a>
+<span class="sourceLineNo">319</span> } else {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> ObjectMap m2 = new ObjectMap(session);<a name="line.320"></a>
+<span class="sourceLineNo">321</span> parseIntoMap(session, r, m2, null, null, pMeta);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> o = session.cast(m2, pMeta, eType);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span> } else {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span> } else if (sType.isBoolean()) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> o = session.convertToType(getValue(session, n, outer), boolean.class);<a name="line.329"></a>
+<span class="sourceLineNo">330</span> } else if (sType.isCharSequence()) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> o = session.decodeString(getValue(session, n, outer));<a name="line.331"></a>
+<span class="sourceLineNo">332</span> } else if (sType.isChar()) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> o = session.decodeString(getValue(session, n, outer)).charAt(0);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> } else if (sType.isNumber()) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass());<a name="line.335"></a>
+<span class="sourceLineNo">336</span> } else if (sType.isMap()) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> Resource r = n.asResource();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> if (session.wasAlreadyProcessed(r))<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return null;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.340"></a>
+<span class="sourceLineNo">341</span> o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType(), pMeta);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> } else if (sType.isCollectionOrArray() || sType.isArgs()) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> if (sType.isArray() || sType.isArgs())<a name="line.343"></a>
+<span class="sourceLineNo">344</span> o = new ArrayList();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> else<a name="line.345"></a>
+<span class="sourceLineNo">346</span> o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(session));<a name="line.346"></a>
+<span class="sourceLineNo">347</span> Resource r = n.asResource();<a name="line.347"></a>
+<span class="sourceLineNo">348</span> if (session.wasAlreadyProcessed(r))<a name="line.348"></a>
+<span class="sourceLineNo">349</span> return null;<a name="line.349"></a>
+<span class="sourceLineNo">350</span> if (isSeq(session, r)) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType, pMeta);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> } else if (isBag(session, r)) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType, pMeta);<a name="line.353"></a>
+<span class="sourceLineNo">354</span> } else if (r.canAs(RDFList.class)) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType, pMeta);<a name="line.355"></a>
+<span class="sourceLineNo">356</span> } else {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> throw new ParseException("Unrecognized node type ''{0}'' for collection", n);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> if (sType.isArray() || sType.isArgs())<a name="line.359"></a>
+<span class="sourceLineNo">360</span> o = session.toArray(sType, (Collection)o);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> Resource r = n.asResource();<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (session.wasAlreadyProcessed(r))<a name="line.363"></a>
+<span class="sourceLineNo">364</span> return null;<a name="line.364"></a>
+<span class="sourceLineNo">365</span> BeanMap<?> bm = session.newBeanMap(outer, sType.getInnerClass());<a name="line.365"></a>
+<span class="sourceLineNo">366</span> o = parseIntoBeanMap(session, r, bm).getBean();<a name="line.366"></a>
+<span class="sourceLineNo">367</span> } else if (sType.isUri() && n.isResource()) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));<a name="line.368"></a>
+<span class="sourceLineNo">369</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));<a name="line.370"></a>
+<span class="sourceLineNo">371</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass()));<a name="line.372"></a>
+<span class="sourceLineNo">373</span> } else if (n.isResource()) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> Resource r = n.asResource();<a name="line.374"></a>
+<span class="sourceLineNo">375</span> Map m = new ObjectMap(session);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.377"></a>
+<span class="sourceLineNo">378</span> o = session.cast((ObjectMap)m, pMeta, eType);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> else<a name="line.379"></a>
+<span class="sourceLineNo">380</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.380"></a>
+<span class="sourceLineNo">381</span> } else {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (transform != null && o != null)<a name="line.385"></a>
+<span class="sourceLineNo">386</span> o = transform.unswap(session, o, eType);<a name="line.386"></a>
+<span class="sourceLineNo">387</span><a name="line.387"></a>
+<span class="sourceLineNo">388</span> if (outer != null)<a name="line.388"></a>
+<span class="sourceLineNo">389</span> setParent(eType, o, outer);<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> return (T)o;<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> private static boolean isSeq(RdfParserSession session, RDFNode n) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (n.isResource()) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.396"></a>
+<span class="sourceLineNo">397</span> if (st != null)<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return RDF_SEQ.equals(st.getResource().getURI());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> return false;<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> private static boolean isBag(RdfParserSession session, RDFNode n) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> if (n.isResource()) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if (st != null)<a name="line.406"></a>
+<span class="sourceLineNo">407</span> return RDF_BAG.equals(st.getResource().getURI());<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span> return false;<a name="line.409"></a>
+<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span> private Object getValue(RdfParserSession session, RDFNode n, Object outer) throws Exception {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> if (n.isLiteral())<a name="line.413"></a>
+<span class="sourceLineNo">414</span> return n.asLiteral().getValue();<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (n.isResource()) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> Statement st = n.asResource().getProperty(session.getValueProperty());<a name="line.416"></a>
+<span class="sourceLineNo">417</span> if (st != null) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> n = st.getObject();<a name="line.418"></a>
+<span class="sourceLineNo">419</span> if (n.isLiteral())<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return n.asLiteral().getValue();<a name="line.420"></a>
+<span class="sourceLineNo">421</span> return parseAnything(session, object(), st.getObject(), outer, null);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span> }<a name="line.423"></a>
+<span class="sourceLineNo">424</span> throw new ParseException(session, "Unknown value type for node ''{0}''", n);<a name="line.424"></a>
+<span class="sourceLineNo">425</span> }<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> private <K,V> Map<K,V> parseIntoMap(RdfParserSession session, Resource r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> // Add URI as "uri" to generic maps.<a name="line.428"></a>
+<span class="sourceLineNo">429</span> if (r.getURI() != null) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> K uri = convertAttrToType(session, m, "uri", keyType);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> V value = convertAttrToType(session, m, r.getURI(), valueType);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> m.put(uri, value);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> for (StmtIterator i = r.listProperties(); i.hasNext();) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> Statement st = i.next();<a name="line.435"></a>
+<span class="sourceLineNo">436</span> Property p = st.getPredicate();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> String key = p.getLocalName();<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (! (key.equals("root") && p.getURI().equals(session.getJuneauNsUri()))) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> key = session.decodeString(key);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> RDFNode o = st.getObject();<a name="line.440"></a>
+<span class="sourceLineNo">441</span> K key2 = convertAttrToType(session, m, key, keyType);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> V value = parseAnything(session, valueType, o, m, pMeta);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> setName(valueType, value, key);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> m.put(key2, value);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> }<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span> return m;<a name="line.448"></a>
+<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> @SuppressWarnings("unchecked")<a name="line.451"></a>
+<span class="sourceLineNo">452</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, Container c, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> int argIndex = 0;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> for (NodeIterator ni = c.iterator(); ni.hasNext();) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> E e = (E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), ni.next(), l, pMeta);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> l.add(e);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return l;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span> @SuppressWarnings("unchecked")<a name="line.461"></a>
+<span class="sourceLineNo">462</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, RDFList list, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> int argIndex = 0;<a name="line.463"></a>
+<span class="sourceLineNo">464</span> for (ExtendedIterator<RDFNode> ni = list.iterator(); ni.hasNext();) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> E e = (E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), ni.next(), l, pMeta);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> l.add(e);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span> return l;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> }<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span> <a name="line.471"></a>
+<span class="sourceLineNo">472</span> //--------------------------------------------------------------------------------<a name="line.472"></a>
+<span class="sourceLineNo">473</span> // Entry point methods<a name="line.473"></a>
+<span class="sourceLineNo">474</span> //--------------------------------------------------------------------------------<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span> @Override /* Parser */<a name="line.476"></a>
+<span class="sourceLineNo">477</span> public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span> return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.478"></a>
+<span class="sourceLineNo">479</span> }<a name="line.479"></a>
+<span class="sourceLineNo">480</span>}<a name="line.480"></a>
[33/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html b/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html
index 50be88c..ec6b302 100644
--- a/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html
+++ b/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.53">RestClient</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.52">RestClient</a>
extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class in org.apache.juneau">CoreObject</a></pre>
<div class="block">Utility class for interfacing with remote REST interfaces.
@@ -336,7 +336,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockListLast">
<li class="blockList">
<h4>RestClient</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.90">RestClient</a>(<a href="../../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore,
+<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.89">RestClient</a>(<a href="../../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore,
org.apache.http.impl.client.CloseableHttpClient httpClient,
boolean keepHttpClientOpen,
<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> serializer,
@@ -386,7 +386,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>close</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.141">close</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.140">close</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Calls <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Closeable.html?is-external=true#close--" title="class or interface in java.io"><code>Closeable.close()</code></a> on the underlying <code>CloseableHttpClient</code>.
It's good practice to call this method after the client is no longer used.</div>
@@ -402,7 +402,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>closeQuietly</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.152">closeQuietly</a>()</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.151">closeQuietly</a>()</pre>
<div class="block">Same as <a href="../../../../../org/apache/juneau/rest/client/RestClient.html#close--"><code>close()</code></a>, but ignores any exceptions.</div>
</li>
</ul>
@@ -412,7 +412,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>execute</h4>
-<pre>protected org.apache.http.HttpResponse <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.170">execute</a>(org.apache.http.client.methods.HttpUriRequest req)
+<pre>protected org.apache.http.HttpResponse <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.169">execute</a>(org.apache.http.client.methods.HttpUriRequest req)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Execute the specified request.
Subclasses can override this method to provide specialized handling.</div>
@@ -432,7 +432,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doGet</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.182">doGet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.181">doGet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Perform a <code>GET</code> request against the specified URL.</div>
<dl>
@@ -452,7 +452,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doPut</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.202">doPut</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.201">doPut</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url,
<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> o)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Perform a <code>PUT</code> request against the specified URL.</div>
@@ -481,7 +481,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doPost</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.222">doPost</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.221">doPost</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url,
<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> o)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Perform a <code>POST</code> request against the specified URL.</div>
@@ -510,7 +510,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doDelete</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.234">doDelete</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.233">doDelete</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Perform a <code>DELETE</code> request against the specified URL.</div>
<dl>
@@ -530,7 +530,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doOptions</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.246">doOptions</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.245">doOptions</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Perform an <code>OPTIONS</code> request against the specified URL.</div>
<dl>
@@ -550,7 +550,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doFormPost</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.260">doFormPost</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.259">doFormPost</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> url,
<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> o)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Perform a <code>POST</code> request with a content type of <code>application/x-www-form-urlencoded</code> against the specified URL.</div>
@@ -573,7 +573,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doCallback</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.285">doCallback</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> callString)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.284">doCallback</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> callString)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Performs a REST call where the entire call is specified in a simple string.
<p>
@@ -605,7 +605,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doCall</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.350">doCall</a>(<a href="../../../../../org/apache/juneau/rest/client/HttpMethod.html" title="enum in org.apache.juneau.rest.client">HttpMethod</a> method,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.349">doCall</a>(<a href="../../../../../org/apache/juneau/rest/client/HttpMethod.html" title="enum in org.apache.juneau.rest.client">HttpMethod</a> method,
<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> url,
<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> content)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
@@ -637,7 +637,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doCall</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.367">doCall</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> method,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.366">doCall</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> method,
<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> url,
boolean hasContent)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
@@ -661,7 +661,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getRemoteableProxy</h4>
-<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.420">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass)</pre>
+<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.418">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass)</pre>
<div class="block">Create a new proxy interface for the specified remoteable service interface.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -680,7 +680,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getRemoteableProxy</h4>
-<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.433">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
+<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.431">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
<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> proxyUrl)</pre>
<div class="block">Create a new proxy interface for the specified REST PROXY interface.</div>
<dl>
@@ -698,7 +698,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getRemoteableProxy</h4>
-<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.447">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
+<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.445">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
<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> proxyUrl,
<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> serializer,
<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> parser)</pre>
@@ -720,7 +720,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockListLast">
<li class="blockList">
<h4>finalize</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.509">finalize</a>()
+<pre>protected void <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.512">finalize</a>()
throws <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></pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/rest/client/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/client/package-summary.html b/content/site/apidocs/org/apache/juneau/rest/client/package-summary.html
index 70841c0..f0be26a 100644
--- a/content/site/apidocs/org/apache/juneau/rest/client/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/rest/client/package-summary.html
@@ -474,7 +474,7 @@
<h6 class='figure'>Code that reads an <code>SSLOpts</code> bean from the config file</h6>
<p class='bcode'>
<jc>// Read config file and set SSL options based on what's in that file.</jc>
- ConfigFile cf = ConfigMgr.<jsf>DEFAULT</jsf>.get(<js>"MyConfig.cfg"</js>);
+ ConfigFile cf = <jk>new</jk> ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>);
SSLOpts ssl = cf.getObject(SSLOpts.<jk>class</jk>, <js>"Connection/ssl"</js>);
RestClient rc = <jk>new</jk> RestClient().enableSSL(ssl);
</p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html b/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html
index 9e348b5..12d76ac 100644
--- a/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html
+++ b/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html
@@ -131,8 +131,13 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#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/apache/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 h
ref="../../../../../org/apache/juneau/jso/JsoSerializer.html" title="class in org.apache.juneau.jso">JsoSerializer.class</a>,<a href="../../../../../org/apache/juneau/plaintext/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext">PlainTextSerializer.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in org.apache.juneau.jena">RdfSerializer.Xml.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html" title="class in org.apache.juneau.jena">RdfSerializer.XmlAbbrev.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.N3.html" title="class in org.apache.juneau.jena">RdfSerializer.N3.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.NTriple.html" title="class in org.apache.juneau.jena">RdfSerializer.NTriple.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.Turtle.html" title="class in org.apache.juneau.jena">RdfSerializer.Turtle.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/jena/RdfParser.Xml.html" title="class in org.apache.juneau.jena">RdfPars
er.Xml.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfParser.N3.html" title="class in org.apache.juneau.jena">RdfParser.N3.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfParser.NTriple.html" title="class in org.apache.juneau.jena">RdfParser.NTriple.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfParser.Turtle.html" title="class in org.apache.juneau.jena">RdfParser.Turtle.class</a>},<a href="../../../../../org/apache/juneau/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/Property.html" title="annotation in org.apach
e.juneau.rest.annotation">@Property</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#name--">name</a>="HtmlSerializer.title",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="$R{servletTitle}"),<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>="HtmlSerializer.description",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="$R{servletDescription}")},<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#stylesheet--">stylesheet</a>="styles/juneau.css",<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#favicon--">favicon</a>="juneau.ico",<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#staticFiles--">staticFiles</a>="{htdocs:\'
htdocs\'}")
-public abstract class <a href="../../../../../src-html/org/apache/juneau/rest/jena/RestServletJenaDefault.html#line.236">RestServletJenaDefault</a>
+<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/apache/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 h
ref="../../../../../org/apache/juneau/jso/JsoSerializer.html" title="class in org.apache.juneau.jso">JsoSerializer.class</a>,<a href="../../../../../org/apache/juneau/plaintext/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext">PlainTextSerializer.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in org.apache.juneau.jena">RdfSerializer.Xml.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html" title="class in org.apache.juneau.jena">RdfSerializer.XmlAbbrev.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.N3.html" title="class in org.apache.juneau.jena">RdfSerializer.N3.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.NTriple.html" title="class in org.apache.juneau.jena">RdfSerializer.NTriple.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.Turtle.html" title="class in org.apache.juneau.jena">RdfSerializer.Turtle.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/jena/RdfParser.Xml.html" title="class in org.apache.juneau.
jena">RdfParser.Xml.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfParser.N3.html" title="class in org.apache.juneau.jena">RdfParser.N3.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfParser.NTriple.html" title="class in org.apache.juneau.jena">RdfParser.NTriple.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfParser.Turtle.html" title="class in org.apache.juneau.jena">RdfParser.Turtle.class</a>},
+ <a href="../../../../../org/apache/juneau/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#stylesheet--">stylesheet</a>="styles/juneau.css",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#favicon--">favicon</a>="juneau.ico",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#staticFiles--">staticFiles</a>="{htdocs:\'htdocs\'}")
+public abstract class <a href="../../../../../src-html/org/apache/juneau/rest/jena/RestServletJenaDefault.html#line.231">RestServletJenaDefault</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 sets of serializers and parsers that include RDF support.
<p>
@@ -384,7 +389,7 @@ extends <a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="
<ul class="blockListLast">
<li class="blockList">
<h4>RestServletJenaDefault</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/jena/RestServletJenaDefault.html#line.236">RestServletJenaDefault</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/jena/RestServletJenaDefault.html#line.231">RestServletJenaDefault</a>()</pre>
</li>
</ul>
</li>
@@ -401,8 +406,12 @@ extends <a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="
<ul class="blockListLast">
<li class="blockList">
<h4>getOptions</h4>
-<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="OPTIONS",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.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>="HtmlDocSerializer.links.map",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="{back:\'$R{servletURI}\'}"),<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>="HtmlSerializer.description",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="Resource options")},<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Resource options")
-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/jena/RestServletJenaDefault.html#line.252">getOptions</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req)</pre>
+<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="OPTIONS",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#summary--">summary</a>="Resource options",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#pageLinks--">pageLinks</a>="{back:\'$R{servletURI}\'}",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Resource options")
+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/jena/RestServletJenaDefault.html#line.245">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/5aed2f48/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 20dc3d7..0091439 100644
--- a/content/site/apidocs/org/apache/juneau/rest/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/rest/package-summary.html
@@ -480,9 +480,7 @@
*/</jd>
<ja>@RestResource</ja>(
messages=<js>"nls/HelloWorldResource"</js>,
- properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>)
- }
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
)
<jk>public class</jk> HelloWorldResource <jk>extends</jk> Resource {
@@ -1291,11 +1289,8 @@
* <ja>@return</ja> A bean containing the contents for the OPTIONS page.
*/</jd>
<ja>@RestMethod</ja>(name=<js>"OPTIONS"</js>, path=<js>"/*"</js>,
- properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{back:'$R{servletURI}'}"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"Resource options"</js>)
- },
- description=<js>"Resource options"</js>
+ summary=<js>"Resource options"</js>,
+ pageLinks=<js>"{back:'$R{servletURI}'}"</js>
)
<jk>public</jk> Swagger getOptions(RestRequest req) {
<jk>return</jk> req.getSwagger();
@@ -1370,12 +1365,8 @@
</p>
<p class='bcode'>
<ja>@RestResource</ja>(
- properties={
- <jc>// Provide a default title on HTML pages.</jc>
- <ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"$R{servletTitle}"</js>),
- <jc>// Provide a default description on HTML pages.</jc>
- <ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"$R{servletDescription}"</js>)
- }
+ pageTitle=<js>"The title for this page is $R{servletTitle}"</js>,
+ pageText=<js>"The description for this page is $R{servletDescription}"</js>
)
<jk>public abstract class</jk> RestServletDefault <jk>extends</jk> RestServlet {
</p>
@@ -1684,6 +1675,7 @@
value=<js>"{jp06:'http://jazz.net/xmlns/prod/jazz/process/0.6/',jp:'http://jazz.net/xmlns/prod/jazz/process/1.0/'}"</js>),
<jc>// Specify a default title for the HtmlSerializer serializer</jc>
+ <jc>// This is equivalent to @RestResource(title/pageTitle)</jc>
<ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"My resource"</js>)
}
)
@@ -1711,6 +1703,7 @@
value=<js>"{jp06:'http://jazz.net/xmlns/prod/jazz/process/0.6/',jp:'http://jazz.net/xmlns/prod/jazz/process/1.0/'}"</js>),
<jc>// Specify a default title for the HtmlSerializer serializer</jc>
+ <jc>// This is equivalent to @RestMethod(pageTitle)</jc>
<ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"My resource"</js>)
}
<jk>public</jk> Object doGet() {
@@ -2007,10 +2000,6 @@
*/</jd>
<ja>@RestResource</ja>(
path=<js>"/"</js>,
- messages=<js>"nls/RootResources"</js>,
- properties={
- <ja>@Property</ja>(name=HTMLDOC_links, value=<js>"{options:'$R{servletURI}?method=OPTIONS',source:'$R{servletURI}/source?classes=(org.apache.juneau.rest.samples.RootResources)'}"</js>)
- },
children={
HelloWorldResource.<jk>class</jk>,
MethodExampleResource.<jk>class</jk>,
@@ -2159,9 +2148,6 @@
<p class='bcode'>
<ja>@RestResource</ja>(
title=<js>"$L{my.label}"</js>
- properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'$R{servletURI}?method=OPTIONS'"</js>)
- }
)
</p>
<p>
@@ -2390,11 +2376,9 @@
<ja>@RestResource</ja>(
path=<js>"/urlEncodedForm"</js>,
messages=<js>"nls/UrlEncodedFormResource"</js>,
- properties={
- <ja>@Property</ja>(name=HTMLDOC_title, value=<js>"URL-encoded Form Post Resource"</js>),
- <ja>@Property</ja>(name=HTMLDOC_description, value=<js>"Shows how form posts are converted into beans."</js>),
- <ja>@Property</ja>(name=HTMLDOC_links, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.UrlEncodedFormResource)'}"</js>)
- }
+ title=<js>"URL-encoded Form Post Resource"</js>,
+ description=<js>"Shows how form posts are converted into beans."</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
)
<jk>public class</jk> UrlEncodedFormResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -2692,7 +2676,7 @@
These properties are then accessible through the <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> class.
</p>
<p class='bcode'>
- ConfigFile cf = ConfigMgr.<jsf>INSTANCE</jsf>.getConfigFile(<js>"myconfig.cfg"</js>);
+ ConfigFile cf = <jk>new</jk> ConfigFileBuilder().build(<js>"myconfig.cfg"</js>);
String path = cf.getString(<js>"MyProperties/path"</js>);
File javaHome = cf.getObject(File.<jk>class</jk>, <js>"MyProperties/javaHome"</js>);
String customMessage = cf.getString(<js>"MyProperties/customMessage"</js>);
@@ -3147,11 +3131,9 @@
<ja>@RestResource</ja>(
path=<js>"/photos"</js>,
messages=<js>"nls/PhotosResource"</js>,
- properties={
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS'}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, value=<js>"Photo REST service"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"Use a tool like Poster to upload and retrieve jpeg and png images."</js>)
- }
+ title=<js>"Photo REST service"</js>,
+ description=<js>"Use a tool like Poster to upload and retrieve jpeg and png images."</js>,
+ pageLinks=<js>"{options:'?method=OPTIONS'}"</js>
)
<jk>public class</jk> PhotosResource <jk>extends</jk> RestServletDefault {
@@ -3180,8 +3162,8 @@
<jd>/** GET request handler for list of all photos */</jd>
<ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/"</js>)
<jk>public</jk> Collection<Photo> getAllPhotos(RestRequest req, RestResponse res) <jk>throws</jk> Exception {
- res.setProperty(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, <js>"Photo REST service"</js>);
- res.setProperty(HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, <js>"Use a tool like Poster to upload and retrieve jpeg and png images."</js>);
+ res.setPageTitle(<js>"Photo REST service"</js>);
+ res.setPageText(<js>"Use a tool like Poster to upload and retrieve jpeg and png images."</js>);
<jk>return</jk> photos.values();
}
@@ -3441,13 +3423,13 @@
<ja>@RestResource</ja>(
path=<js>"/addressBook"</js>,
messages=<js>"nls/AddressBookResource"</js>,
+ pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>,
properties={
<ja>@Property</ja>(name=<jsf>REST_allowMethodParam</jsf>, value=<js>"*"</js>),
<ja>@Property</ja>(name=<jsf>HTML_uriAnchorText</jsf>, value=<jsf>TO_STRING</jsf>),
<ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
<ja>@Property</ja>(name=<jsf>RDF_rdfxml_tab</jsf>, value=<js>"5"</js>),
<ja>@Property</ja>(name=<jsf>RDF_addRootProperty</jsf>, value=<js>"true"</js>),
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'$R{servletURI}?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.addressbook.AddressBookResource,org.apache.juneau.examples.addressbook.Address,org.apache.juneau.examples.addressbook.AddressBook,org.apache.juneau.examples.addressbook.CreateAddress,org.apache.juneau.examples.addressbook.CreatePerson,org.apache.juneau.examples.addressbook.IAddressBook,org.apache.juneau.examples.addressbook.Person)'}"</js>),
<jc>// Resolve all relative URIs so that they're relative to this servlet!</jc>
<ja>@Property</ja>(name=<jsf>SERIALIZER_relativeUriBase</jsf>, value=<js>"$R{servletURI}"</js>),
},
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/serializer/SerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/SerializerSession.html b/content/site/apidocs/org/apache/juneau/serializer/SerializerSession.html
index a60084d..927d996 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/SerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/SerializerSession.html
@@ -440,7 +440,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html b/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html
index 43ce65c..9c6c885 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/serializer/SerializerWriter.html" target="_top">Frames</a></li>
@@ -900,7 +900,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/serializer/SerializerWriter.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/serializer/StringObject.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/StringObject.html b/content/site/apidocs/org/apache/juneau/serializer/StringObject.html
deleted file mode 100644
index a94761c..0000000
--- a/content/site/apidocs/org/apache/juneau/serializer/StringObject.html
+++ /dev/null
@@ -1,411 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>StringObject (Apache Juneau (incubating) 6.1.1-incubating-SNAPSHOT)</title>
-<link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
- try {
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="StringObject (Apache Juneau (incubating) 6.1.1-incubating-SNAPSHOT)";
- }
- }
- catch(err) {
- }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!-- -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!-- -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/serializer/StringObject.html" target="_top">Frames</a></li>
-<li><a href="StringObject.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_top");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li>Field | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!-- -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau.serializer</div>
-<h2 title="Class StringObject" class="title">Class StringObject</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.serializer.StringObject</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>, <a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/serializer/StringObject.html#line.32">StringObject</a>
-extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
-implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>, <a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a></pre>
-<div class="block">A serializer/object pair used for delayed object serialization.
- <p>
- Useful in certain conditions such as logging when you don't want to needlessly serialize objects.
- <p>
- Instances of this method are created by the <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html#toStringObject-java.lang.Object-"><code>WriterSerializer.toStringObject(Object)</code></a> method.
-
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
- <jc>// The POJO will not be serialized unless DEBUG is enabled.</jc>
- logger.log(<jsf>DEBUG</jsf>, <js>"Object contents are: {0}"</js>, JsonSerializer.<jsf>DEFAULT</jsf>.toObjectString(myPojo));
- </p></div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!-- -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/StringObject.html#StringObject-org.apache.juneau.serializer.WriterSerializer-java.lang.Object-">StringObject</a></span>(<a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a> s,
- <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> o)</code>
-<div class="block">Constructor.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!-- -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>char</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/StringObject.html#charAt-int-">charAt</a></span>(int index)</code> </td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/StringObject.html#getMediaType--">getMediaType</a></span>()</code>
-<div class="block">Returns the serialized media type for this resource (e.g.</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/StringObject.html#length--">length</a></span>()</code> </td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/StringObject.html#subSequence-int-int-">subSequence</a></span>(int start,
- int end)</code> </td>
-</tr>
-<tr id="i4" 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/serializer/StringObject.html#toString--">toString</a></span>()</code> </td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/StringObject.html#writeTo-java.io.Writer-">writeTo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w)</code>
-<div class="block">Serialize this object to the specified writer.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!-- -->
-</a>
-<h3>Methods inherited from class java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <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>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang
/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.CharSequence">
-<!-- -->
-</a>
-<h3>Methods inherited from interface java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true#chars--" title="class or interface in java.lang">chars</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true#codePoints--" title="class or interface in java.lang">codePoints</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!-- -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="StringObject-org.apache.juneau.serializer.WriterSerializer-java.lang.Object-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>StringObject</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/serializer/StringObject.html#line.43">StringObject</a>(<a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a> s,
- <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> o)</pre>
-<div class="block">Constructor.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>s</code> - The serializer to use to serialize the object.</dd>
-<dd><code>o</code> - The object to be serialized.</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!-- -->
-</a>
-<h3>Method Detail</h3>
-<a name="toString--">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>toString</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/serializer/StringObject.html#line.49">toString</a>()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code> in interface <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a></code></dd>
-<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#toString--" title="class or interface in java.lang">toString</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>
-</dl>
-</li>
-</ul>
-<a name="length--">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>length</h4>
-<pre>public int <a href="../../../../src-html/org/apache/juneau/serializer/StringObject.html#line.56">length</a>()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true#length--" title="class or interface in java.lang">length</a></code> in interface <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="charAt-int-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>charAt</h4>
-<pre>public char <a href="../../../../src-html/org/apache/juneau/serializer/StringObject.html#line.61">charAt</a>(int index)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true#charAt-int-" title="class or interface in java.lang">charAt</a></code> in interface <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="subSequence-int-int-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>subSequence</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a> <a href="../../../../src-html/org/apache/juneau/serializer/StringObject.html#line.66">subSequence</a>(int start,
- int end)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true#subSequence-int-int-" title="class or interface in java.lang">subSequence</a></code> in interface <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeTo-java.io.Writer-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeTo</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/serializer/StringObject.html#line.71">writeTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../org/apache/juneau/Writable.html#writeTo-java.io.Writer-">Writable</a></code></span></div>
-<div class="block">Serialize this object to the specified writer.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/Writable.html#writeTo-java.io.Writer-">writeTo</a></code> in interface <code><a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>w</code> - The writer to write to.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getMediaType--">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getMediaType</h4>
-<pre>public <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a> <a href="../../../../src-html/org/apache/juneau/serializer/StringObject.html#line.80">getMediaType</a>()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../org/apache/juneau/Writable.html#getMediaType--">Writable</a></code></span></div>
-<div class="block">Returns the serialized media type for this resource (e.g. <js>"text/html"</js>)</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/Writable.html#getMediaType--">getMediaType</a></code> in interface <code><a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a></code></dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The media type, or <jk>null</jk> if the media type is not known.</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!-- -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!-- -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/serializer/StringObject.html" target="_top">Frames</a></li>
-<li><a href="StringObject.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_bottom");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li>Field | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
[02/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html
index ad3974d..8804856 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html
@@ -29,684 +29,781 @@
<span class="sourceLineNo">021</span><a name="line.21"></a>
<span class="sourceLineNo">022</span>import org.apache.juneau.*;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import org.apache.juneau.encoders.Encoder;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.ini.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.jena.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.json.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.parser.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.rest.*;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.juneau.serializer.*;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.juneau.transform.*;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.juneau.utils.*;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.juneau.xml.*;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * Used to denote that a class is a REST resource and to associate metadata on it.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <p><a name="line.36"></a>
-<span class="sourceLineNo">037</span> * Usually used on a subclass of {@link RestServlet}, but can be used to annotate any class that you want to expose as a REST resource.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * Refer to <a class='doclink' href='../package-summary.html#TOC'>org.apache.juneau.rest</a> doc for information on using this class.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>@Documented<a name="line.41"></a>
-<span class="sourceLineNo">042</span>@Target(TYPE)<a name="line.42"></a>
-<span class="sourceLineNo">043</span>@Retention(RUNTIME)<a name="line.43"></a>
-<span class="sourceLineNo">044</span>@Inherited<a name="line.44"></a>
-<span class="sourceLineNo">045</span>public @interface RestResource {<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> * Identifies the location of the resource bundle for this class.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
-<span class="sourceLineNo">050</span> * This annotation is used to provide localized messages for the following methods:<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <ul><a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <li>{@link RestRequest#getMessage(String, Object...)}<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <li>{@link RestContext#getMessages()}<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * </ul><a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <p><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Refer to the {@link MessageBundle} class for a description of the message key formats<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * used in the properties file.<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <p><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * The value can be a relative path like <js>"nls/Messages"</js>, indicating to look for the<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * resource bundle <js>"com.foo.sample.nls.Messages"</js> if the resource class<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * is in <js>"com.foo.sample"</js>, or it can be an absolute path, like <js>"com.foo.sample.nls.Messages"</js><a name="line.61"></a>
-<span class="sourceLineNo">062</span> */<a name="line.62"></a>
-<span class="sourceLineNo">063</span> String messages() default "";<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span> /**<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * Class-level guards.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * <p><a name="line.67"></a>
-<span class="sourceLineNo">068</span> * Associates one or more {@link RestGuard RestGuards} with all REST methods defined<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * in this class.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * These guards get called immediately before execution of any REST method in this class.<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * <p><a name="line.71"></a>
-<span class="sourceLineNo">072</span> * Typically, guards will be used for permissions checking on the user making the request,<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * but it can also be used for other purposes like pre-call validation of a request.<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * <p><a name="line.74"></a>
-<span class="sourceLineNo">075</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addGuards(Class...)}/{@link RestConfig#addGuards(RestGuard...)} methods.<a name="line.75"></a>
-<span class="sourceLineNo">076</span> */<a name="line.76"></a>
-<span class="sourceLineNo">077</span> Class<? extends RestGuard>[] guards() default {};<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> /**<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * Class-level converters.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * <p><a name="line.81"></a>
-<span class="sourceLineNo">082</span> * Associates one or more {@link RestConverter converters} with a resource class.<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * These converters get called immediately after execution of the REST method in the same<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * order specified in the annotation.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * <p><a name="line.85"></a>
-<span class="sourceLineNo">086</span> * Can be used for performing post-processing on the response object before serialization.<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * <p><a name="line.87"></a>
-<span class="sourceLineNo">088</span> * Default converter implementations are provided in the <a class='doclink' href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * <p><a name="line.89"></a>
-<span class="sourceLineNo">090</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addConverters(Class...)}/{@link RestConfig#addConverters(RestConverter...)} methods.<a name="line.90"></a>
-<span class="sourceLineNo">091</span> */<a name="line.91"></a>
-<span class="sourceLineNo">092</span> Class<? extends RestConverter>[] converters() default {};<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> * Class-level bean filters.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * <p><a name="line.96"></a>
-<span class="sourceLineNo">097</span> * Shortcut to add bean filters to the bean contexts of the objects returned by the following methods:<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * <ul><a name="line.98"></a>
-<span class="sourceLineNo">099</span> * <li>{@link RestContext#getBeanContext()}<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * <li>{@link RestContext#getSerializers()}<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * <li>{@link RestContext#getParsers()}<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * </ul><a name="line.102"></a>
-<span class="sourceLineNo">103</span> * <p><a name="line.103"></a>
-<span class="sourceLineNo">104</span> * If the specified class is an instance of {@link BeanFilterBuilder}, then a filter built from that builder is added.<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * Any other classes are wrapped in a {@link InterfaceBeanFilterBuilder} to indicate that subclasses should<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * be treated as the specified class type.<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * <p><a name="line.107"></a>
-<span class="sourceLineNo">108</span> * The programmatic equivalent to this annotation is the {@link RestConfig#addBeanFilters(Class...)} method.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> */<a name="line.109"></a>
-<span class="sourceLineNo">110</span> Class<?>[] beanFilters() default {};<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> /**<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * Class-level POJO swaps.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * <p><a name="line.114"></a>
-<span class="sourceLineNo">115</span> * Shortcut to add POJO swaps to the bean contexts of the objects returned by the following methods:<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <ul><a name="line.116"></a>
-<span class="sourceLineNo">117</span> * <li>{@link RestContext#getBeanContext()}<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * <li>{@link RestContext#getSerializers()}<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * <li>{@link RestContext#getParsers()}<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * </ul><a name="line.120"></a>
-<span class="sourceLineNo">121</span> * <p><a name="line.121"></a>
-<span class="sourceLineNo">122</span> * If the specified class is an instance of {@link PojoSwap}, then that swap is added.<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * Any other classes are wrapped in a {@link SurrogateSwap}.<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * <p><a name="line.124"></a>
-<span class="sourceLineNo">125</span> * The programmatic equivalent to this annotation is the {@link RestConfig#addPojoSwaps(Class...)} method.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> */<a name="line.126"></a>
-<span class="sourceLineNo">127</span> Class<?>[] pojoSwaps() default {};<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * Class-level properties.<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * <p><a name="line.131"></a>
-<span class="sourceLineNo">132</span> * Shortcut for specifying class-level properties on this servlet to the objects returned by the following methods:<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * <ul><a name="line.133"></a>
-<span class="sourceLineNo">134</span> * <li>{@link RestContext#getBeanContext()}<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * <li>{@link RestContext#getSerializers()}<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * <li>{@link RestContext#getParsers()}<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * </ul><a name="line.137"></a>
-<span class="sourceLineNo">138</span> * <p><a name="line.138"></a>
-<span class="sourceLineNo">139</span> * Any of the following property names can be specified:<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * <ul><a name="line.140"></a>
-<span class="sourceLineNo">141</span> * <li>{@link RestContext}<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * <li>{@link BeanContext}<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * <li>{@link SerializerContext}<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * <li>{@link ParserContext}<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * <li>{@link JsonSerializerContext}<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * <li>{@link RdfSerializerContext}<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * <li>{@link RdfParserContext}<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * <li>{@link RdfCommonContext}<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * <li>{@link XmlSerializerContext}<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * <li>{@link XmlParserContext}<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * </ul><a name="line.151"></a>
-<span class="sourceLineNo">152</span> * <p><a name="line.152"></a>
-<span class="sourceLineNo">153</span> * Property values will be converted to the appropriate type.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * <p><a name="line.154"></a>
-<span class="sourceLineNo">155</span> * In some cases, properties can be overridden at runtime through the {@link RestResponse#setProperty(String, Object)} method<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * or through a {@link Properties @Properties} annotated method parameter.<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * <p><a name="line.157"></a>
-<span class="sourceLineNo">158</span> * The programmatic equivalent to this annotation are the {@link RestConfig#setProperty(String, Object)}/{@link RestConfig#setProperties(java.util.Map)} methods.<a name="line.158"></a>
-<span class="sourceLineNo">159</span> */<a name="line.159"></a>
-<span class="sourceLineNo">160</span> Property[] properties() default {};<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span> /**<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * Specifies a list of {@link Serializer} classes to add to the list of serializers available for this servlet.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * <p><a name="line.164"></a>
-<span class="sourceLineNo">165</span> * This annotation can only be used on {@link Serializer} classes that have no-arg constructors.<a name="line.165"></a>
-<span class="sourceLineNo">166</span> * <p><a name="line.166"></a>
-<span class="sourceLineNo">167</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addSerializers(Class...)}/{@link RestConfig#addSerializers(Serializer...)} methods.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> */<a name="line.168"></a>
-<span class="sourceLineNo">169</span> Class<? extends Serializer>[] serializers() default {};<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> /**<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * Specifies a list of {@link Parser} classes to add to the list of parsers available for this servlet.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * <p><a name="line.173"></a>
-<span class="sourceLineNo">174</span> * This annotation can only be used on {@link Parser} classes that have no-arg constructors.<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * <p><a name="line.175"></a>
-<span class="sourceLineNo">176</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addParsers(Class...)}/{@link RestConfig#addParsers(Parser...)} methods.<a name="line.176"></a>
-<span class="sourceLineNo">177</span> */<a name="line.177"></a>
-<span class="sourceLineNo">178</span> Class<? extends Parser>[] parsers() default {};<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> /**<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * Specifies a list of {@link ResponseHandler} classes that know how to convert POJOs returned<a name="line.181"></a>
-<span class="sourceLineNo">182</span> * by REST methods or set via {@link RestResponse#setOutput(Object)} into appropriate<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * HTTP responses.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> * <p><a name="line.184"></a>
-<span class="sourceLineNo">185</span> * See {@link ResponseHandler} for details.<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * <p><a name="line.186"></a>
-<span class="sourceLineNo">187</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addResponseHandlers(Class...)}/{@link RestConfig#addResponseHandlers(ResponseHandler...)} methods.<a name="line.187"></a>
-<span class="sourceLineNo">188</span> */<a name="line.188"></a>
-<span class="sourceLineNo">189</span> Class<? extends ResponseHandler>[] responseHandlers() default {};<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span> /**<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * Specifies a list of {@link Encoder} to associate with this servlet.<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * <p><a name="line.193"></a>
-<span class="sourceLineNo">194</span> * These can be used to enable various kinds of compression (e.g. <js>"gzip"</js>) on requests and responses.<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <p><a name="line.195"></a>
-<span class="sourceLineNo">196</span> * This annotation can only be used on {@link Encoder} classes that have no-arg constructors.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> *<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * <h5 class='section'>Example:</h5><a name="line.198"></a>
-<span class="sourceLineNo">199</span> * <p class='bcode'><a name="line.199"></a>
-<span class="sourceLineNo">200</span> * <jc>// Servlet with automated support for GZIP compression</jc><a name="line.200"></a>
-<span class="sourceLineNo">201</span> * <ja>@RestResource</ja>(encoders={GzipEncoder.<jk>class</jk>})<a name="line.201"></a>
-<span class="sourceLineNo">202</span> * <jk>public</jk> MyRestServlet <jk>extends</jk> RestServlet {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> * ...<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * }<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * </p><a name="line.205"></a>
-<span class="sourceLineNo">206</span> * <p><a name="line.206"></a>
-<span class="sourceLineNo">207</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addEncoders(Class...)}/{@link RestConfig#addEncoders(Encoder...)} methods.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> */<a name="line.208"></a>
-<span class="sourceLineNo">209</span> Class<? extends Encoder>[] encoders() default {};<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> /**<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * Specifies default values for request headers.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * <p><a name="line.213"></a>
-<span class="sourceLineNo">214</span> * Strings are of the format <js>"Header-Name: header-value"</js>.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * <p><a name="line.215"></a>
-<span class="sourceLineNo">216</span> * Affects values returned by {@link RestRequest#getHeader(String)} when the header is not present on the request.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> * <p><a name="line.217"></a>
-<span class="sourceLineNo">218</span> * The most useful reason for this annotation is to provide a default <code>Accept</code> header when one is not specified<a name="line.218"></a>
-<span class="sourceLineNo">219</span> * so that a particular default {@link Serializer} is picked.<a name="line.219"></a>
-<span class="sourceLineNo">220</span> * <p><a name="line.220"></a>
-<span class="sourceLineNo">221</span> * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).<a name="line.221"></a>
-<span class="sourceLineNo">222</span> *<a name="line.222"></a>
-<span class="sourceLineNo">223</span> * <h5 class='section'>Example:</h5><a name="line.223"></a>
-<span class="sourceLineNo">224</span> * <p class='bcode'><a name="line.224"></a>
-<span class="sourceLineNo">225</span> * <jc>// Assume "text/json" Accept value when Accept not specified</jc><a name="line.225"></a>
-<span class="sourceLineNo">226</span> * <ja>@RestResource</ja>(defaultRequestHeaders={<js>"Accept: text/json"</js>})<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * <jk>public</jk> MyRestServlet <jk>extends</jk> RestServlet {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * ...<a name="line.228"></a>
-<span class="sourceLineNo">229</span> * }<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * </p><a name="line.230"></a>
-<span class="sourceLineNo">231</span> * <p><a name="line.231"></a>
-<span class="sourceLineNo">232</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addDefaultRequestHeader(String, Object)}/{@link RestConfig#addDefaultRequestHeaders(String...)} methods.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> */<a name="line.233"></a>
-<span class="sourceLineNo">234</span> String[] defaultRequestHeaders() default {};<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> /**<a name="line.236"></a>
-<span class="sourceLineNo">237</span> * Specifies default values for response headers.<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * <p><a name="line.238"></a>
-<span class="sourceLineNo">239</span> * Strings are of the format <js>"Header-Name: header-value"</js>.<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * <p><a name="line.240"></a>
-<span class="sourceLineNo">241</span> * This is equivalent to calling {@link RestResponse#setHeader(String, String)} programmatically in each of the Java methods.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * <p><a name="line.242"></a>
-<span class="sourceLineNo">243</span> * The header value will not be set if the header value has already been specified (hence the 'default' in the name).<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * <p><a name="line.244"></a>
-<span class="sourceLineNo">245</span> * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).<a name="line.245"></a>
-<span class="sourceLineNo">246</span> *<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * <h5 class='section'>Example:</h5><a name="line.247"></a>
-<span class="sourceLineNo">248</span> * <p class='bcode'><a name="line.248"></a>
-<span class="sourceLineNo">249</span> * <jc>// Add a version header attribute to all responses</jc><a name="line.249"></a>
-<span class="sourceLineNo">250</span> * <ja>@RestResource</ja>(defaultResponseHeaders={<js>"X-Version: 1.0"</js>})<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * <jk>public</jk> MyRestServlet <jk>extends</jk> RestServlet {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * ...<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * </p><a name="line.254"></a>
-<span class="sourceLineNo">255</span> * <p><a name="line.255"></a>
-<span class="sourceLineNo">256</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addDefaultResponseHeader(String, Object)}/{@link RestConfig#addDefaultResponseHeaders(String...)} methods.<a name="line.256"></a>
-<span class="sourceLineNo">257</span> */<a name="line.257"></a>
-<span class="sourceLineNo">258</span> String[] defaultResponseHeaders() default {};<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> /**<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * Defines children of this resource.<a name="line.261"></a>
-<span class="sourceLineNo">262</span> * <p><a name="line.262"></a>
-<span class="sourceLineNo">263</span> * A REST child resource is simply another servlet that is initialized as part of the parent<a name="line.263"></a>
-<span class="sourceLineNo">264</span> * resource and has a servlet path directly under the parent servlet path.<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * The main advantage to defining servlets as REST children is that you do not need<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * to define them in the <code>web.xml</code> file of the web application.<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * This can cut down on the number of entries that show up in the <code>web.xml</code> file<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * if you are defining large numbers of servlets.<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * <p><a name="line.269"></a>
-<span class="sourceLineNo">270</span> * Child resources must specify a value for {@link #path()} that identifies the subpath of the<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * child resource relative to the parent path.<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * <p><a name="line.272"></a>
-<span class="sourceLineNo">273</span> * It should be noted that servlets can be nested arbitrarily deep using this technique (i.e. children can also have children).<a name="line.273"></a>
-<span class="sourceLineNo">274</span> *<a name="line.274"></a>
-<span class="sourceLineNo">275</span> * <dl><a name="line.275"></a>
-<span class="sourceLineNo">276</span> * <dt>Servlet initialization:</dt><a name="line.276"></a>
-<span class="sourceLineNo">277</span> * <dd><a name="line.277"></a>
-<span class="sourceLineNo">278</span> * <p><a name="line.278"></a>
-<span class="sourceLineNo">279</span> * A child resource will be initialized immediately after the parent servlet is initialized. The child resource<a name="line.279"></a>
-<span class="sourceLineNo">280</span> * receives the same servlet config as the parent resource. This allows configuration information such as<a name="line.280"></a>
-<span class="sourceLineNo">281</span> * servlet initialization parameters to filter to child resources.<a name="line.281"></a>
-<span class="sourceLineNo">282</span> * </p><a name="line.282"></a>
-<span class="sourceLineNo">283</span> * </dd><a name="line.283"></a>
-<span class="sourceLineNo">284</span> * <dt>Runtime behavior:</dt><a name="line.284"></a>
-<span class="sourceLineNo">285</span> * <dd><a name="line.285"></a>
-<span class="sourceLineNo">286</span> * <p><a name="line.286"></a>
-<span class="sourceLineNo">287</span> * As a rule, methods defined on the <code>HttpServletRequest</code> object will behave as if<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * the child servlet were deployed as a top-level resource under the child's servlet path.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * For example, the <code>getServletPath()</code> and <code>getPathInfo()</code> methods on the<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * <code>HttpServletRequest</code> object will behave as if the child resource were deployed<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * using the child's servlet path.<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * Therefore, the runtime behavior should be equivalent to deploying the child servlet in<a name="line.292"></a>
-<span class="sourceLineNo">293</span> * the <code>web.xml</code> file of the web application.<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * </p><a name="line.294"></a>
-<span class="sourceLineNo">295</span> * </dd><a name="line.295"></a>
-<span class="sourceLineNo">296</span> * </dl><a name="line.296"></a>
-<span class="sourceLineNo">297</span> * <p><a name="line.297"></a>
-<span class="sourceLineNo">298</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addChildResource(String, Object)}/{@link RestConfig#addChildResources(Class...)}/{@link RestConfig#addChildResources(Object...)} methods.<a name="line.298"></a>
-<span class="sourceLineNo">299</span> */<a name="line.299"></a>
-<span class="sourceLineNo">300</span> Class<?>[] children() default {};<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> /**<a name="line.302"></a>
-<span class="sourceLineNo">303</span> * Identifies the URL subpath relative to the parent resource.<a name="line.303"></a>
-<span class="sourceLineNo">304</span> * <p><a name="line.304"></a>
-<span class="sourceLineNo">305</span> * Typically, this annotation is only applicable to resources defined as children through the {@link #children()}<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * annotation. However, it may be used in other ways (e.g. defining paths for top-level resources in microservices).<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * <p><a name="line.307"></a>
-<span class="sourceLineNo">308</span> * This annotation is ignored on top-level servlets (i.e. servlets defined in <code>web.xml</code> files).<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * Therefore, implementers can optionally specify a path value for documentation purposes.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * <p><a name="line.310"></a>
-<span class="sourceLineNo">311</span> * The programmatic equivalent to this annotation is the {@link RestConfig#setPath(String)} method.<a name="line.311"></a>
-<span class="sourceLineNo">312</span> */<a name="line.312"></a>
-<span class="sourceLineNo">313</span> String path() default "";<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span> /**<a name="line.315"></a>
-<span class="sourceLineNo">316</span> * Optional servlet title.<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * <p><a name="line.317"></a>
-<span class="sourceLineNo">318</span> * It is used to populate the Swagger title field and to display on HTML pages.<a name="line.318"></a>
-<span class="sourceLineNo">319</span> * This value can be retrieved programmatically through the {@link RestRequest#getServletTitle()} method.<a name="line.319"></a>
-<span class="sourceLineNo">320</span> * <p><a name="line.320"></a>
-<span class="sourceLineNo">321</span> * The default value pulls the label from the <code>label</code> entry in the servlet resource bundle.<a name="line.321"></a>
-<span class="sourceLineNo">322</span> * (e.g. <js>"title = foo"</js> or <js>"MyServlet.title = foo"</js>).<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * <p><a name="line.323"></a>
-<span class="sourceLineNo">324</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * <p><a name="line.325"></a>
-<span class="sourceLineNo">326</span> * Corresponds to the swagger field <code>/info/title</code>.<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * <p><a name="line.327"></a>
-<span class="sourceLineNo">328</span> * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getTitle(RestRequest)} method.<a name="line.328"></a>
-<span class="sourceLineNo">329</span> */<a name="line.329"></a>
-<span class="sourceLineNo">330</span> String title() default "";<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span> /**<a name="line.332"></a>
-<span class="sourceLineNo">333</span> * Optional servlet description.<a name="line.333"></a>
-<span class="sourceLineNo">334</span> * <p><a name="line.334"></a>
-<span class="sourceLineNo">335</span> * It is used to populate the Swagger description field and to display on HTML pages.<a name="line.335"></a>
-<span class="sourceLineNo">336</span> * This value can be retrieved programmatically through the {@link RestRequest#getServletDescription()} method.<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * <p><a name="line.337"></a>
-<span class="sourceLineNo">338</span> * The default value pulls the description from the <code>description</code> entry in the servlet resource bundle.<a name="line.338"></a>
-<span class="sourceLineNo">339</span> * (e.g. <js>"description = foo"</js> or <js>"MyServlet.description = foo"</js>).<a name="line.339"></a>
-<span class="sourceLineNo">340</span> * <p><a name="line.340"></a>
-<span class="sourceLineNo">341</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.341"></a>
-<span class="sourceLineNo">342</span> * <p><a name="line.342"></a>
-<span class="sourceLineNo">343</span> * Corresponds to the swagger field <code>/info/description</code>.<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * <p><a name="line.344"></a>
-<span class="sourceLineNo">345</span> * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getDescription(RestRequest)} method.<a name="line.345"></a>
-<span class="sourceLineNo">346</span> */<a name="line.346"></a>
-<span class="sourceLineNo">347</span> String description() default "";<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> /**<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * Optional servlet terms-of-service for this API.<a name="line.350"></a>
-<span class="sourceLineNo">351</span> * <p><a name="line.351"></a>
-<span class="sourceLineNo">352</span> * It is used to populate the Swagger terms-of-service field.<a name="line.352"></a>
-<span class="sourceLineNo">353</span> * <p><a name="line.353"></a>
-<span class="sourceLineNo">354</span> * The default value pulls the description from the <code>termsOfService</code> entry in the servlet resource bundle.<a name="line.354"></a>
-<span class="sourceLineNo">355</span> * (e.g. <js>"termsOfService = foo"</js> or <js>"MyServlet.termsOfService = foo"</js>).<a name="line.355"></a>
-<span class="sourceLineNo">356</span> * <p><a name="line.356"></a>
-<span class="sourceLineNo">357</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * <p><a name="line.358"></a>
-<span class="sourceLineNo">359</span> * Corresponds to the swagger field <code>/info/termsOfService</code>.<a name="line.359"></a>
-<span class="sourceLineNo">360</span> * <p><a name="line.360"></a>
-<span class="sourceLineNo">361</span> * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getTermsOfService(RestRequest)} method.<a name="line.361"></a>
-<span class="sourceLineNo">362</span> */<a name="line.362"></a>
-<span class="sourceLineNo">363</span> String termsOfService() default "";<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> /**<a name="line.365"></a>
-<span class="sourceLineNo">366</span> * Optional contact information for the exposed API.<a name="line.366"></a>
-<span class="sourceLineNo">367</span> * <p><a name="line.367"></a>
-<span class="sourceLineNo">368</span> * It is used to populate the Swagger contact field and to display on HTML pages.<a name="line.368"></a>
-<span class="sourceLineNo">369</span> * <p><a name="line.369"></a>
-<span class="sourceLineNo">370</span> * A simplified JSON string with the following fields:<a name="line.370"></a>
-<span class="sourceLineNo">371</span> * <p class='bcode'><a name="line.371"></a>
-<span class="sourceLineNo">372</span> * {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * name: string,<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * url: string,<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * email: string<a name="line.375"></a>
-<span class="sourceLineNo">376</span> * }<a name="line.376"></a>
-<span class="sourceLineNo">377</span> * </p><a name="line.377"></a>
-<span class="sourceLineNo">378</span> * <p><a name="line.378"></a>
-<span class="sourceLineNo">379</span> * The default value pulls the description from the <code>contact</code> entry in the servlet resource bundle.<a name="line.379"></a>
-<span class="sourceLineNo">380</span> * (e.g. <js>"contact = {name:'John Smith',email:'john.smith@foo.bar'}"</js> or <js>"MyServlet.contact = {name:'John Smith',email:'john.smith@foo.bar'}"</js>).<a name="line.380"></a>
-<span class="sourceLineNo">381</span> *<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * <h5 class='section'>Example:</h5><a name="line.382"></a>
-<span class="sourceLineNo">383</span> * <p class='bcode'><a name="line.383"></a>
-<span class="sourceLineNo">384</span> * <ja>@RestResource</ja>(contact=<js>"{name:'John Smith',email:'john.smith@foo.bar'}"</js>)<a name="line.384"></a>
-<span class="sourceLineNo">385</span> * </p><a name="line.385"></a>
-<span class="sourceLineNo">386</span> * <p><a name="line.386"></a>
-<span class="sourceLineNo">387</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * <p><a name="line.388"></a>
-<span class="sourceLineNo">389</span> * Corresponds to the swagger field <code>/info/contact</code>.<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * <p><a name="line.390"></a>
-<span class="sourceLineNo">391</span> * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getContact(RestRequest)} method.<a name="line.391"></a>
-<span class="sourceLineNo">392</span> */<a name="line.392"></a>
-<span class="sourceLineNo">393</span> String contact() default "";<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span> /**<a name="line.395"></a>
-<span class="sourceLineNo">396</span> * Optional license information for the exposed API.<a name="line.396"></a>
-<span class="sourceLineNo">397</span> * <p><a name="line.397"></a>
-<span class="sourceLineNo">398</span> * It is used to populate the Swagger license field and to display on HTML pages.<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * <p><a name="line.399"></a>
-<span class="sourceLineNo">400</span> * A simplified JSON string with the following fields:<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * <p class='bcode'><a name="line.401"></a>
-<span class="sourceLineNo">402</span> * {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * name: string,<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * url: string<a name="line.404"></a>
-<span class="sourceLineNo">405</span> * }<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * </p><a name="line.406"></a>
-<span class="sourceLineNo">407</span> * <p><a name="line.407"></a>
-<span class="sourceLineNo">408</span> * The default value pulls the description from the <code>license</code> entry in the servlet resource bundle.<a name="line.408"></a>
-<span class="sourceLineNo">409</span> * (e.g. <js>"license = {name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js> or <js>"MyServlet.license = {name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>).<a name="line.409"></a>
-<span class="sourceLineNo">410</span> *<a name="line.410"></a>
-<span class="sourceLineNo">411</span> * <h5 class='section'>Example:</h5><a name="line.411"></a>
-<span class="sourceLineNo">412</span> * <p class='bcode'><a name="line.412"></a>
-<span class="sourceLineNo">413</span> * <ja>@RestResource</ja>(license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>)<a name="line.413"></a>
-<span class="sourceLineNo">414</span> * </p><a name="line.414"></a>
-<span class="sourceLineNo">415</span> * <p><a name="line.415"></a>
-<span class="sourceLineNo">416</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.416"></a>
-<span class="sourceLineNo">417</span> * <p><a name="line.417"></a>
-<span class="sourceLineNo">418</span> * Corresponds to the swagger field <code>/info/license</code>.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * <p><a name="line.419"></a>
-<span class="sourceLineNo">420</span> * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getLicense(RestRequest)} method.<a name="line.420"></a>
-<span class="sourceLineNo">421</span> */<a name="line.421"></a>
-<span class="sourceLineNo">422</span> String license() default "";<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span> /**<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * Provides the version of the application API (not to be confused with the specification version).<a name="line.425"></a>
-<span class="sourceLineNo">426</span> * <p><a name="line.426"></a>
-<span class="sourceLineNo">427</span> * It is used to populate the Swagger version field and to display on HTML pages.<a name="line.427"></a>
-<span class="sourceLineNo">428</span> * <p><a name="line.428"></a>
-<span class="sourceLineNo">429</span> * The default value pulls the description from the <code>version</code> entry in the servlet resource bundle.<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * (e.g. <js>"version = 2.0"</js> or <js>"MyServlet.version = 2.0"</js>).<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * <p><a name="line.431"></a>
-<span class="sourceLineNo">432</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.432"></a>
-<span class="sourceLineNo">433</span> * <p><a name="line.433"></a>
-<span class="sourceLineNo">434</span> * Corresponds to the swagger field <code>/info/version</code>.<a name="line.434"></a>
-<span class="sourceLineNo">435</span> * <p><a name="line.435"></a>
-<span class="sourceLineNo">436</span> * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getVersion(RestRequest)} method.<a name="line.436"></a>
-<span class="sourceLineNo">437</span> */<a name="line.437"></a>
-<span class="sourceLineNo">438</span> String version() default "";<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> /**<a name="line.440"></a>
-<span class="sourceLineNo">441</span> * Optional tagging information for the exposed API.<a name="line.441"></a>
-<span class="sourceLineNo">442</span> * <p><a name="line.442"></a>
-<span class="sourceLineNo">443</span> * It is used to populate the Swagger tags field and to display on HTML pages.<a name="line.443"></a>
-<span class="sourceLineNo">444</span> * <p><a name="line.444"></a>
-<span class="sourceLineNo">445</span> * A simplified JSON string with the following fields:<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * <p class='bcode'><a name="line.446"></a>
-<span class="sourceLineNo">447</span> * [<a name="line.447"></a>
-<span class="sourceLineNo">448</span> * {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> * name: string,<a name="line.449"></a>
-<span class="sourceLineNo">450</span> * description: string,<a name="line.450"></a>
-<span class="sourceLineNo">451</span> * externalDocs: {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> * description: string,<a name="line.452"></a>
-<span class="sourceLineNo">453</span> * url: string<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * }<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * }<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * ]<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * </p><a name="line.457"></a>
-<span class="sourceLineNo">458</span> * <p><a name="line.458"></a>
-<span class="sourceLineNo">459</span> * The default value pulls the description from the <code>tags</code> entry in the servlet resource bundle.<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * (e.g. <js>"tags = [{name:'Foo',description:'Foobar'}]"</js> or <js>"MyServlet.tags = [{name:'Foo',description:'Foobar'}]"</js>).<a name="line.460"></a>
-<span class="sourceLineNo">461</span> *<a name="line.461"></a>
-<span class="sourceLineNo">462</span> * <h5 class='section'>Example:</h5><a name="line.462"></a>
-<span class="sourceLineNo">463</span> * <p class='bcode'><a name="line.463"></a>
-<span class="sourceLineNo">464</span> * <ja>@RestResource</ja>(tags=<js>"[{name:'Foo',description:'Foobar'}]"</js>)<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * </p><a name="line.465"></a>
-<span class="sourceLineNo">466</span> * <p><a name="line.466"></a>
-<span class="sourceLineNo">467</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * <p><a name="line.468"></a>
-<span class="sourceLineNo">469</span> * Corresponds to the swagger field <code>/tags</code>.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * <p><a name="line.470"></a>
-<span class="sourceLineNo">471</span> * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getTags(RestRequest)} method.<a name="line.471"></a>
-<span class="sourceLineNo">472</span> */<a name="line.472"></a>
-<span class="sourceLineNo">473</span> String tags() default "";<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> /**<a name="line.475"></a>
-<span class="sourceLineNo">476</span> * Optional external documentation information for the exposed API.<a name="line.476"></a>
-<span class="sourceLineNo">477</span> * <p><a name="line.477"></a>
-<span class="sourceLineNo">478</span> * It is used to populate the Swagger external documentation field and to display on HTML pages.<a name="line.478"></a>
-<span class="sourceLineNo">479</span> * <p><a name="line.479"></a>
-<span class="sourceLineNo">480</span> * A simplified JSON string with the following fields:<a name="line.480"></a>
-<span class="sourceLineNo">481</span> * <p class='bcode'><a name="line.481"></a>
-<span class="sourceLineNo">482</span> * {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * description: string,<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * url: string<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * }<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * </p><a name="line.486"></a>
-<span class="sourceLineNo">487</span> * <p><a name="line.487"></a>
-<span class="sourceLineNo">488</span> * The default value pulls the description from the <code>externalDocs</code> entry in the servlet resource bundle.<a name="line.488"></a>
-<span class="sourceLineNo">489</span> * (e.g. <js>"externalDocs = {url:'http://juneau.apache.org'}"</js> or <js>"MyServlet.externalDocs = {url:'http://juneau.apache.org'}"</js>).<a name="line.489"></a>
-<span class="sourceLineNo">490</span> *<a name="line.490"></a>
-<span class="sourceLineNo">491</span> * <h5 class='section'>Example:</h5><a name="line.491"></a>
-<span class="sourceLineNo">492</span> * <p class='bcode'><a name="line.492"></a>
-<span class="sourceLineNo">493</span> * <ja>@RestResource</ja>(externalDocs=<js>"{url:'http://juneau.apache.org'}"</js>)<a name="line.493"></a>
-<span class="sourceLineNo">494</span> * </p><a name="line.494"></a>
-<span class="sourceLineNo">495</span> * <p><a name="line.495"></a>
-<span class="sourceLineNo">496</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.496"></a>
-<span class="sourceLineNo">497</span> * <p><a name="line.497"></a>
-<span class="sourceLineNo">498</span> * Corresponds to the swagger field <code>/tags</code>.<a name="line.498"></a>
-<span class="sourceLineNo">499</span> * <p><a name="line.499"></a>
-<span class="sourceLineNo">500</span> * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getExternalDocs(RestRequest)} method.<a name="line.500"></a>
-<span class="sourceLineNo">501</span> */<a name="line.501"></a>
-<span class="sourceLineNo">502</span> String externalDocs() default "";<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span> /**<a name="line.504"></a>
-<span class="sourceLineNo">505</span> * Optional location of configuration file for this servlet.<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * <p><a name="line.506"></a>
-<span class="sourceLineNo">507</span> * The configuration file .<a name="line.507"></a>
-<span class="sourceLineNo">508</span> * <p><a name="line.508"></a>
-<span class="sourceLineNo">509</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.509"></a>
-<span class="sourceLineNo">510</span> * <p><a name="line.510"></a>
-<span class="sourceLineNo">511</span> * The programmatic equivalent to this annotation is the {@link RestConfig#setConfigFile(ConfigFile)} method.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> */<a name="line.512"></a>
-<span class="sourceLineNo">513</span> String config() default "";<a name="line.513"></a>
-<span class="sourceLineNo">514</span><a name="line.514"></a>
-<span class="sourceLineNo">515</span> /**<a name="line.515"></a>
-<span class="sourceLineNo">516</span> * The stylesheet to use for HTML views.<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * <p><a name="line.517"></a>
-<span class="sourceLineNo">518</span> * The name is a path to a stylesheet located in either the classpath or working directory.<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * The resulting stylesheet becomes available through the servlet via the URL <js>"[servletpath]/style.css"</js>.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> * <p><a name="line.520"></a>
-<span class="sourceLineNo">521</span> * The default set of styles located in the <code>org.apache.juneau.rest.styles</code> package are:<a name="line.521"></a>
-<span class="sourceLineNo">522</span> * <ul class='spaced-list'><a name="line.522"></a>
-<span class="sourceLineNo">523</span> * <li><js>"styles/juneau.css"</js> - Theme based on Jazz look-and-feel.<a name="line.523"></a>
-<span class="sourceLineNo">524</span> * <li><js>"styles/devops.css"</js> - Theme based on IBM DevOps look-and-feel.<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * </ul><a name="line.525"></a>
-<span class="sourceLineNo">526</span> * <p><a name="line.526"></a>
-<span class="sourceLineNo">527</span> * The classpath search starts with the child servlet class and proceeds up the class hierarchy<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * chain. Since the {@link RestServlet} class is in the <code>org.apache.juneau.rest</code> package<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * and the predefined styles are in the <code>org.apache.juneau.rest.styles</code> package, the paths to<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * the predefined styles are prefixed with <js>"styles/"</js>.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * <p><a name="line.531"></a>
-<span class="sourceLineNo">532</span> * If the stylesheet cannot be found on the classpath, an attempt to look in the working directory<a name="line.532"></a>
-<span class="sourceLineNo">533</span> * for it will be made. This allows for stylesheets to be placed on the file system in the working<a name="line.533"></a>
-<span class="sourceLineNo">534</span> * directory.<a name="line.534"></a>
-<span class="sourceLineNo">535</span> * <p><a name="line.535"></a>
-<span class="sourceLineNo">536</span> * If the file cannot be located, the request to <js>"[servletpath]/style.css"</js> will return {@link HttpServletResponse#SC_NOT_FOUND}.<a name="line.536"></a>
-<span class="sourceLineNo">537</span> *<a name="line.537"></a>
-<span class="sourceLineNo">538</span> * <h5 class='section'>Example:</h5><a name="line.538"></a>
-<span class="sourceLineNo">539</span> * <p class='bcode'><a name="line.539"></a>
-<span class="sourceLineNo">540</span> * <jk>package</jk> com.foo.mypackage;<a name="line.540"></a>
-<span class="sourceLineNo">541</span> *<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * <ja>@RestResource</ja>(<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * stylesheet=<js>"mystyles/mycss.css"</js><a name="line.543"></a>
-<span class="sourceLineNo">544</span> * )<a name="line.544"></a>
-<span class="sourceLineNo">545</span> * <jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> * }<a name="line.546"></a>
-<span class="sourceLineNo">547</span> * </p><a name="line.547"></a>
-<span class="sourceLineNo">548</span> * <p><a name="line.548"></a>
-<span class="sourceLineNo">549</span> * In this example, the servlet will attempt to find the <code>mycss.css</code> file in the following ordered locations:<a name="line.549"></a>
-<span class="sourceLineNo">550</span> * </p><a name="line.550"></a>
-<span class="sourceLineNo">551</span> * <ol><a name="line.551"></a>
-<span class="sourceLineNo">552</span> * <li><code>com.foo.mypackage.mystyles</code> package.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * <li><code>org.apache.juneau.rest.mystyles</code> package (since <code>RestServletDefault</code> is in <code>org.apache.juneau.rest</code>).<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * <li><code>[working-dir]/mystyles</code> directory.<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * </ol><a name="line.555"></a>
-<span class="sourceLineNo">556</span> * <p><a name="line.556"></a>
-<span class="sourceLineNo">557</span> * Multiple stylesheets can be specified as a comma-delimited list.<a name="line.557"></a>
-<span class="sourceLineNo">558</span> * When multiple stylesheets are specified, their contents will be concatenated and return in the order specified<a name="line.558"></a>
-<span class="sourceLineNo">559</span> * in the list.<a name="line.559"></a>
-<span class="sourceLineNo">560</span> * <p><a name="line.560"></a>
-<span class="sourceLineNo">561</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addStyleSheet(Object...)}/{@link RestConfig#addStyleSheet(Class, String)} methods.<a name="line.561"></a>
-<span class="sourceLineNo">562</span> */<a name="line.562"></a>
-<span class="sourceLineNo">563</span> String stylesheet() default "";<a name="line.563"></a>
-<span class="sourceLineNo">564</span><a name="line.564"></a>
-<span class="sourceLineNo">565</span> /**<a name="line.565"></a>
-<span class="sourceLineNo">566</span> * The favicon to use for HTML views.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> * <p><a name="line.567"></a>
-<span class="sourceLineNo">568</span> * The name is a path to an icon file located in either the classpath or working directory in a similar way<a name="line.568"></a>
-<span class="sourceLineNo">569</span> * to how the {@link #stylesheet()} stylesheet is resolved.<a name="line.569"></a>
-<span class="sourceLineNo">570</span> * The resulting favicon becomes available in the servlet via the URL <js>"[servletpath]/favicon.ico"</js>.<a name="line.570"></a>
-<span class="sourceLineNo">571</span> * <p><a name="line.571"></a>
-<span class="sourceLineNo">572</span> * If the file cannot be located, the request to <js>"[servletpath]/favicon.ico"</js> will return {@link HttpServletResponse#SC_NOT_FOUND}.<a name="line.572"></a>
-<span class="sourceLineNo">573</span> *<a name="line.573"></a>
-<span class="sourceLineNo">574</span> * <h5 class='section'>Example:</h5><a name="line.574"></a>
-<span class="sourceLineNo">575</span> * <p class='bcode'><a name="line.575"></a>
-<span class="sourceLineNo">576</span> * <jk>package</jk> com.foo.mypackage;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> *<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * <ja>@RestResource</ja>(<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * favicon=<js>"mydocs/myicon.ico"</js><a name="line.579"></a>
-<span class="sourceLineNo">580</span> * )<a name="line.580"></a>
-<span class="sourceLineNo">581</span> * <jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault {<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * }<a name="line.582"></a>
-<span class="sourceLineNo">583</span> * </p><a name="line.583"></a>
-<span class="sourceLineNo">584</span> * <p><a name="line.584"></a>
-<span class="sourceLineNo">585</span> * In this example, the servlet will attempt to find the <code>myicon.ico</code> file in the following ordered locations:<a name="line.585"></a>
-<span class="sourceLineNo">586</span> * </p><a name="line.586"></a>
-<span class="sourceLineNo">587</span> * <ol><a name="line.587"></a>
-<span class="sourceLineNo">588</span> * <li><code>com.foo.mypackage.mydocs</code> package.<a name="line.588"></a>
-<span class="sourceLineNo">589</span> * <li><code>org.apache.juneau.rest.mydocs</code> package (since <code>RestServletDefault</code> is in <code>org.apache.juneau.rest</code>).<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * <li><code>[working-dir]/mydocs</code> directory.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * </ol><a name="line.591"></a>
-<span class="sourceLineNo">592</span> * <p><a name="line.592"></a>
-<span class="sourceLineNo">593</span> * The programmatic equivalent to this annotation are the {@link RestConfig#setFavIcon(Object)}/{@link RestConfig#setFavIcon(Class, String)} methods.<a name="line.593"></a>
-<span class="sourceLineNo">594</span> */<a name="line.594"></a>
-<span class="sourceLineNo">595</span> String favicon() default "";<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span> /**<a name="line.597"></a>
-<span class="sourceLineNo">598</span> * Defines paths and locations of statically served files.<a name="line.598"></a>
-<span class="sourceLineNo">599</span> * <p><a name="line.599"></a>
-<span class="sourceLineNo">600</span> * This is a JSON map of paths to packages/directories located on either the classpath or working directory.<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * <p><a name="line.601"></a>
-<span class="sourceLineNo">602</span> * Mappings are cumulative from parent to child. Child resources can override mappings made on parent resources.<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * <p><a name="line.603"></a>
-<span class="sourceLineNo">604</span> * If the file cannot be located, the request will return {@link HttpServletResponse#SC_NOT_FOUND}.<a name="line.604"></a>
-<span class="sourceLineNo">605</span> *<a name="line.605"></a>
-<span class="sourceLineNo">606</span> * <h5 class='section'>Example:</h5><a name="line.606"></a>
-<span class="sourceLineNo">607</span> * <p class='bcode'><a name="line.607"></a>
-<span class="sourceLineNo">608</span> * <jk>package</jk> com.foo.mypackage;<a name="line.608"></a>
-<span class="sourceLineNo">609</span> *<a name="line.609"></a>
-<span class="sourceLineNo">610</span> * <ja>@RestResource</ja>(<a name="line.610"></a>
-<span class="sourceLineNo">611</span> * path=<js>"/myresource"</js>,<a name="line.611"></a>
-<span class="sourceLineNo">612</span> * staticFiles=<js>"{htdocs:'docs'}"</js><a name="line.612"></a>
-<span class="sourceLineNo">613</span> * )<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * <jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault {<a name="line.614"></a>
-<span class="sourceLineNo">615</span> * }<a name="line.615"></a>
-<span class="sourceLineNo">616</span> * </p><a name="line.616"></a>
-<span class="sourceLineNo">617</span> * <p><a name="line.617"></a>
-<span class="sourceLineNo">618</span> * In this example, given a GET request to <code>/myresource/htdocs/foobar.html</code>, the servlet will attempt to find the <code>foobar.html</code> file<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * in the following ordered locations:<a name="line.619"></a>
-<span class="sourceLineNo">620</span> * </p><a name="line.620"></a>
-<span class="sourceLineNo">621</span> * <ol><a name="line.621"></a>
-<span class="sourceLineNo">622</span> * <li><code>com.foo.mypackage.docs</code> package.<a name="line.622"></a>
-<span class="sourceLineNo">623</span> * <li><code>org.apache.juneau.rest.docs</code> package (since <code>RestServletDefault</code> is in <code>org.apache.juneau.rest</code>).<a name="line.623"></a>
-<span class="sourceLineNo">624</span> * <li><code>[working-dir]/docs</code> directory.<a name="line.624"></a>
-<span class="sourceLineNo">625</span> * </ol><a name="line.625"></a>
-<span class="sourceLineNo">626</span> * <p><a name="line.626"></a>
-<span class="sourceLineNo">627</span> * The programmatic equivalent to this annotation is the {@link RestConfig#addStaticFiles(Class, String)} method.<a name="line.627"></a>
-<span class="sourceLineNo">628</span> */<a name="line.628"></a>
-<span class="sourceLineNo">629</span> String staticFiles() default "";<a name="line.629"></a>
-<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span> /**<a name="line.631"></a>
-<span class="sourceLineNo">632</span> * Specifies the HTTP header name used to identify the client version.<a name="line.632"></a>
-<span class="sourceLineNo">633</span> * <p><a name="line.633"></a>
-<span class="sourceLineNo">634</span> * The client version is used to support backwards compatibility for breaking REST interface<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * changes. Used in conjunction with {@link RestMethod#clientVersion()} annotation.<a name="line.635"></a>
-<span class="sourceLineNo">636</span> * <p><a name="line.636"></a>
-<span class="sourceLineNo">637</span> * If not specified, uses <js>"X-Client-Version"</js>.<a name="line.637"></a>
-<span class="sourceLineNo">638</span> * <p><a name="line.638"></a>
-<span class="sourceLineNo">639</span> * The programmatic equivalent to this annotation is the {@link RestConfig#setClientVersionHeader(String)} method.<a name="line.639"></a>
-<span class="sourceLineNo">640</span> */<a name="line.640"></a>
-<span class="sourceLineNo">641</span> String clientVersionHeader() default "";<a name="line.641"></a>
-<span class="sourceLineNo">642</span><a name="line.642"></a>
-<span class="sourceLineNo">643</span> /**<a name="line.643"></a>
-<span class="sourceLineNo">644</span> * Specifies the resolver class to use for resolving child resources by class name.<a name="line.644"></a>
-<span class="sourceLineNo">645</span> * <p><a name="line.645"></a>
-<span class="sourceLineNo">646</span> * The default implementation simply instantiates the class using one of the following constructors:<a name="line.646"></a>
-<span class="sourceLineNo">647</span> * <ul><a name="line.647"></a>
-<span class="sourceLineNo">648</span> * <li><code><jk>public</jk> T(RestConfig)</code><a name="line.648"></a>
-<span class="sourceLineNo">649</span> * <li><code><jk>public</jk> T()</code><a name="line.649"></a>
-<span class="sourceLineNo">650</span> * </ul><a name="line.650"></a>
-<span class="sourceLineNo">651</span> * The former constructor can be used to get access to the {@link RestConfig} object to get access to the<a name="line.651"></a>
-<span class="sourceLineNo">652</span> * config file and initialization information or make programmatic modifications to the resource before<a name="line.652"></a>
-<span class="sourceLineNo">653</span> * full initialization.<a name="line.653"></a>
-<span class="sourceLineNo">654</span> * <p><a name="line.654"></a>
-<span class="sourceLineNo">655</span> * Non-<code>RestServlet</code> classes can also add the following two methods to get access to the<a name="line.655"></a>
-<span class="sourceLineNo">656</span> * {@link RestConfig} and {@link RestContext} objects:<a name="line.656"></a>
-<span class="sourceLineNo">657</span> * <ul><a name="line.657"></a>
-<span class="sourceLineNo">658</span> * <li><jk>public void</jk> init(RestConfig);</code><a name="line.658"></a>
-<span class="sourceLineNo">659</span> * <li><jk>public void</jk> init(RestContext);</code><a name="line.659"></a>
-<span class="sourceLineNo">660</span> * </ul><a name="line.660"></a>
-<span class="sourceLineNo">661</span> * <p><a name="line.661"></a>
-<span class="sourceLineNo">662</span> * Subclasses can be used to provide customized resolution of REST resource class instances.<a name="line.662"></a>
-<span class="sourceLineNo">663</span> * <p><a name="line.663"></a>
-<span class="sourceLineNo">664</span> * The programmatic equivalent to this annotation are the {@link RestConfig#setResourceResolver(Class)}/{@link RestConfig#setResourceResolver(RestResourceResolver)} methods.<a name="line.664"></a>
-<span class="sourceLineNo">665</span> */<a name="line.665"></a>
-<span class="sourceLineNo">666</span> Class<? extends RestResourceResolver> resourceResolver() default RestResourceResolver.class;<a name="line.666"></a>
-<span class="sourceLineNo">667</span><a name="line.667"></a>
-<span class="sourceLineNo">668</span> /**<a name="line.668"></a>
-<span class="sourceLineNo">669</span> * Specifies the logger class to use for logging.<a name="line.669"></a>
-<span class="sourceLineNo">670</span> * <p><a name="line.670"></a>
-<span class="sourceLineNo">671</span> * The default logger performs basic error logging to the Java logger.<a name="line.671"></a>
-<span class="sourceLineNo">672</span> * Subclasses can be used to customize logging behavior on the resource.<a name="line.672"></a>
-<span class="sourceLineNo">673</span> * <p><a name="line.673"></a>
-<span class="sourceLineNo">674</span> * The programmatic equivalent to this annotation are the {@link RestConfig#setLogger(Class)}/{@link RestConfig#setLogger(RestLogger)} methods.<a name="line.674"></a>
-<span class="sourceLineNo">675</span> */<a name="line.675"></a>
-<span class="sourceLineNo">676</span> Class<? extends RestLogger> logger() default RestLogger.Normal.class;<a name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span> /**<a name="line.678"></a>
-<span class="sourceLineNo">679</span> * Specifies the REST call handler class.<a name="line.679"></a>
-<span class="sourceLineNo">680</span> * <p><a name="line.680"></a>
-<span class="sourceLineNo">681</span> * This class handles the basic lifecycle of an HTTP REST call.<a name="line.681"></a>
-<span class="sourceLineNo">682</span> * Subclasses can be used to customize how these HTTP calls are handled.<a name="line.682"></a>
-<span class="sourceLineNo">683</span> * <p><a name="line.683"></a>
-<span class="sourceLineNo">684</span> * The programmatic equivalent to this annotation are the {@link RestConfig#setCallHandler(Class)}/{@link RestConfig#setCallHandler(RestCallHandler)} methods.<a name="line.684"></a>
-<span class="sourceLineNo">685</span> */<a name="line.685"></a>
-<span class="sourceLineNo">686</span> Class<? extends RestCallHandler> callHandler() default RestCallHandler.class;<a name="line.686"></a>
-<span class="sourceLineNo">687</span><a name="line.687"></a>
-<span class="sourceLineNo">688</span> /**<a name="line.688"></a>
-<span class="sourceLineNo">689</span> * Specifies the class used to retrieve title/description/swagger information about a resource.<a name="line.689"></a>
-<span class="sourceLineNo">690</span> * <p><a name="line.690"></a>
-<span class="sourceLineNo">691</span> * Subclasses can be used to customize the documentation on a resource.<a name="line.691"></a>
-<span class="sourceLineNo">692</span> * <p><a name="line.692"></a>
-<span class="sourceLineNo">693</span> * The programmatic equivalent to this annotation are the {@link RestConfig#setInfoProvider(Class)}/{@link RestConfig#setInfoProvider(RestInfoProvider)} methods.<a name="line.693"></a>
-<span class="sourceLineNo">694</span> */<a name="line.694"></a>
-<span class="sourceLineNo">695</span> Class<? extends RestInfoProvider> infoProvider() default RestInfoProvider.class;<a name="line.695"></a>
-<span class="sourceLineNo">696</span><a name="line.696"></a>
-<span class="sourceLineNo">697</span> /**<a name="line.697"></a>
-<span class="sourceLineNo">698</span> * TODO<a name="line.698"></a>
-<span class="sourceLineNo">699</span> */<a name="line.699"></a>
-<span class="sourceLineNo">700</span> String[] links() default "";<a name="line.700"></a>
-<span class="sourceLineNo">701</span>}<a name="line.701"></a>
+<span class="sourceLineNo">024</span>import org.apache.juneau.html.*;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.juneau.ini.*;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.juneau.jena.*;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.juneau.json.*;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.juneau.parser.*;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.juneau.rest.*;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.juneau.serializer.*;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.juneau.transform.*;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.juneau.utils.*;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.juneau.xml.*;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * Used to denote that a class is a REST resource and to associate metadata on it.<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <p><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * Usually used on a subclass of {@link RestServlet}, but can be used to annotate any class that you want to expose as a REST resource.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * Refer to <a class='doclink' href='../package-summary.html#TOC'>org.apache.juneau.rest</a> doc for information on using this class.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> */<a name="line.41"></a>
+<span class="sourceLineNo">042</span>@Documented<a name="line.42"></a>
+<span class="sourceLineNo">043</span>@Target(TYPE)<a name="line.43"></a>
+<span class="sourceLineNo">044</span>@Retention(RUNTIME)<a name="line.44"></a>
+<span class="sourceLineNo">045</span>@Inherited<a name="line.45"></a>
+<span class="sourceLineNo">046</span>public @interface RestResource {<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> * Identifies the location of the resource bundle for this class.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * <p><a name="line.50"></a>
+<span class="sourceLineNo">051</span> * This annotation is used to provide localized messages for the following methods:<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * <ul><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * <li>{@link RestRequest#getMessage(String, Object...)}<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <li>{@link RestContext#getMessages()}<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * </ul><a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <p><a name="line.56"></a>
+<span class="sourceLineNo">057</span> * Refer to the {@link MessageBundle} class for a description of the message key formats<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * used in the properties file.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <p><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * The value can be a relative path like <js>"nls/Messages"</js>, indicating to look for the<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * resource bundle <js>"com.foo.sample.nls.Messages"</js> if the resource class<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * is in <js>"com.foo.sample"</js>, or it can be an absolute path, like <js>"com.foo.sample.nls.Messages"</js><a name="line.62"></a>
+<span class="sourceLineNo">063</span> */<a name="line.63"></a>
+<span class="sourceLineNo">064</span> String messages() default "";<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * Class-level guards.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <p><a name="line.68"></a>
+<span class="sourceLineNo">069</span> * Associates one or more {@link RestGuard RestGuards} with all REST methods defined<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * in this class.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * These guards get called immediately before execution of any REST method in this class.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <p><a name="line.72"></a>
+<span class="sourceLineNo">073</span> * Typically, guards will be used for permissions checking on the user making the request,<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * but it can also be used for other purposes like pre-call validation of a request.<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * <p><a name="line.75"></a>
+<span class="sourceLineNo">076</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addGuards(Class...)}/{@link RestConfig#addGuards(RestGuard...)} methods.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> */<a name="line.77"></a>
+<span class="sourceLineNo">078</span> Class<? extends RestGuard>[] guards() default {};<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> /**<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * Class-level converters.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * <p><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * Associates one or more {@link RestConverter converters} with a resource class.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * These converters get called immediately after execution of the REST method in the same<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * order specified in the annotation.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * <p><a name="line.86"></a>
+<span class="sourceLineNo">087</span> * Can be used for performing post-processing on the response object before serialization.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <p><a name="line.88"></a>
+<span class="sourceLineNo">089</span> * Default converter implementations are provided in the <a class='doclink' href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * <p><a name="line.90"></a>
+<span class="sourceLineNo">091</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addConverters(Class...)}/{@link RestConfig#addConverters(RestConverter...)} methods.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> */<a name="line.92"></a>
+<span class="sourceLineNo">093</span> Class<? extends RestConverter>[] converters() default {};<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> * Class-level bean filters.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * <p><a name="line.97"></a>
+<span class="sourceLineNo">098</span> * Shortcut to add bean filters to the bean contexts of the objects returned by the following methods:<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * <ul><a name="line.99"></a>
+<span class="sourceLineNo">100</span> * <li>{@link RestContext#getBeanContext()}<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * <li>{@link RestContext#getSerializers()}<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * <li>{@link RestContext#getParsers()}<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * </ul><a name="line.103"></a>
+<span class="sourceLineNo">104</span> * <p><a name="line.104"></a>
+<span class="sourceLineNo">105</span> * If the specified class is an instance of {@link BeanFilterBuilder}, then a filter built from that builder is added.<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * Any other classes are wrapped in a {@link InterfaceBeanFilterBuilder} to indicate that subclasses should<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * be treated as the specified class type.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * <p><a name="line.108"></a>
+<span class="sourceLineNo">109</span> * The programmatic equivalent to this annotation is the {@link RestConfig#addBeanFilters(Class...)} method.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> Class<?>[] beanFilters() default {};<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> /**<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * Class-level POJO swaps.<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <p><a name="line.115"></a>
+<span class="sourceLineNo">116</span> * Shortcut to add POJO swaps to the bean contexts of the objects returned by the following methods:<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <ul><a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <li>{@link RestContext#getBeanContext()}<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * <li>{@link RestContext#getSerializers()}<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * <li>{@link RestContext#getParsers()}<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * </ul><a name="line.121"></a>
+<span class="sourceLineNo">122</span> * <p><a name="line.122"></a>
+<span class="sourceLineNo">123</span> * If the specified class is an instance of {@link PojoSwap}, then that swap is added.<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * Any other classes are wrapped in a {@link SurrogateSwap}.<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * <p><a name="line.125"></a>
+<span class="sourceLineNo">126</span> * The programmatic equivalent to this annotation is the {@link RestConfig#addPojoSwaps(Class...)} method.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> */<a name="line.127"></a>
+<span class="sourceLineNo">128</span> Class<?>[] pojoSwaps() default {};<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span> /**<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * Class-level properties.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * <p><a name="line.132"></a>
+<span class="sourceLineNo">133</span> * Shortcut for specifying class-level properties on this servlet to the objects returned by the following methods:<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * <ul><a name="line.134"></a>
+<span class="sourceLineNo">135</span> * <li>{@link RestContext#getBeanContext()}<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * <li>{@link RestContext#getSerializers()}<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * <li>{@link RestContext#getParsers()}<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * </ul><a name="line.138"></a>
+<span class="sourceLineNo">139</span> * <p><a name="line.139"></a>
+<span class="sourceLineNo">140</span> * Any of the following property names can be specified:<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * <ul><a name="line.141"></a>
+<span class="sourceLineNo">142</span> * <li>{@link RestContext}<a name="line.142"></a>
+<span class="sourceLineNo">143</span> * <li>{@link BeanContext}<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * <li>{@link SerializerContext}<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * <li>{@link ParserContext}<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * <li>{@link JsonSerializerContext}<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * <li>{@link RdfSerializerContext}<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <li>{@link RdfParserContext}<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * <li>{@link RdfCommonContext}<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * <li>{@link XmlSerializerContext}<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * <li>{@link XmlParserContext}<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * </ul><a name="line.152"></a>
+<span class="sourceLineNo">153</span> * <p><a name="line.153"></a>
+<span class="sourceLineNo">154</span> * Property values will be converted to the appropriate type.<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * <p><a name="line.155"></a>
+<span class="sourceLineNo">156</span> * In some cases, properties can be overridden at runtime through the {@link RestResponse#setProperty(String, Object)} method<a
<TRUNCATED>
[15/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html
index af626d1..9100ae9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html
@@ -202,7 +202,7 @@
<span class="sourceLineNo">194</span> o = session.cast(m, pMeta, eType);<a name="line.194"></a>
<span class="sourceLineNo">195</span> } else {<a name="line.195"></a>
<span class="sourceLineNo">196</span> Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance() : new ObjectList(session));<a name="line.196"></a>
-<span class="sourceLineNo">197</span> o = parseIntoCollection2(session, r, l, sType.getElementType(), pMeta);<a name="line.197"></a>
+<span class="sourceLineNo">197</span> o = parseIntoCollection2(session, r, l, sType, pMeta);<a name="line.197"></a>
<span class="sourceLineNo">198</span> }<a name="line.198"></a>
<span class="sourceLineNo">199</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.199"></a>
<span class="sourceLineNo">200</span> BeanMap m = session.newBeanMap(outer, sType.getInnerClass());<a name="line.200"></a>
@@ -211,13 +211,13 @@
<span class="sourceLineNo">203</span> o = sType.newInstanceFromString(outer, parseString(session, r));<a name="line.203"></a>
<span class="sourceLineNo">204</span> } else if (sType.canCreateNewInstanceFromNumber(outer) && StringUtils.isFirstNumberChar((char)c)) {<a name="line.204"></a>
<span class="sourceLineNo">205</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(session, r, sType.getNewInstanceFromNumberClass()));<a name="line.205"></a>
-<span class="sourceLineNo">206</span> } else if (sType.isArray()) {<a name="line.206"></a>
+<span class="sourceLineNo">206</span> } else if (sType.isArray() || sType.isArgs()) {<a name="line.206"></a>
<span class="sourceLineNo">207</span> if (c == '{') {<a name="line.207"></a>
<span class="sourceLineNo">208</span> ObjectMap m = new ObjectMap(session);<a name="line.208"></a>
<span class="sourceLineNo">209</span> parseIntoMap2(session, r, m, string(), object(), pMeta);<a name="line.209"></a>
<span class="sourceLineNo">210</span> o = session.cast(m, pMeta, eType);<a name="line.210"></a>
<span class="sourceLineNo">211</span> } else {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> ArrayList l = (ArrayList)parseIntoCollection2(session, r, new ArrayList(), sType.getElementType(), pMeta);<a name="line.212"></a>
+<span class="sourceLineNo">212</span> ArrayList l = (ArrayList)parseIntoCollection2(session, r, new ArrayList(), sType, pMeta);<a name="line.212"></a>
<span class="sourceLineNo">213</span> o = session.toArray(sType, l);<a name="line.213"></a>
<span class="sourceLineNo">214</span> }<a name="line.214"></a>
<span class="sourceLineNo">215</span> } else if (c == '{') {<a name="line.215"></a>
@@ -407,456 +407,403 @@
<span class="sourceLineNo">399</span> throw new ParseException(session, "Could not find the end of the field name.");<a name="line.399"></a>
<span class="sourceLineNo">400</span> }<a name="line.400"></a>
<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span> private <E> Collection<E> parseIntoCollection2(JsonParserSession session, ParserReader r, Collection<E> l, ClassMeta<E> elementType, BeanPropertyMeta pMeta) throws Exception {<a name="line.402"></a>
+<span class="sourceLineNo">402</span> private <E> Collection<E> parseIntoCollection2(JsonParserSession session, ParserReader r, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.402"></a>
<span class="sourceLineNo">403</span><a name="line.403"></a>
<span class="sourceLineNo">404</span> int S0=0; // Looking for outermost [<a name="line.404"></a>
<span class="sourceLineNo">405</span> int S1=1; // Looking for starting [ or { or " or ' or LITERAL or ]<a name="line.405"></a>
<span class="sourceLineNo">406</span> int S2=2; // Looking for , or ]<a name="line.406"></a>
<span class="sourceLineNo">407</span> int S3=3; // Looking for starting [ or { or " or ' or LITERAL<a name="line.407"></a>
<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> int state = S0;<a name="line.409"></a>
-<span class="sourceLineNo">410</span> int c = 0;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> while (c != -1) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> c = r.read();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (state == S0) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> if (c == '[')<a name="line.414"></a>
-<span class="sourceLineNo">415</span> state = S1;<a name="line.415"></a>
-<span class="sourceLineNo">416</span> } else if (state == S1) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (c == ']') {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return l;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> skipCommentsAndSpace(session, r.unread());<a name="line.420"></a>
-<span class="sourceLineNo">421</span> } else if (c != -1) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> l.add(parseAnything(session, elementType, r.unread(), l, pMeta));<a name="line.422"></a>
-<span class="sourceLineNo">423</span> state = S2;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> }<a name="line.424"></a>
-<span class="sourceLineNo">425</span> } else if (state == S2) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> if (c == ',') {<a name="line.426"></a>
-<span class="sourceLineNo">427</span> state = S3;<a name="line.427"></a>
-<span class="sourceLineNo">428</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> skipCommentsAndSpace(session, r.unread());<a name="line.429"></a>
-<span class="sourceLineNo">430</span> } else if (c == ']') {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> return l;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> } else {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> break; // Invalid character found.<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span> } else if (state == S3) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (session.isCommentOrWhitespace(c)) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> skipCommentsAndSpace(session, r.unread());<a name="line.437"></a>
-<span class="sourceLineNo">438</span> } else if (c == ']') {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> break;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> } else if (c != -1) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> l.add(parseAnything(session, elementType, r.unread(), l, pMeta));<a name="line.441"></a>
-<span class="sourceLineNo">442</span> state = S2;<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> }<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> if (state == S0)<a name="line.446"></a>
-<span class="sourceLineNo">447</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.447"></a>
-<span class="sourceLineNo">448</span> if (state == S1)<a name="line.448"></a>
-<span class="sourceLineNo">449</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.449"></a>
-<span class="sourceLineNo">450</span> if (state == S2)<a name="line.450"></a>
-<span class="sourceLineNo">451</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.451"></a>
-<span class="sourceLineNo">452</span> if (state == S3)<a name="line.452"></a>
-<span class="sourceLineNo">453</span> throw new ParseException(session, "Unexpected trailing comma in array.");<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span> return null; // Unreachable.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> private Object[] parseArgs(JsonParserSession session, ParserReader r, ClassMeta<?>[] argTypes) throws Exception {<a name="line.458"></a>
+<span class="sourceLineNo">409</span> int argIndex = 0;<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span> int state = S0;<a name="line.411"></a>
+<span class="sourceLineNo">412</span> int c = 0;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> while (c != -1) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> c = r.read();<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (state == S0) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (c == '[')<a name="line.416"></a>
+<span class="sourceLineNo">417</span> state = S1;<a name="line.417"></a>
+<span class="sourceLineNo">418</span> } else if (state == S1) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> if (c == ']') {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return l;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> skipCommentsAndSpace(session, r.unread());<a name="line.422"></a>
+<span class="sourceLineNo">423</span> } else if (c != -1) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> l.add((E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), r.unread(), l, pMeta));<a name="line.424"></a>
+<span class="sourceLineNo">425</span> state = S2;<a name="line.425"></a>
+<span class="sourceLineNo">426</span> }<a name="line.426"></a>
+<span class="sourceLineNo">427</span> } else if (state == S2) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> if (c == ',') {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> state = S3;<a name="line.429"></a>
+<span class="sourceLineNo">430</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> skipCommentsAndSpace(session, r.unread());<a name="line.431"></a>
+<span class="sourceLineNo">432</span> } else if (c == ']') {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> return l;<a name="line.433"></a>
+<span class="sourceLineNo">434</span> } else {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> break; // Invalid character found.<a name="line.435"></a>
+<span class="sourceLineNo">436</span> }<a name="line.436"></a>
+<span class="sourceLineNo">437</span> } else if (state == S3) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (session.isCommentOrWhitespace(c)) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> skipCommentsAndSpace(session, r.unread());<a name="line.439"></a>
+<span class="sourceLineNo">440</span> } else if (c == ']') {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> break;<a name="line.441"></a>
+<span class="sourceLineNo">442</span> } else if (c != -1) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span> l.add((E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), r.unread(), l, pMeta));<a name="line.443"></a>
+<span class="sourceLineNo">444</span> state = S2;<a name="line.444"></a>
+<span class="sourceLineNo">445</span> }<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span> if (state == S0)<a name="line.448"></a>
+<span class="sourceLineNo">449</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (state == S1)<a name="line.450"></a>
+<span class="sourceLineNo">451</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.451"></a>
+<span class="sourceLineNo">452</span> if (state == S2)<a name="line.452"></a>
+<span class="sourceLineNo">453</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.453"></a>
+<span class="sourceLineNo">454</span> if (state == S3)<a name="line.454"></a>
+<span class="sourceLineNo">455</span> throw new ParseException(session, "Unexpected trailing comma in array.");<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span> return null; // Unreachable.<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> int S0=0; // Looking for outermost [<a name="line.460"></a>
-<span class="sourceLineNo">461</span> int S1=1; // Looking for starting [ or { or " or ' or LITERAL<a name="line.461"></a>
-<span class="sourceLineNo">462</span> int S2=2; // Looking for , or ]<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span> Object[] o = new Object[argTypes.length];<a name="line.464"></a>
-<span class="sourceLineNo">465</span> int i = 0;<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span> int state = S0;<a name="line.467"></a>
-<span class="sourceLineNo">468</span> int c = 0;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> while (c != -1) {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> c = r.read();<a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (state == S0) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> if (c == '[')<a name="line.472"></a>
-<span class="sourceLineNo">473</span> state = S1;<a name="line.473"></a>
-<span class="sourceLineNo">474</span> } else if (state == S1) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span> if (c == ']') {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return o;<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> skipCommentsAndSpace(session, r.unread());<a name="line.478"></a>
-<span class="sourceLineNo">479</span> } else {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> o[i] = parseAnything(session, argTypes[i], r.unread(), session.getOuter(), null);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> i++;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> state = S2;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> }<a name="line.483"></a>
-<span class="sourceLineNo">484</span> } else if (state == S2) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span> if (c == ',') {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> state = S1;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> skipCommentsAndSpace(session, r.unread());<a name="line.488"></a>
-<span class="sourceLineNo">489</span> } else if (c == ']') {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> return o;<a name="line.490"></a>
-<span class="sourceLineNo">491</span> }<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span> if (state == S0)<a name="line.494"></a>
-<span class="sourceLineNo">495</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.495"></a>
-<span class="sourceLineNo">496</span> if (state == S1)<a name="line.496"></a>
-<span class="sourceLineNo">497</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (state == S2)<a name="line.498"></a>
-<span class="sourceLineNo">499</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> return null; // Unreachable.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span> private <T> BeanMap<T> parseIntoBeanMap2(JsonParserSession session, ParserReader r, BeanMap<T> m) throws Exception {<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> int S0=0; // Looking for outer {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> int S1=1; // Looking for attrName start.<a name="line.507"></a>
-<span class="sourceLineNo">508</span> int S3=3; // Found attrName end, looking for :.<a name="line.508"></a>
-<span class="sourceLineNo">509</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.509"></a>
-<span class="sourceLineNo">510</span> int S5=5; // Looking for , or }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> int state = S0;<a name="line.512"></a>
-<span class="sourceLineNo">513</span> String currAttr = "";<a name="line.513"></a>
-<span class="sourceLineNo">514</span> int c = 0;<a name="line.514"></a>
-<span class="sourceLineNo">515</span> int currAttrLine = -1, currAttrCol = -1;<a name="line.515"></a>
-<span class="sourceLineNo">516</span> while (c != -1) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span> c = r.read();<a name="line.517"></a>
-<span class="sourceLineNo">518</span> if (state == S0) {<a name="line.518"></a>
-<span class="sourceLineNo">519</span> if (c == '{')<a name="line.519"></a>
-<span class="sourceLineNo">520</span> state = S1;<a name="line.520"></a>
-<span class="sourceLineNo">521</span> } else if (state == S1) {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> if (c == '}') {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> return m;<a name="line.523"></a>
-<span class="sourceLineNo">524</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span> skipCommentsAndSpace(session, r.unread());<a name="line.525"></a>
-<span class="sourceLineNo">526</span> } else {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> r.unread();<a name="line.527"></a>
-<span class="sourceLineNo">528</span> currAttrLine= r.getLine();<a name="line.528"></a>
-<span class="sourceLineNo">529</span> currAttrCol = r.getColumn();<a name="line.529"></a>
-<span class="sourceLineNo">530</span> currAttr = parseFieldName(session, r);<a name="line.530"></a>
-<span class="sourceLineNo">531</span> state = S3;<a name="line.531"></a>
-<span class="sourceLineNo">532</span> }<a name="line.532"></a>
-<span class="sourceLineNo">533</span> } else if (state == S3) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> if (c == ':')<a name="line.534"></a>
-<span class="sourceLineNo">535</span> state = S4;<a name="line.535"></a>
-<span class="sourceLineNo">536</span> } else if (state == S4) {<a name="line.536"></a>
-<span class="sourceLineNo">537</span> if (session.isCommentOrWhitespace(c)) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> skipCommentsAndSpace(session, r.unread());<a name="line.538"></a>
-<span class="sourceLineNo">539</span> } else {<a name="line.539"></a>
-<span class="sourceLineNo">540</span> if (! currAttr.equals(session.getBeanTypePropertyName())) {<a name="line.540"></a>
-<span class="sourceLineNo">541</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.541"></a>
-<span class="sourceLineNo">542</span> session.setCurrentProperty(pMeta);<a name="line.542"></a>
-<span class="sourceLineNo">543</span> if (pMeta == null) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.544"></a>
-<span class="sourceLineNo">545</span> parseAnything(session, object(), r.unread(), m.getBean(false), null); // Read content anyway to ignore it<a name="line.545"></a>
-<span class="sourceLineNo">546</span> } else {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.547"></a>
-<span class="sourceLineNo">548</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), pMeta);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> setName(cm, value, currAttr);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> pMeta.set(m, value);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span> session.setCurrentProperty(null);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> state = S5;<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span> } else if (state == S5) {<a name="line.556"></a>
-<span class="sourceLineNo">557</span> if (c == ',')<a name="line.557"></a>
-<span class="sourceLineNo">558</span> state = S1;<a name="line.558"></a>
-<span class="sourceLineNo">559</span> else if (session.isCommentOrWhitespace(c))<a name="line.559"></a>
-<span class="sourceLineNo">560</span> skipCommentsAndSpace(session, r.unread());<a name="line.560"></a>
-<span class="sourceLineNo">561</span> else if (c == '}') {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> return m;<a name="line.562"></a>
-<span class="sourceLineNo">563</span> }<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span> }<a name="line.565"></a>
-<span class="sourceLineNo">566</span> if (state == S0)<a name="line.566"></a>
-<span class="sourceLineNo">567</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.567"></a>
-<span class="sourceLineNo">568</span> if (state == S1)<a name="line.568"></a>
-<span class="sourceLineNo">569</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.569"></a>
-<span class="sourceLineNo">570</span> if (state == S3)<a name="line.570"></a>
-<span class="sourceLineNo">571</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.571"></a>
-<span class="sourceLineNo">572</span> if (state == S4)<a name="line.572"></a>
-<span class="sourceLineNo">573</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if (state == S5)<a name="line.574"></a>
-<span class="sourceLineNo">575</span> throw new ParseException(session, "Could not find '}' marking end of JSON object.");<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span> return null; // Unreachable.<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span><a name="line.579"></a>
-<span class="sourceLineNo">580</span> /*<a name="line.580"></a>
-<span class="sourceLineNo">581</span> * Starting from the specified position in the character array, returns the<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * position of the character " or '.<a name="line.582"></a>
-<span class="sourceLineNo">583</span> * If the string consists of a concatenation of strings (e.g. 'AAA' + "BBB"), this method<a name="line.583"></a>
-<span class="sourceLineNo">584</span> * will automatically concatenate the strings and return the result.<a name="line.584"></a>
-<span class="sourceLineNo">585</span> */<a name="line.585"></a>
-<span class="sourceLineNo">586</span> private String parseString(JsonParserSession session, ParserReader r) throws Exception {<a name="line.586"></a>
-<span class="sourceLineNo">587</span> r.mark();<a name="line.587"></a>
-<span class="sourceLineNo">588</span> int qc = r.read(); // The quote character being used (" or ')<a name="line.588"></a>
-<span class="sourceLineNo">589</span> if (qc != '"' && session.isStrict()) {<a name="line.589"></a>
-<span class="sourceLineNo">590</span> String msg = (qc == '\'' ? "Invalid quote character \"{0}\" being used." : "Did not find quote character marking beginning of string. Character=\"{0}\"");<a name="line.590"></a>
-<span class="sourceLineNo">591</span> throw new ParseException(session, msg, (char)qc);<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> final boolean isQuoted = (qc == '\'' || qc == '"');<a name="line.593"></a>
-<span class="sourceLineNo">594</span> String s = null;<a name="line.594"></a>
-<span class="sourceLineNo">595</span> boolean isInEscape = false;<a name="line.595"></a>
-<span class="sourceLineNo">596</span> int c = 0;<a name="line.596"></a>
-<span class="sourceLineNo">597</span> while (c != -1) {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> c = r.read();<a name="line.598"></a>
-<span class="sourceLineNo">599</span> // Strict syntax requires that all control characters be escaped.<a name="line.599"></a>
-<span class="sourceLineNo">600</span> if (session.isStrict() && c <= 0x1F)<a name="line.600"></a>
-<span class="sourceLineNo">601</span> throw new ParseException("Unescaped control character encountered: ''0x{0}''", String.format("%04X", c));<a name="line.601"></a>
-<span class="sourceLineNo">602</span> if (isInEscape) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> switch (c) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> case 'n': r.replace('\n'); break;<a name="line.604"></a>
-<span class="sourceLineNo">605</span> case 'r': r.replace('\r'); break;<a name="line.605"></a>
-<span class="sourceLineNo">606</span> case 't': r.replace('\t'); break;<a name="line.606"></a>
-<span class="sourceLineNo">607</span> case 'f': r.replace('\f'); break;<a name="line.607"></a>
-<span class="sourceLineNo">608</span> case 'b': r.replace('\b'); break;<a name="line.608"></a>
-<span class="sourceLineNo">609</span> case '\\': r.replace('\\'); break;<a name="line.609"></a>
-<span class="sourceLineNo">610</span> case '/': r.replace('/'); break;<a name="line.610"></a>
-<span class="sourceLineNo">611</span> case '\'': r.replace('\''); break;<a name="line.611"></a>
-<span class="sourceLineNo">612</span> case '"': r.replace('"'); break;<a name="line.612"></a>
-<span class="sourceLineNo">613</span> case 'u': {<a name="line.613"></a>
-<span class="sourceLineNo">614</span> String n = r.read(4);<a name="line.614"></a>
-<span class="sourceLineNo">615</span> try {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> r.replace(Integer.parseInt(n, 16), 6);<a name="line.616"></a>
-<span class="sourceLineNo">617</span> } catch (NumberFormatException e) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span> throw new ParseException(session, "Invalid Unicode escape sequence in string.");<a name="line.618"></a>
-<span class="sourceLineNo">619</span> }<a name="line.619"></a>
-<span class="sourceLineNo">620</span> break;<a name="line.620"></a>
-<span class="sourceLineNo">621</span> }<a name="line.621"></a>
-<span class="sourceLineNo">622</span> default:<a name="line.622"></a>
-<span class="sourceLineNo">623</span> throw new ParseException(session, "Invalid escape sequence in string.");<a name="line.623"></a>
-<span class="sourceLineNo">624</span> }<a name="line.624"></a>
-<span class="sourceLineNo">625</span> isInEscape = false;<a name="line.625"></a>
-<span class="sourceLineNo">626</span> } else {<a name="line.626"></a>
-<span class="sourceLineNo">627</span> if (c == '\\') {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> isInEscape = true;<a name="line.628"></a>
-<span class="sourceLineNo">629</span> r.delete();<a name="line.629"></a>
-<span class="sourceLineNo">630</span> } else if (isQuoted) {<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (c == qc) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> s = r.getMarked(1, -1);<a name="line.632"></a>
-<span class="sourceLineNo">633</span> break;<a name="line.633"></a>
-<span class="sourceLineNo">634</span> }<a name="line.634"></a>
-<span class="sourceLineNo">635</span> } else {<a name="line.635"></a>
-<span class="sourceLineNo">636</span> if (c == ',' || c == '}' || session.isWhitespace(c)) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span> s = r.getMarked(0, -1);<a name="line.637"></a>
-<span class="sourceLineNo">638</span> r.unread();<a name="line.638"></a>
-<span class="sourceLineNo">639</span> break;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> } else if (c == -1) {<a name="line.640"></a>
-<span class="sourceLineNo">641</span> s = r.getMarked(0, 0);<a name="line.641"></a>
-<span class="sourceLineNo">642</span> break;<a name="line.642"></a>
-<span class="sourceLineNo">643</span> }<a name="line.643"></a>
-<span class="sourceLineNo">644</span> }<a name="line.644"></a>
-<span class="sourceLineNo">645</span> }<a name="line.645"></a>
-<span class="sourceLineNo">646</span> }<a name="line.646"></a>
-<span class="sourceLineNo">647</span> if (s == null)<a name="line.647"></a>
-<span class="sourceLineNo">648</span> throw new ParseException(session, "Could not find expected end character ''{0}''.", (char)qc);<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span> // Look for concatenated string (i.e. whitespace followed by +).<a name="line.650"></a>
-<span class="sourceLineNo">651</span> skipCommentsAndSpace(session, r);<a name="line.651"></a>
-<span class="sourceLineNo">652</span> if (r.peek() == '+') {<a name="line.652"></a>
-<span class="sourceLineNo">653</span> if (session.isStrict())<a name="line.653"></a>
-<span class="sourceLineNo">654</span> throw new ParseException(session, "String concatenation detected.");<a name="line.654"></a>
-<span class="sourceLineNo">655</span> r.read(); // Skip past '+'<a name="line.655"></a>
-<span class="sourceLineNo">656</span> skipCommentsAndSpace(session, r);<a name="line.656"></a>
-<span class="sourceLineNo">657</span> s += parseString(session, r);<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> return session.trim(s); // End of input reached.<a name="line.659"></a>
-<span class="sourceLineNo">660</span> }<a name="line.660"></a>
-<span class="sourceLineNo">661</span><a name="line.661"></a>
-<span class="sourceLineNo">662</span> /*<a name="line.662"></a>
-<span class="sourceLineNo">663</span> * Looks for the keywords true, false, or null.<a name="line.663"></a>
-<span class="sourceLineNo">664</span> * Throws an exception if any of these keywords are not found at the specified position.<a name="line.664"></a>
-<span class="sourceLineNo">665</span> */<a name="line.665"></a>
-<span class="sourceLineNo">666</span> private static void parseKeyword(JsonParserSession session, String keyword, ParserReader r) throws Exception {<a name="line.666"></a>
-<span class="sourceLineNo">667</span> try {<a name="line.667"></a>
-<span class="sourceLineNo">668</span> String s = r.read(keyword.length());<a name="line.668"></a>
-<span class="sourceLineNo">669</span> if (s.equals(keyword))<a name="line.669"></a>
-<span class="sourceLineNo">670</span> return;<a name="line.670"></a>
-<span class="sourceLineNo">671</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.671"></a>
-<span class="sourceLineNo">672</span> } catch (IndexOutOfBoundsException e) {<a name="line.672"></a>
-<span class="sourceLineNo">673</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.673"></a>
-<span class="sourceLineNo">674</span> }<a name="line.674"></a>
-<span class="sourceLineNo">675</span> }<a name="line.675"></a>
-<span class="sourceLineNo">676</span><a name="line.676"></a>
-<span class="sourceLineNo">677</span> /*<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * Doesn't actually parse anything, but moves the position beyond any whitespace or comments.<a name="line.678"></a>
-<span class="sourceLineNo">679</span> * If positionOnNext is 'true', then the cursor will be set to the point immediately after<a name="line.679"></a>
-<span class="sourceLineNo">680</span> * the comments and whitespace. Otherwise, the cursor will be set to the last position of<a name="line.680"></a>
-<span class="sourceLineNo">681</span> * the comments and whitespace.<a name="line.681"></a>
-<span class="sourceLineNo">682</span> */<a name="line.682"></a>
-<span class="sourceLineNo">683</span> private static void skipCommentsAndSpace(JsonParserSession session, ParserReader r) throws Exception {<a name="line.683"></a>
-<span class="sourceLineNo">684</span> int c = 0;<a name="line.684"></a>
-<span class="sourceLineNo">685</span> while ((c = r.read()) != -1) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span> if (! session.isWhitespace(c)) {<a name="line.686"></a>
-<span class="sourceLineNo">687</span> if (c == '/') {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> if (session.isStrict())<a name="line.688"></a>
-<span class="sourceLineNo">689</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.689"></a>
-<span class="sourceLineNo">690</span> skipComments(session, r);<a name="line.690"></a>
-<span class="sourceLineNo">691</span> } else {<a name="line.691"></a>
-<span class="sourceLineNo">692</span> r.unread();<a name="line.692"></a>
-<span class="sourceLineNo">693</span> return;<a name="line.693"></a>
-<span class="sourceLineNo">694</span> }<a name="line.694"></a>
-<span class="sourceLineNo">695</span> }<a name="line.695"></a>
-<span class="sourceLineNo">696</span> }<a name="line.696"></a>
-<span class="sourceLineNo">697</span> }<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span> /*<a name="line.699"></a>
-<span class="sourceLineNo">700</span> * Doesn't actually parse anything, but moves the position beyond the construct "{wrapperAttr:" when<a name="line.700"></a>
-<span class="sourceLineNo">701</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.701"></a>
-<span class="sourceLineNo">702</span> */<a name="line.702"></a>
-<span class="sourceLineNo">703</span> private void skipWrapperAttrStart(JsonParserSession session, ParserReader r, String wrapperAttr) throws Exception {<a name="line.703"></a>
+<span class="sourceLineNo">460</span> private <T> BeanMap<T> parseIntoBeanMap2(JsonParserSession session, ParserReader r, BeanMap<T> m) throws Exception {<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
+<span class="sourceLineNo">462</span> int S0=0; // Looking for outer {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> int S1=1; // Looking for attrName start.<a name="line.463"></a>
+<span class="sourceLineNo">464</span> int S3=3; // Found attrName end, looking for :.<a name="line.464"></a>
+<span class="sourceLineNo">465</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.465"></a>
+<span class="sourceLineNo">466</span> int S5=5; // Looking for , or }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> int state = S0;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> String currAttr = "";<a name="line.469"></a>
+<span class="sourceLineNo">470</span> int c = 0;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> int currAttrLine = -1, currAttrCol = -1;<a name="line.471"></a>
+<span class="sourceLineNo">472</span> while (c != -1) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> c = r.read();<a name="line.473"></a>
+<span class="sourceLineNo">474</span> if (state == S0) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> if (c == '{')<a name="line.475"></a>
+<span class="sourceLineNo">476</span> state = S1;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> } else if (state == S1) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span> if (c == '}') {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> return m;<a name="line.479"></a>
+<span class="sourceLineNo">480</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> skipCommentsAndSpace(session, r.unread());<a name="line.481"></a>
+<span class="sourceLineNo">482</span> } else {<a name="line.482"></a>
+<span class="sourceLineNo">483</span> r.unread();<a name="line.483"></a>
+<span class="sourceLineNo">484</span> currAttrLine= r.getLine();<a name="line.484"></a>
+<span class="sourceLineNo">485</span> currAttrCol = r.getColumn();<a name="line.485"></a>
+<span class="sourceLineNo">486</span> currAttr = parseFieldName(session, r);<a name="line.486"></a>
+<span class="sourceLineNo">487</span> state = S3;<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> } else if (state == S3) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> if (c == ':')<a name="line.490"></a>
+<span class="sourceLineNo">491</span> state = S4;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> } else if (state == S4) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> if (session.isCommentOrWhitespace(c)) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span> skipCommentsAndSpace(session, r.unread());<a name="line.494"></a>
+<span class="sourceLineNo">495</span> } else {<a name="line.495"></a>
+<span class="sourceLineNo">496</span> if (! currAttr.equals(session.getBeanTypePropertyName())) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.497"></a>
+<span class="sourceLineNo">498</span> session.setCurrentProperty(pMeta);<a name="line.498"></a>
+<span class="sourceLineNo">499</span> if (pMeta == null) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> parseAnything(session, object(), r.unread(), m.getBean(false), null); // Read content anyway to ignore it<a name="line.501"></a>
+<span class="sourceLineNo">502</span> } else {<a name="line.502"></a>
+<span class="sourceLineNo">503</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.503"></a>
+<span class="sourceLineNo">504</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), pMeta);<a name="line.504"></a>
+<span class="sourceLineNo">505</span> setName(cm, value, currAttr);<a name="line.505"></a>
+<span class="sourceLineNo">506</span> pMeta.set(m, value);<a name="line.506"></a>
+<span class="sourceLineNo">507</span> }<a name="line.507"></a>
+<span class="sourceLineNo">508</span> session.setCurrentProperty(null);<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span> state = S5;<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span> } else if (state == S5) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (c == ',')<a name="line.513"></a>
+<span class="sourceLineNo">514</span> state = S1;<a name="line.514"></a>
+<span class="sourceLineNo">515</span> else if (session.isCommentOrWhitespace(c))<a name="line.515"></a>
+<span class="sourceLineNo">516</span> skipCommentsAndSpace(session, r.unread());<a name="line.516"></a>
+<span class="sourceLineNo">517</span> else if (c == '}') {<a name="line.517"></a>
+<span class="sourceLineNo">518</span> return m;<a name="line.518"></a>
+<span class="sourceLineNo">519</span> }<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> }<a name="line.521"></a>
+<span class="sourceLineNo">522</span> if (state == S0)<a name="line.522"></a>
+<span class="sourceLineNo">523</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.523"></a>
+<span class="sourceLineNo">524</span> if (state == S1)<a name="line.524"></a>
+<span class="sourceLineNo">525</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.525"></a>
+<span class="sourceLineNo">526</span> if (state == S3)<a name="line.526"></a>
+<span class="sourceLineNo">527</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.527"></a>
+<span class="sourceLineNo">528</span> if (state == S4)<a name="line.528"></a>
+<span class="sourceLineNo">529</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.529"></a>
+<span class="sourceLineNo">530</span> if (state == S5)<a name="line.530"></a>
+<span class="sourceLineNo">531</span> throw new ParseException(session, "Could not find '}' marking end of JSON object.");<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span> return null; // Unreachable.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> }<a name="line.534"></a>
+<span class="sourceLineNo">535</span><a name="line.535"></a>
+<span class="sourceLineNo">536</span> /*<a name="line.536"></a>
+<span class="sourceLineNo">537</span> * Starting from the specified position in the character array, returns the<a name="line.537"></a>
+<span class="sourceLineNo">538</span> * position of the character " or '.<a name="line.538"></a>
+<span class="sourceLineNo">539</span> * If the string consists of a concatenation of strings (e.g. 'AAA' + "BBB"), this method<a name="line.539"></a>
+<span class="sourceLineNo">540</span> * will automatically concatenate the strings and return the result.<a name="line.540"></a>
+<span class="sourceLineNo">541</span> */<a name="line.541"></a>
+<span class="sourceLineNo">542</span> private String parseString(JsonParserSession session, ParserReader r) throws Exception {<a name="line.542"></a>
+<span class="sourceLineNo">543</span> r.mark();<a name="line.543"></a>
+<span class="sourceLineNo">544</span> int qc = r.read(); // The quote character being used (" or ')<a name="line.544"></a>
+<span class="sourceLineNo">545</span> if (qc != '"' && session.isStrict()) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span> String msg = (qc == '\'' ? "Invalid quote character \"{0}\" being used." : "Did not find quote character marking beginning of string. Character=\"{0}\"");<a name="line.546"></a>
+<span class="sourceLineNo">547</span> throw new ParseException(session, msg, (char)qc);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> }<a name="line.548"></a>
+<span class="sourceLineNo">549</span> final boolean isQuoted = (qc == '\'' || qc == '"');<a name="line.549"></a>
+<span class="sourceLineNo">550</span> String s = null;<a name="line.550"></a>
+<span class="sourceLineNo">551</span> boolean isInEscape = false;<a name="line.551"></a>
+<span class="sourceLineNo">552</span> int c = 0;<a name="line.552"></a>
+<span class="sourceLineNo">553</span> while (c != -1) {<a name="line.553"></a>
+<span class="sourceLineNo">554</span> c = r.read();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> // Strict syntax requires that all control characters be escaped.<a name="line.555"></a>
+<span class="sourceLineNo">556</span> if (session.isStrict() && c <= 0x1F)<a name="line.556"></a>
+<span class="sourceLineNo">557</span> throw new ParseException("Unescaped control character encountered: ''0x{0}''", String.format("%04X", c));<a name="line.557"></a>
+<span class="sourceLineNo">558</span> if (isInEscape) {<a name="line.558"></a>
+<span class="sourceLineNo">559</span> switch (c) {<a name="line.559"></a>
+<span class="sourceLineNo">560</span> case 'n': r.replace('\n'); break;<a name="line.560"></a>
+<span class="sourceLineNo">561</span> case 'r': r.replace('\r'); break;<a name="line.561"></a>
+<span class="sourceLineNo">562</span> case 't': r.replace('\t'); break;<a name="line.562"></a>
+<span class="sourceLineNo">563</span> case 'f': r.replace('\f'); break;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> case 'b': r.replace('\b'); break;<a name="line.564"></a>
+<span class="sourceLineNo">565</span> case '\\': r.replace('\\'); break;<a name="line.565"></a>
+<span class="sourceLineNo">566</span> case '/': r.replace('/'); break;<a name="line.566"></a>
+<span class="sourceLineNo">567</span> case '\'': r.replace('\''); break;<a name="line.567"></a>
+<span class="sourceLineNo">568</span> case '"': r.replace('"'); break;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> case 'u': {<a name="line.569"></a>
+<span class="sourceLineNo">570</span> String n = r.read(4);<a name="line.570"></a>
+<span class="sourceLineNo">571</span> try {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> r.replace(Integer.parseInt(n, 16), 6);<a name="line.572"></a>
+<span class="sourceLineNo">573</span> } catch (NumberFormatException e) {<a name="line.573"></a>
+<span class="sourceLineNo">574</span> throw new ParseException(session, "Invalid Unicode escape sequence in string.");<a name="line.574"></a>
+<span class="sourceLineNo">575</span> }<a name="line.575"></a>
+<span class="sourceLineNo">576</span> break;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span> default:<a name="line.578"></a>
+<span class="sourceLineNo">579</span> throw new ParseException(session, "Invalid escape sequence in string.");<a name="line.579"></a>
+<span class="sourceLineNo">580</span> }<a name="line.580"></a>
+<span class="sourceLineNo">581</span> isInEscape = false;<a name="line.581"></a>
+<span class="sourceLineNo">582</span> } else {<a name="line.582"></a>
+<span class="sourceLineNo">583</span> if (c == '\\') {<a name="line.583"></a>
+<span class="sourceLineNo">584</span> isInEscape = true;<a name="line.584"></a>
+<span class="sourceLineNo">585</span> r.delete();<a name="line.585"></a>
+<span class="sourceLineNo">586</span> } else if (isQuoted) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span> if (c == qc) {<a name="line.587"></a>
+<span class="sourceLineNo">588</span> s = r.getMarked(1, -1);<a name="line.588"></a>
+<span class="sourceLineNo">589</span> break;<a name="line.589"></a>
+<span class="sourceLineNo">590</span> }<a name="line.590"></a>
+<span class="sourceLineNo">591</span> } else {<a name="line.591"></a>
+<span class="sourceLineNo">592</span> if (c == ',' || c == '}' || session.isWhitespace(c)) {<a name="line.592"></a>
+<span class="sourceLineNo">593</span> s = r.getMarked(0, -1);<a name="line.593"></a>
+<span class="sourceLineNo">594</span> r.unread();<a name="line.594"></a>
+<span class="sourceLineNo">595</span> break;<a name="line.595"></a>
+<span class="sourceLineNo">596</span> } else if (c == -1) {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> s = r.getMarked(0, 0);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> break;<a name="line.598"></a>
+<span class="sourceLineNo">599</span> }<a name="line.599"></a>
+<span class="sourceLineNo">600</span> }<a name="line.600"></a>
+<span class="sourceLineNo">601</span> }<a name="line.601"></a>
+<span class="sourceLineNo">602</span> }<a name="line.602"></a>
+<span class="sourceLineNo">603</span> if (s == null)<a name="line.603"></a>
+<span class="sourceLineNo">604</span> throw new ParseException(session, "Could not find expected end character ''{0}''.", (char)qc);<a name="line.604"></a>
+<span class="sourceLineNo">605</span><a name="line.605"></a>
+<span class="sourceLineNo">606</span> // Look for concatenated string (i.e. whitespace followed by +).<a name="line.606"></a>
+<span class="sourceLineNo">607</span> skipCommentsAndSpace(session, r);<a name="line.607"></a>
+<span class="sourceLineNo">608</span> if (r.peek() == '+') {<a name="line.608"></a>
+<span class="sourceLineNo">609</span> if (session.isStrict())<a name="line.609"></a>
+<span class="sourceLineNo">610</span> throw new ParseException(session, "String concatenation detected.");<a name="line.610"></a>
+<span class="sourceLineNo">611</span> r.read(); // Skip past '+'<a name="line.611"></a>
+<span class="sourceLineNo">612</span> skipCommentsAndSpace(session, r);<a name="line.612"></a>
+<span class="sourceLineNo">613</span> s += parseString(session, r);<a name="line.613"></a>
+<span class="sourceLineNo">614</span> }<a name="line.614"></a>
+<span class="sourceLineNo">615</span> return session.trim(s); // End of input reached.<a name="line.615"></a>
+<span class="sourceLineNo">616</span> }<a name="line.616"></a>
+<span class="sourceLineNo">617</span><a name="line.617"></a>
+<span class="sourceLineNo">618</span> /*<a name="line.618"></a>
+<span class="sourceLineNo">619</span> * Looks for the keywords true, false, or null.<a name="line.619"></a>
+<span class="sourceLineNo">620</span> * Throws an exception if any of these keywords are not found at the specified position.<a name="line.620"></a>
+<span class="sourceLineNo">621</span> */<a name="line.621"></a>
+<span class="sourceLineNo">622</span> private static void parseKeyword(JsonParserSession session, String keyword, ParserReader r) throws Exception {<a name="line.622"></a>
+<span class="sourceLineNo">623</span> try {<a name="line.623"></a>
+<span class="sourceLineNo">624</span> String s = r.read(keyword.length());<a name="line.624"></a>
+<span class="sourceLineNo">625</span> if (s.equals(keyword))<a name="line.625"></a>
+<span class="sourceLineNo">626</span> return;<a name="line.626"></a>
+<span class="sourceLineNo">627</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.627"></a>
+<span class="sourceLineNo">628</span> } catch (IndexOutOfBoundsException e) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.629"></a>
+<span class="sourceLineNo">630</span> }<a name="line.630"></a>
+<span class="sourceLineNo">631</span> }<a name="line.631"></a>
+<span class="sourceLineNo">632</span><a name="line.632"></a>
+<span class="sourceLineNo">633</span> /*<a name="line.633"></a>
+<span class="sourceLineNo">634</span> * Doesn't actually parse anything, but moves the position beyond any whitespace or comments.<a name="line.634"></a>
+<span class="sourceLineNo">635</span> * If positionOnNext is 'true', then the cursor will be set to the point immediately after<a name="line.635"></a>
+<span class="sourceLineNo">636</span> * the comments and whitespace. Otherwise, the cursor will be set to the last position of<a name="line.636"></a>
+<span class="sourceLineNo">637</span> * the comments and whitespace.<a name="line.637"></a>
+<span class="sourceLineNo">638</span> */<a name="line.638"></a>
+<span class="sourceLineNo">639</span> private static void skipCommentsAndSpace(JsonParserSession session, ParserReader r) throws Exception {<a name="line.639"></a>
+<span class="sourceLineNo">640</span> int c = 0;<a name="line.640"></a>
+<span class="sourceLineNo">641</span> while ((c = r.read()) != -1) {<a name="line.641"></a>
+<span class="sourceLineNo">642</span> if (! session.isWhitespace(c)) {<a name="line.642"></a>
+<span class="sourceLineNo">643</span> if (c == '/') {<a name="line.643"></a>
+<span class="sourceLineNo">644</span> if (session.isStrict())<a name="line.644"></a>
+<span class="sourceLineNo">645</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.645"></a>
+<span class="sourceLineNo">646</span> skipComments(session, r);<a name="line.646"></a>
+<span class="sourceLineNo">647</span> } else {<a name="line.647"></a>
+<span class="sourceLineNo">648</span> r.unread();<a name="line.648"></a>
+<span class="sourceLineNo">649</span> return;<a name="line.649"></a>
+<span class="sourceLineNo">650</span> }<a name="line.650"></a>
+<span class="sourceLineNo">651</span> }<a name="line.651"></a>
+<span class="sourceLineNo">652</span> }<a name="line.652"></a>
+<span class="sourceLineNo">653</span> }<a name="line.653"></a>
+<span class="sourceLineNo">654</span><a name="line.654"></a>
+<span class="sourceLineNo">655</span> /*<a name="line.655"></a>
+<span class="sourceLineNo">656</span> * Doesn't actually parse anything, but moves the position beyond the construct "{wrapperAttr:" when<a name="line.656"></a>
+<span class="sourceLineNo">657</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.657"></a>
+<span class="sourceLineNo">658</span> */<a name="line.658"></a>
+<span class="sourceLineNo">659</span> private void skipWrapperAttrStart(JsonParserSession session, ParserReader r, String wrapperAttr) throws Exception {<a name="line.659"></a>
+<span class="sourceLineNo">660</span><a name="line.660"></a>
+<span class="sourceLineNo">661</span> int S0=0; // Looking for outer {<a name="line.661"></a>
+<span class="sourceLineNo">662</span> int S1=1; // Looking for attrName start.<a name="line.662"></a>
+<span class="sourceLineNo">663</span> int S3=3; // Found attrName end, looking for :.<a name="line.663"></a>
+<span class="sourceLineNo">664</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.664"></a>
+<span class="sourceLineNo">665</span><a name="line.665"></a>
+<span class="sourceLineNo">666</span> int state = S0;<a name="line.666"></a>
+<span class="sourceLineNo">667</span> String currAttr = null;<a name="line.667"></a>
+<span class="sourceLineNo">668</span> int c = 0;<a name="line.668"></a>
+<span class="sourceLineNo">669</span> while (c != -1) {<a name="line.669"></a>
+<span class="sourceLineNo">670</span> c = r.read();<a name="line.670"></a>
+<span class="sourceLineNo">671</span> if (state == S0) {<a name="line.671"></a>
+<span class="sourceLineNo">672</span> if (c == '{')<a name="line.672"></a>
+<span class="sourceLineNo">673</span> state = S1;<a name="line.673"></a>
+<span class="sourceLineNo">674</span> } else if (state == S1) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span> if (session.isCommentOrWhitespace(c)) {<a name="line.675"></a>
+<span class="sourceLineNo">676</span> skipCommentsAndSpace(session, r.unread());<a name="line.676"></a>
+<span class="sourceLineNo">677</span> } else {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> currAttr = parseFieldName(session, r.unread());<a name="line.678"></a>
+<span class="sourceLineNo">679</span> if (! currAttr.equals(wrapperAttr))<a name="line.679"></a>
+<span class="sourceLineNo">680</span> throw new ParseException(session, "Expected to find wrapper attribute ''{0}'' but found attribute ''{1}''", wrapperAttr, currAttr);<a name="line.680"></a>
+<span class="sourceLineNo">681</span> state = S3;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> }<a name="line.682"></a>
+<span class="sourceLineNo">683</span> } else if (state == S3) {<a name="line.683"></a>
+<span class="sourceLineNo">684</span> if (c == ':')<a name="line.684"></a>
+<span class="sourceLineNo">685</span> state = S4;<a name="line.685"></a>
+<span class="sourceLineNo">686</span> } else if (state == S4) {<a name="line.686"></a>
+<span class="sourceLineNo">687</span> if (session.isCommentOrWhitespace(c)) {<a name="line.687"></a>
+<span class="sourceLineNo">688</span> skipCommentsAndSpace(session, r.unread());<a name="line.688"></a>
+<span class="sourceLineNo">689</span> } else {<a name="line.689"></a>
+<span class="sourceLineNo">690</span> r.unread();<a name="line.690"></a>
+<span class="sourceLineNo">691</span> return;<a name="line.691"></a>
+<span class="sourceLineNo">692</span> }<a name="line.692"></a>
+<span class="sourceLineNo">693</span> }<a name="line.693"></a>
+<span class="sourceLineNo">694</span> }<a name="line.694"></a>
+<span class="sourceLineNo">695</span> if (state == S0)<a name="line.695"></a>
+<span class="sourceLineNo">696</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.696"></a>
+<span class="sourceLineNo">697</span> if (state == S1)<a name="line.697"></a>
+<span class="sourceLineNo">698</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.698"></a>
+<span class="sourceLineNo">699</span> if (state == S3)<a name="line.699"></a>
+<span class="sourceLineNo">700</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.700"></a>
+<span class="sourceLineNo">701</span> if (state == S4)<a name="line.701"></a>
+<span class="sourceLineNo">702</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.702"></a>
+<span class="sourceLineNo">703</span> }<a name="line.703"></a>
<span class="sourceLineNo">704</span><a name="line.704"></a>
-<span class="sourceLineNo">705</span> int S0=0; // Looking for outer {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> int S1=1; // Looking for attrName start.<a name="line.706"></a>
-<span class="sourceLineNo">707</span> int S3=3; // Found attrName end, looking for :.<a name="line.707"></a>
-<span class="sourceLineNo">708</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span> int state = S0;<a name="line.710"></a>
-<span class="sourceLineNo">711</span> String currAttr = null;<a name="line.711"></a>
-<span class="sourceLineNo">712</span> int c = 0;<a name="line.712"></a>
-<span class="sourceLineNo">713</span> while (c != -1) {<a name="line.713"></a>
-<span class="sourceLineNo">714</span> c = r.read();<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (state == S0) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> if (c == '{')<a name="line.716"></a>
-<span class="sourceLineNo">717</span> state = S1;<a name="line.717"></a>
-<span class="sourceLineNo">718</span> } else if (state == S1) {<a name="line.718"></a>
-<span class="sourceLineNo">719</span> if (session.isCommentOrWhitespace(c)) {<a name="line.719"></a>
-<span class="sourceLineNo">720</span> skipCommentsAndSpace(session, r.unread());<a name="line.720"></a>
-<span class="sourceLineNo">721</span> } else {<a name="line.721"></a>
-<span class="sourceLineNo">722</span> currAttr = parseFieldName(session, r.unread());<a name="line.722"></a>
-<span class="sourceLineNo">723</span> if (! currAttr.equals(wrapperAttr))<a name="line.723"></a>
-<span class="sourceLineNo">724</span> throw new ParseException(session, "Expected to find wrapper attribute ''{0}'' but found attribute ''{1}''", wrapperAttr, currAttr);<a name="line.724"></a>
-<span class="sourceLineNo">725</span> state = S3;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> }<a name="line.726"></a>
-<span class="sourceLineNo">727</span> } else if (state == S3) {<a name="line.727"></a>
-<span class="sourceLineNo">728</span> if (c == ':')<a name="line.728"></a>
-<span class="sourceLineNo">729</span> state = S4;<a name="line.729"></a>
-<span class="sourceLineNo">730</span> } else if (state == S4) {<a name="line.730"></a>
-<span class="sourceLineNo">731</span> if (session.isCommentOrWhitespace(c)) {<a name="line.731"></a>
-<span class="sourceLineNo">732</span> skipCommentsAndSpace(session, r.unread());<a name="line.732"></a>
-<span class="sourceLineNo">733</span> } else {<a name="line.733"></a>
-<span class="sourceLineNo">734</span> r.unread();<a name="line.734"></a>
-<span class="sourceLineNo">735</span> return;<a name="line.735"></a>
-<span class="sourceLineNo">736</span> }<a name="line.736"></a>
-<span class="sourceLineNo">737</span> }<a name="line.737"></a>
-<span class="sourceLineNo">738</span> }<a name="line.738"></a>
-<span class="sourceLineNo">739</span> if (state == S0)<a name="line.739"></a>
-<span class="sourceLineNo">740</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.740"></a>
-<span class="sourceLineNo">741</span> if (state == S1)<a name="line.741"></a>
-<span class="sourceLineNo">742</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.742"></a>
-<span class="sourceLineNo">743</span> if (state == S3)<a name="line.743"></a>
-<span class="sourceLineNo">744</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.744"></a>
-<span class="sourceLineNo">745</span> if (state == S4)<a name="line.745"></a>
-<span class="sourceLineNo">746</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.746"></a>
+<span class="sourceLineNo">705</span> /*<a name="line.705"></a>
+<span class="sourceLineNo">706</span> * Doesn't actually parse anything, but moves the position beyond the construct "}" when<a name="line.706"></a>
+<span class="sourceLineNo">707</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.707"></a>
+<span class="sourceLineNo">708</span> */<a name="line.708"></a>
+<span class="sourceLineNo">709</span> private static void skipWrapperAttrEnd(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.709"></a>
+<span class="sourceLineNo">710</span> int c = 0;<a name="line.710"></a>
+<span class="sourceLineNo">711</span> while ((c = r.read()) != -1) {<a name="line.711"></a>
+<span class="sourceLineNo">712</span> if (! session.isWhitespace(c)) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span> if (c == '/') {<a name="line.713"></a>
+<span class="sourceLineNo">714</span> if (session.isStrict())<a name="line.714"></a>
+<span class="sourceLineNo">715</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.715"></a>
+<span class="sourceLineNo">716</span> skipComments(session, r);<a name="line.716"></a>
+<span class="sourceLineNo">717</span> } else if (c == '}') {<a name="line.717"></a>
+<span class="sourceLineNo">718</span> return;<a name="line.718"></a>
+<span class="sourceLineNo">719</span> } else {<a name="line.719"></a>
+<span class="sourceLineNo">720</span> throw new ParseException(session, "Could not find '}' at the end of JSON wrapper object.");<a name="line.720"></a>
+<span class="sourceLineNo">721</span> }<a name="line.721"></a>
+<span class="sourceLineNo">722</span> }<a name="line.722"></a>
+<span class="sourceLineNo">723</span> }<a name="line.723"></a>
+<span class="sourceLineNo">724</span> }<a name="line.724"></a>
+<span class="sourceLineNo">725</span><a name="line.725"></a>
+<span class="sourceLineNo">726</span> /*<a name="line.726"></a>
+<span class="sourceLineNo">727</span> * Doesn't actually parse anything, but when positioned at the beginning of comment,<a name="line.727"></a>
+<span class="sourceLineNo">728</span> * it will move the pointer to the last character in the comment.<a name="line.728"></a>
+<span class="sourceLineNo">729</span> */<a name="line.729"></a>
+<span class="sourceLineNo">730</span> private static void skipComments(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.730"></a>
+<span class="sourceLineNo">731</span> int c = r.read();<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // "/* */" style comments<a name="line.732"></a>
+<span class="sourceLineNo">733</span> if (c == '*') {<a name="line.733"></a>
+<span class="sourceLineNo">734</span> while (c != -1)<a name="line.734"></a>
+<span class="sourceLineNo">735</span> if ((c = r.read()) == '*')<a name="line.735"></a>
+<span class="sourceLineNo">736</span> if ((c = r.read()) == '/')<a name="line.736"></a>
+<span class="sourceLineNo">737</span> return;<a name="line.737"></a>
+<span class="sourceLineNo">738</span> // "//" style comments<a name="line.738"></a>
+<span class="sourceLineNo">739</span> } else if (c == '/') {<a name="line.739"></a>
+<span class="sourceLineNo">740</span> while (c != -1) {<a name="line.740"></a>
+<span class="sourceLineNo">741</span> c = r.read();<a name="line.741"></a>
+<span class="sourceLineNo">742</span> if (c == -1 || c == '\n')<a name="line.742"></a>
+<span class="sourceLineNo">743</span> return;<a name="line.743"></a>
+<span class="sourceLineNo">744</span> }<a name="line.744"></a>
+<span class="sourceLineNo">745</span> }<a name="line.745"></a>
+<span class="sourceLineNo">746</span> throw new ParseException(session, "Open ended comment.");<a name="line.746"></a>
<span class="sourceLineNo">747</span> }<a name="line.747"></a>
<span class="sourceLineNo">748</span><a name="line.748"></a>
<span class="sourceLineNo">749</span> /*<a name="line.749"></a>
-<span class="sourceLineNo">750</span> * Doesn't actually parse anything, but moves the position beyond the construct "}" when<a name="line.750"></a>
-<span class="sourceLineNo">751</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.751"></a>
+<span class="sourceLineNo">750</span> * Call this method after you've finished a parsing a string to make sure that if there's any<a name="line.750"></a>
+<span class="sourceLineNo">751</span> * remainder in the input, that it consists only of whitespace and comments.<a name="line.751"></a>
<span class="sourceLineNo">752</span> */<a name="line.752"></a>
-<span class="sourceLineNo">753</span> private static void skipWrapperAttrEnd(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.753"></a>
-<span class="sourceLineNo">754</span> int c = 0;<a name="line.754"></a>
-<span class="sourceLineNo">755</span> while ((c = r.read()) != -1) {<a name="line.755"></a>
-<span class="sourceLineNo">756</span> if (! session.isWhitespace(c)) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span> if (c == '/') {<a name="line.757"></a>
-<span class="sourceLineNo">758</span> if (session.isStrict())<a name="line.758"></a>
-<span class="sourceLineNo">759</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.759"></a>
-<span class="sourceLineNo">760</span> skipComments(session, r);<a name="line.760"></a>
-<span class="sourceLineNo">761</span> } else if (c == '}') {<a name="line.761"></a>
-<span class="sourceLineNo">762</span> return;<a name="line.762"></a>
-<span class="sourceLineNo">763</span> } else {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> throw new ParseException(session, "Could not find '}' at the end of JSON wrapper object.");<a name="line.764"></a>
-<span class="sourceLineNo">765</span> }<a name="line.765"></a>
-<span class="sourceLineNo">766</span> }<a name="line.766"></a>
-<span class="sourceLineNo">767</span> }<a name="line.767"></a>
+<span class="sourceLineNo">753</span> private static void validateEnd(JsonParserSession session, ParserReader r) throws Exception {<a name="line.753"></a>
+<span class="sourceLineNo">754</span> skipCommentsAndSpace(session, r);<a name="line.754"></a>
+<span class="sourceLineNo">755</span> int c = r.read();<a name="line.755"></a>
+<span class="sourceLineNo">756</span> if (c != -1 && c != ';') // var x = {...}; expressions can end with a semicolon.<a name="line.756"></a>
+<span class="sourceLineNo">757</span> throw new ParseException(session, "Remainder after parse: ''{0}''.", (char)c);<a name="line.757"></a>
+<span class="sourceLineNo">758</span> }<a name="line.758"></a>
+<span class="sourceLineNo">759</span><a name="line.759"></a>
+<span class="sourceLineNo">760</span><a name="line.760"></a>
+<span class="sourceLineNo">761</span> //--------------------------------------------------------------------------------<a name="line.761"></a>
+<span class="sourceLineNo">762</span> // Entry point methods<a name="line.762"></a>
+<span class="sourceLineNo">763</span> //--------------------------------------------------------------------------------<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span> @Override /* Parser */<a name="line.765"></a>
+<span class="sourceLineNo">766</span> public JsonParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.766"></a>
+<span class="sourceLineNo">767</span> return new JsonParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.767"></a>
<span class="sourceLineNo">768</span> }<a name="line.768"></a>
<span class="sourceLineNo">769</span><a name="line.769"></a>
-<span class="sourceLineNo">770</span> /*<a name="line.770"></a>
-<span class="sourceLineNo">771</span> * Doesn't actually parse anything, but when positioned at the beginning of comment,<a name="line.771"></a>
-<span class="sourceLineNo">772</span> * it will move the pointer to the last character in the comment.<a name="line.772"></a>
-<span class="sourceLineNo">773</span> */<a name="line.773"></a>
-<span class="sourceLineNo">774</span> private static void skipComments(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.774"></a>
-<span class="sourceLineNo">775</span> int c = r.read();<a name="line.775"></a>
-<span class="sourceLineNo">776</span> // "/* */" style comments<a name="line.776"></a>
-<span class="sourceLineNo">777</span> if (c == '*') {<a name="line.777"></a>
-<span class="sourceLineNo">778</span> while (c != -1)<a name="line.778"></a>
-<span class="sourceLineNo">779</span> if ((c = r.read()) == '*')<a name="line.779"></a>
-<span class="sourceLineNo">780</span> if ((c = r.read()) == '/')<a name="line.780"></a>
-<span class="sourceLineNo">781</span> return;<a name="line.781"></a>
-<span class="sourceLineNo">782</span> // "//" style comments<a name="line.782"></a>
-<span class="sourceLineNo">783</span> } else if (c == '/') {<a name="line.783"></a>
-<span class="sourceLineNo">784</span> while (c != -1) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span> c = r.read();<a name="line.785"></a>
-<span class="sourceLineNo">786</span> if (c == -1 || c == '\n')<a name="line.786"></a>
-<span class="sourceLineNo">787</span> return;<a name="line.787"></a>
-<span class="sourceLineNo">788</span> }<a name="line.788"></a>
-<span class="sourceLineNo">789</span> }<a name="line.789"></a>
-<span class="sourceLineNo">790</span> throw new ParseException(session, "Open ended comment.");<a name="line.790"></a>
-<span class="sourceLineNo">791</span> }<a name="line.791"></a>
-<span class="sourceLineNo">792</span><a name="line.792"></a>
-<span class="sourceLineNo">793</span> /*<a name="line.793"></a>
-<span class="sourceLineNo">794</span> * Call this method after you've finished a parsing a string to make sure that if there's any<a name="line.794"></a>
-<span class="sourceLineNo">795</span> * remainder in the input, that it consists only of whitespace and comments.<a name="line.795"></a>
-<span class="sourceLineNo">796</span> */<a name="line.796"></a>
-<span class="sourceLineNo">797</span> private static void validateEnd(JsonParserSession session, ParserReader r) throws Exception {<a name="line.797"></a>
-<span class="sourceLineNo">798</span> skipCommentsAndSpace(session, r);<a name="line.798"></a>
-<span class="sourceLineNo">799</span> int c = r.read();<a name="line.799"></a>
-<span class="sourceLineNo">800</span> if (c != -1 && c != ';') // var x = {...}; expressions can end with a semicolon.<a name="line.800"></a>
-<span class="sourceLineNo">801</span> throw new ParseException(session, "Remainder after parse: ''{0}''.", (char)c);<a name="line.801"></a>
-<span class="sourceLineNo">802</span> }<a name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span><a name="line.804"></a>
-<span class="sourceLineNo">805</span> //--------------------------------------------------------------------------------<a name="line.805"></a>
-<span class="sourceLineNo">806</span> // Entry point methods<a name="line.806"></a>
-<span class="sourceLineNo">807</span> //--------------------------------------------------------------------------------<a name="line.807"></a>
-<span class="sourceLineNo">808</span><a name="line.808"></a>
-<span class="sourceLineNo">809</span> @Override /* Parser */<a name="line.809"></a>
-<span class="sourceLineNo">810</span> public JsonParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.810"></a>
-<span class="sourceLineNo">811</span> return new JsonParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.811"></a>
-<span class="sourceLineNo">812</span> }<a name="line.812"></a>
-<span class="sourceLineNo">813</span><a name="line.813"></a>
-<span class="sourceLineNo">814</span> @Override /* Parser */<a name="line.814"></a>
-<span class="sourceLineNo">815</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.815"></a>
-<span class="sourceLineNo">816</span> JsonParserSession s = (JsonParserSession)session;<a name="line.816"></a>
-<span class="sourceLineNo">817</span> ParserReader r = s.getReader();<a name="line.817"></a>
-<span class="sourceLineNo">818</span> if (r == null)<a name="line.818"></a>
-<span class="sourceLineNo">819</span> return null;<a name="line.819"></a>
-<span class="sourceLineNo">820</span> T o = parseAnything(s, type, r, s.getOuter(), null);<a name="line.820"></a>
-<span class="sourceLineNo">821</span> validateEnd(s, r);<a name="line.821"></a>
-<span class="sourceLineNo">822</span> return o;<a name="line.822"></a>
-<span class="sourceLineNo">823</span> }<a name="line.823"></a>
-<span class="sourceLineNo">824</span><a name="line.824"></a>
-<span class="sourceLineNo">825</span> @Override /* ReaderParser */<a name="line.825"></a>
-<span class="sourceLineNo">826</span> protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {<a name="line.826"></a>
-<span class="sourceLineNo">827</span> JsonParserSession s = (JsonParserSession)session;<a name="line.827"></a>
-<span class="sourceLineNo">828</span> ParserReader r = s.getReader();<a name="line.828"></a>
-<span class="sourceLineNo">829</span> m = parseIntoMap2(s, r, m, (ClassMeta<K>)s.getClassMeta(keyType), (ClassMeta<V>)s.getClassMeta(valueType), null);<a name="line.829"></a>
-<span class="sourceLineNo">830</span> validateEnd(s, r);<a name="line.830"></a>
-<span class="sourceLineNo">831</span> return m;<a name="line.831"></a>
-<span class="sourceLineNo">832</span> }<a name="line.832"></a>
-<span class="sourceLineNo">833</span><a name="line.833"></a>
-<span class="sourceLineNo">834</span> @Override /* ReaderParser */<a name="line.834"></a>
-<span class="sourceLineNo">835</span> protected <E> Collection<E> doParseIntoCollection(ParserSession session, Collection<E> c, Type elementType) throws Exception {<a name="line.835"></a>
-<span class="sourceLineNo">836</span> JsonParserSession s = (JsonParserSession)session;<a name="line.836"></a>
-<span class="sourceLineNo">837</span> ParserReader r = s.getReader();<a name="line.837"></a>
-<span class="sourceLineNo">838</span> c = parseIntoCollection2(s, r, c, (ClassMeta<E>)s.getClassMeta(elementType), null);<a name="line.838"></a>
-<span class="sourceLineNo">839</span> validateEnd(s, r);<a name="line.839"></a>
-<span class="sourceLineNo">840</span> return c;<a name="line.840"></a>
-<span class="sourceLineNo">841</span> }<a name="line.841"></a>
-<span class="sourceLineNo">842</span><a name="line.842"></a>
-<span class="sourceLineNo">843</span> @Override /* ReaderParser */<a name="line.843"></a>
-<span class="sourceLineNo">844</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.844"></a>
-<span class="sourceLineNo">845</span> JsonParserSession s = (JsonParserSession)session;<a name="line.845"></a>
-<span class="sourceLineNo">846</span> ParserReader r = s.getReader();<a name="line.846"></a>
-<span class="sourceLineNo">847</span> Object[] a = parseArgs(s, r, argTypes);<a name="line.847"></a>
-<span class="sourceLineNo">848</span> validateEnd(s, r);<a name="line.848"></a>
-<span class="sourceLineNo">849</span> return a;<a name="line.849"></a>
-<span class="sourceLineNo">850</span> }<a name="line.850"></a>
-<span class="sourceLineNo">851</span>}<a name="line.851"></a>
+<span class="sourceLineNo">770</span> @Override /* Parser */<a name="line.770"></a>
+<span class="sourceLineNo">771</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.771"></a>
+<span class="sourceLineNo">772</span> JsonParserSession s = (JsonParserSession)session;<a name="line.772"></a>
+<span class="sourceLineNo">773</span> ParserReader r = s.getReader();<a name="line.773"></a>
+<span class="sourceLineNo">774</span> if (r == null)<a name="line.774"></a>
+<span class="sourceLineNo">775</span> return null;<a name="line.775"></a>
+<span class="sourceLineNo">776</span> T o = parseAnything(s, type, r, s.getOuter(), null);<a name="line.776"></a>
+<span class="sourceLineNo">777</span> validateEnd(s, r);<a name="line.777"></a>
+<span class="sourceLineNo">778</span> return o;<a name="line.778"></a>
+<span class="sourceLineNo">779</span> }<a name="line.779"></a>
+<span class="sourceLineNo">780</span><a name="line.780"></a>
+<span class="sourceLineNo">781</span> @Override /* ReaderParser */<a name="line.781"></a>
+<span class="sourceLineNo">782</span> protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> JsonParserSession s = (JsonParserSession)session;<a name="line.783"></a>
+<span class="sourceLineNo">784</span> ParserReader r = s.getReader();<a name="line.784"></a>
+<span class="sourceLineNo">785</span> m = parseIntoMap2(s, r, m, (ClassMeta<K>)s.getClassMeta(keyType), (ClassMeta<V>)s.getClassMeta(valueType), null);<a name="line.785"></a>
+<span class="sourceLineNo">786</span> validateEnd(s, r);<a name="line.786"></a>
+<span class="sourceLineNo">787</span> return m;<a name="line.787"></a>
+<span class="sourceLineNo">788</span> }<a name="line.788"></a>
+<span class="sourceLineNo">789</span><a name="line.789"></a>
+<span class="sourceLineNo">790</span> @Override /* ReaderParser */<a name="line.790"></a>
+<span class="sourceLineNo">791</span> protected <E> Collection<E> doParseIntoCollection(ParserSession session, Collection<E> c, Type elementType) throws Exception {<a name="line.791"></a>
+<span class="sourceLineNo">792</span> JsonParserSession s = (JsonParserSession)session;<a name="line.792"></a>
+<span class="sourceLineNo">793</span> ParserReader r = s.getReader();<a name="line.793"></a>
+<span class="sourceLineNo">794</span> c = parseIntoCollection2(s, r, c, s.getClassMeta(elementType), null);<a name="line.794"></a>
+<span class="sourceLineNo">795</span> validateEnd(s, r);<a name="line.795"></a>
+<span class="sourceLineNo">796</span> return c;<a name="line.796"></a>
+<span class="sourceLineNo">797</span> }<a name="line.797"></a>
+<span class="sourceLineNo">798</span>}<a name="line.798"></a>
[32/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/serializer/WriterSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/WriterSerializer.html b/content/site/apidocs/org/apache/juneau/serializer/WriterSerializer.html
index 4daeb52..70f1f4e 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/WriterSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/WriterSerializer.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Prev Class</span></a></li>
<li>Next Class</li>
</ul>
<ul class="navList">
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/serializer/WriterSerializer.html#line.41">WriterSerializer</a>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/serializer/WriterSerializer.html#line.42">WriterSerializer</a>
extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></pre>
<div class="block">Subclass of <a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer"><code>Serializer</code></a> for character-based serializers.
@@ -221,9 +221,9 @@ extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title
</td>
</tr>
<tr id="i4" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></code></td>
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/WriterSerializer.html#toStringObject-java.lang.Object-">toStringObject</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</code>
-<div class="block">Wraps the specified object inside a <a href="../../../../org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer"><code>StringObject</code></a>.</div>
+<div class="block">Wraps the specified object inside a <a href="../../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils"><code>StringObject</code></a>.</div>
</td>
</tr>
</table>
@@ -268,7 +268,7 @@ extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title
<ul class="blockListLast">
<li class="blockList">
<h4>WriterSerializer</h4>
-<pre>protected <a href="../../../../src-html/org/apache/juneau/serializer/WriterSerializer.html#line.47">WriterSerializer</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore)</pre>
+<pre>protected <a href="../../../../src-html/org/apache/juneau/serializer/WriterSerializer.html#line.48">WriterSerializer</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore)</pre>
<div class="block">Constructor.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -290,7 +290,7 @@ extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title
<ul class="blockList">
<li class="blockList">
<h4>isWriterSerializer</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/serializer/WriterSerializer.html#line.52">isWriterSerializer</a>()</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/serializer/WriterSerializer.html#line.53">isWriterSerializer</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/Serializer.html#isWriterSerializer--">Serializer</a></code></span></div>
<div class="block">Returns <jk>true</jk> if this serializer subclasses from <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer"><code>WriterSerializer</code></a>.</div>
<dl>
@@ -307,7 +307,7 @@ extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title
<ul class="blockList">
<li class="blockList">
<h4>serialize</h4>
-<pre>public final <a href="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/serializer/WriterSerializer.html#line.69">serialize</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)
+<pre>public final <a href="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/serializer/WriterSerializer.html#line.70">serialize</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)
throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
<div class="block">Convenience method for serializing an object to a <code>String</code>.</div>
<dl>
@@ -328,7 +328,7 @@ extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title
<ul class="blockList">
<li class="blockList">
<h4>toString</h4>
-<pre>public final <a href="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/serializer/WriterSerializer.html#line.83">toString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<pre>public final <a href="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/serializer/WriterSerializer.html#line.84">toString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
<div class="block">Identical to <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html#serialize-java.lang.Object-"><code>serialize(Object)</code></a> except throws a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang"><code>RuntimeException</code></a>
instead of a <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer"><code>SerializeException</code></a>.
This is typically good enough for debugging purposes.</div>
@@ -346,8 +346,8 @@ extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title
<ul class="blockList">
<li class="blockList">
<h4>toStringObject</h4>
-<pre>public final <a href="../../../../org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a> <a href="../../../../src-html/org/apache/juneau/serializer/WriterSerializer.html#line.99">toStringObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
-<div class="block">Wraps the specified object inside a <a href="../../../../org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer"><code>StringObject</code></a>.</div>
+<pre>public final <a href="../../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a> <a href="../../../../src-html/org/apache/juneau/serializer/WriterSerializer.html#line.100">toStringObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<div class="block">Wraps the specified object inside a <a href="../../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils"><code>StringObject</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>o</code> - The object to wrap.</dd>
@@ -362,7 +362,7 @@ extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title
<ul class="blockListLast">
<li class="blockList">
<h4>println</h4>
-<pre>public final <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a> <a href="../../../../src-html/org/apache/juneau/serializer/WriterSerializer.html#line.109">println</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<pre>public final <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a> <a href="../../../../src-html/org/apache/juneau/serializer/WriterSerializer.html#line.110">println</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
<div class="block">Convenience method for serializing an object and sending it to STDOUT.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -399,7 +399,7 @@ extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Prev Class</span></a></li>
<li>Next Class</li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/serializer/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/package-frame.html b/content/site/apidocs/org/apache/juneau/serializer/package-frame.html
index fddc6da..4c31dd5 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/package-frame.html
@@ -22,7 +22,6 @@
<li><a href="SerializerMatch.html" title="class in org.apache.juneau.serializer" target="classFrame">SerializerMatch</a></li>
<li><a href="SerializerSession.html" title="class in org.apache.juneau.serializer" target="classFrame">SerializerSession</a></li>
<li><a href="SerializerWriter.html" title="class in org.apache.juneau.serializer" target="classFrame">SerializerWriter</a></li>
-<li><a href="StringObject.html" title="class in org.apache.juneau.serializer" target="classFrame">StringObject</a></li>
<li><a href="WriterSerializer.html" title="class in org.apache.juneau.serializer" target="classFrame">WriterSerializer</a></li>
</ul>
<h2 title="Exceptions">Exceptions</h2>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/serializer/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/package-summary.html b/content/site/apidocs/org/apache/juneau/serializer/package-summary.html
index 6124f05..280fb47 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/package-summary.html
@@ -140,12 +140,6 @@
</td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></td>
-<td class="colLast">
-<div class="block">A serializer/object pair used for delayed object serialization.</div>
-</td>
-</tr>
-<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a></td>
<td class="colLast">
<div class="block">Subclass of <a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer"><code>Serializer</code></a> for character-based serializers.</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/serializer/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/package-tree.html b/content/site/apidocs/org/apache/juneau/serializer/package-tree.html
index 3e837b5..6d70bdc 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/package-tree.html
@@ -116,7 +116,6 @@
</li>
</ul>
</li>
-<li type="circle">org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">StringObject</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>, org.apache.juneau.<a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>)</li>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Throwable</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Exception</span></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/svl/vars/ConfigFileVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/ConfigFileVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/ConfigFileVar.html
index cf4dd8a..287baa1 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/ConfigFileVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/ConfigFileVar.html
@@ -136,7 +136,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
<h5 class='section'>Example:</h5>
<p class='bcode'>
<jc>// Create a config file object.</jc>
- ConfigFile configFile = ConfigMgr.<jsf>DEFAULT</jsf>.get(<js>"MyConfig.cfg"</js>);
+ ConfigFile configFile = new ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>);
<jc>// Create a variable resolver that resolves config file entries (e.g. "$C{MySection/myKey}")</jc>
VarResolver r = <jk>new</jk> VarResolver().addVars(ConfigVar.<js>class</js>).addContextObject(<jsf>SESSION_config</jsf>, configFile);
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/uon/UonParser.Decoding.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonParser.Decoding.html b/content/site/apidocs/org/apache/juneau/uon/UonParser.Decoding.html
index b9b34be..bca0c34 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonParser.Decoding.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonParser.Decoding.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon">UonParser</a></h3>
-<code><a href="../../../../org/apache/juneau/uon/UonParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#createParameterSession-java.lang.Object-">createParameterSession</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/
uon/UonParser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#parseAnything-org.apache.juneau.uon.UonParserSession-org.apache.juneau.ClassMeta-org.apache.juneau.parser.ParserReader-java.lang.Object-boolean-org.apache.juneau.BeanPropertyMeta-">parseAnything</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#parseAttr-org.apache.juneau.uon.UonParserSession-org.apache.juneau.parser.ParserReader-boolean-">parseAttr</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#parseAttrName-org.apache.juneau.uon.UonParserSession-org.apache.juneau.parser.ParserReader-boolean-">parseAttrName</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#parseString-org.apache.juneau.uon.UonParserSession-org.apache.juneau.parser.ParserReader-boolean-">parseString</a></code></li>
+<code><a href="../../../../org/apache/juneau/uon/UonParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#createParameterSession-java.lang.Object-">createParameterSession</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a
href="../../../../org/apache/juneau/uon/UonParser.html#parseAnything-org.apache.juneau.uon.UonParserSession-org.apache.juneau.ClassMeta-org.apache.juneau.parser.ParserReader-java.lang.Object-boolean-org.apache.juneau.BeanPropertyMeta-">parseAnything</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#parseAttr-org.apache.juneau.uon.UonParserSession-org.apache.juneau.parser.ParserReader-boolean-">parseAttr</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#parseAttrName-org.apache.juneau.uon.UonParserSession-org.apache.juneau.parser.ParserReader-boolean-">parseAttrName</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#parseString-org.apache.juneau.uon.UonParserSession-org.apache.juneau.parser.ParserReader-boolean-">parseString</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.parser.ReaderParser">
@@ -236,7 +236,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.
ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.
apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/uon/UonParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonParser.html b/content/site/apidocs/org/apache/juneau/uon/UonParser.html
index ba793eb..ab97c6a 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonParser.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonParser.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":9,"i9":9,"i10":9};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":9,"i8":9,"i9":9};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -273,13 +273,6 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
</td>
</tr>
<tr id="i4" class="altColor">
-<td class="colFirst"><code>protected <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></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)</code>
-<div class="block">Implementation method.</div>
-</td>
-</tr>
-<tr id="i5" class="rowColor">
<td class="colFirst"><code>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonParser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> c,
@@ -287,7 +280,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<div class="block">Implementation method.</div>
</td>
</tr>
-<tr id="i6" class="altColor">
+<tr id="i5" class="rowColor">
<td class="colFirst"><code>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonParser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
@@ -296,7 +289,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<div class="block">Implementation method.</div>
</td>
</tr>
-<tr id="i7" class="rowColor">
+<tr id="i6" class="altColor">
<td class="colFirst"><code>protected <T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonParser.html#parseAnything-org.apache.juneau.uon.UonParserSession-org.apache.juneau.ClassMeta-org.apache.juneau.parser.ParserReader-java.lang.Object-boolean-org.apache.juneau.BeanPropertyMeta-">parseAnything</a></span>(<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> session,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> eType,
@@ -307,7 +300,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<div class="block">Workhorse method.</div>
</td>
</tr>
-<tr id="i8" class="altColor">
+<tr id="i7" class="rowColor">
<td class="colFirst"><code>protected static <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></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonParser.html#parseAttr-org.apache.juneau.uon.UonParserSession-org.apache.juneau.parser.ParserReader-boolean-">parseAttr</a></span>(<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> session,
<a href="../../../../org/apache/juneau/parser/ParserReader.html" title="class in org.apache.juneau.parser">ParserReader</a> r,
@@ -315,7 +308,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<div class="block">Convenience method for parsing an attribute from the specified parser.</div>
</td>
</tr>
-<tr id="i9" class="rowColor">
+<tr id="i8" class="altColor">
<td class="colFirst"><code>protected static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonParser.html#parseAttrName-org.apache.juneau.uon.UonParserSession-org.apache.juneau.parser.ParserReader-boolean-">parseAttrName</a></span>(<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> session,
<a href="../../../../org/apache/juneau/parser/ParserReader.html" title="class in org.apache.juneau.parser">ParserReader</a> r,
@@ -323,7 +316,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<div class="block">Parses an attribute name from the specified reader.</div>
</td>
</tr>
-<tr id="i10" class="altColor">
+<tr id="i9" class="rowColor">
<td class="colFirst"><code>protected static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonParser.html#parseString-org.apache.juneau.uon.UonParserSession-org.apache.juneau.parser.ParserReader-boolean-">parseString</a></span>(<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> session,
<a href="../../../../org/apache/juneau/parser/ParserReader.html" title="class in org.apache.juneau.parser">ParserReader</a> r,
@@ -344,7 +337,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.
ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.
apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
@@ -477,7 +470,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>parseAttr</h4>
-<pre>protected static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.517">parseAttr</a>(<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> session,
+<pre>protected static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.519">parseAttr</a>(<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> session,
<a href="../../../../org/apache/juneau/parser/ParserReader.html" title="class in org.apache.juneau.parser">ParserReader</a> r,
boolean encoded)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -500,7 +493,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>parseAttrName</h4>
-<pre>protected static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.532">parseAttrName</a>(<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> session,
+<pre>protected static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.534">parseAttrName</a>(<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> session,
<a href="../../../../org/apache/juneau/parser/ParserReader.html" title="class in org.apache.juneau.parser">ParserReader</a> r,
boolean encoded)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -523,7 +516,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>parseString</h4>
-<pre>protected static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.606">parseString</a>(<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> session,
+<pre>protected static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.608">parseString</a>(<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> session,
<a href="../../../../org/apache/juneau/parser/ParserReader.html" title="class in org.apache.juneau.parser">ParserReader</a> r,
boolean isUrlParamValue)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -546,7 +539,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>createParameterSession</h4>
-<pre>protected final <a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.758">createParameterSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input)</pre>
+<pre>protected final <a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.724">createParameterSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input)</pre>
<div class="block">Create a UON parser session for parsing parameter values.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -562,7 +555,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.768">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
+<pre>public <a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.734">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> op,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> javaMethod,
<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> outer,
@@ -600,7 +593,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>doParse</h4>
-<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.773">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.739">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> type)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">Parser</a></code></span></div>
@@ -629,7 +622,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>doParseIntoMap</h4>
-<pre>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.782">doParseIntoMap</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.748">doParseIntoMap</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> keyType,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> valueType)
@@ -656,10 +649,10 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<a name="doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">
<!-- -->
</a>
-<ul class="blockList">
+<ul class="blockListLast">
<li class="blockList">
<h4>doParseIntoCollection</h4>
-<pre>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.791">doParseIntoCollection</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.757">doParseIntoCollection</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> c,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> elementType)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -681,32 +674,6 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
</dl>
</li>
</ul>
-<a name="doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>doParseArgs</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[] <a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.800">doParseArgs</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">Parser</a></code></span></div>
-<div class="block">Implementation method.
- Default implementation throws an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/UnsupportedOperationException.html?is-external=true" title="class or interface in java.lang"><code>UnsupportedOperationException</code></a>.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></code> in class <code><a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The runtime session object returned by <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-"><code>Parser.createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</code></a>.
- If <jk>null</jk>, one will be created using <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-"><code>Parser.createSession(Object)</code></a>.</dd>
-<dd><code>argTypes</code> - Specifies the type of objects to create for each entry in the array.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>An array of parsed objects.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code> - If thrown from underlying stream, or if the input contains a syntax error or is malformed.</dd>
-</dl>
-</li>
-</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/uon/UonParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonParserSession.html b/content/site/apidocs/org/apache/juneau/uon/UonParserSession.html
index b1ec6dc..66755eb 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonParserSession.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonParserSession.html
@@ -213,7 +213,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title=
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html b/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html
index c7a9e20..1393fad 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/uon/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/package-summary.html b/content/site/apidocs/org/apache/juneau/uon/package-summary.html
index 8117e17..c36e8b4 100644
--- a/content/site/apidocs/org/apache/juneau/uon/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/uon/package-summary.html
@@ -1121,11 +1121,11 @@
// Consists of an in-memory address book repository.</jc>
<ja>@RestResource</ja>(
messages=<js>"nls/AddressBookResource"</js>,
+ title=<js>"$L{title}"</js>,
+ description=<js>"$L{description}"</js>,
+ pageLinks=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>,
properties={
- <ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_useWhitespace</jsf>, value=<js>"true"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, value=<js>"$L{title}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"$L{description}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>)
+ <ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_useWhitespace</jsf>, value=<js>"true"</js>)
},
encoders=GzipEncoder.<jk>class</jk>
)
@@ -1154,8 +1154,8 @@
<p class='bcode'>
<jc>// GET person request handler</jc>
<ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/people/{id}/*"</js>, rc={200,404})
- <jk>public</jk> Person getPerson(RestRequest req, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
- properties.put(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, req.getPathInfo());
+ <jk>public</jk> Person getPerson(RestRequest req, RestResponse res, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
+ res.setPageTitle(req.getPathInfo());
<jk>return</jk> findPerson(id);
}
@@ -1214,8 +1214,8 @@
<ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_useWhitespace</jsf>, value=<js>"true"</js>)
}
)
- <jk>public</jk> Person getPerson(RestRequest req, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
- properties.put(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, req.getPathInfo());
+ <jk>public</jk> Person getPerson(RestRequest req, RestResponse res, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
+ res.setPageTitle(req.getPathInfo());
<jk>return</jk> findPerson(id);
}
</p>
[12/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
index 5cd598c..1dd44a8 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
@@ -40,284 +40,287 @@
<span class="sourceLineNo">032</span>import org.apache.juneau.rest.annotation.Properties;<a name="line.32"></a>
<span class="sourceLineNo">033</span>import org.apache.juneau.rest.converters.*;<a name="line.33"></a>
<span class="sourceLineNo">034</span>import org.apache.juneau.transforms.*;<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> * REST resource for viewing and accessing log files.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> */<a name="line.38"></a>
-<span class="sourceLineNo">039</span>@RestResource(<a name="line.39"></a>
-<span class="sourceLineNo">040</span> path="/logs",<a name="line.40"></a>
-<span class="sourceLineNo">041</span> title="Log files",<a name="line.41"></a>
-<span class="sourceLineNo">042</span> description="Log files from this service",<a name="line.42"></a>
-<span class="sourceLineNo">043</span> properties={<a name="line.43"></a>
-<span class="sourceLineNo">044</span> @Property(name=HTML_uriAnchorText, value=PROPERTY_NAME),<a name="line.44"></a>
-<span class="sourceLineNo">045</span> @Property(name=REST_allowMethodParam, value="true")<a name="line.45"></a>
-<span class="sourceLineNo">046</span> },<a name="line.46"></a>
-<span class="sourceLineNo">047</span> pojoSwaps={<a name="line.47"></a>
-<span class="sourceLineNo">048</span> IteratorSwap.class, // Allows Iterators and Iterables to be serialized.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> DateSwap.ISO8601DT.class // Serialize Date objects as ISO8601 strings.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> }<a name="line.50"></a>
-<span class="sourceLineNo">051</span>)<a name="line.51"></a>
-<span class="sourceLineNo">052</span>@SuppressWarnings("nls")<a name="line.52"></a>
-<span class="sourceLineNo">053</span>public class LogsResource extends Resource {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private static final long serialVersionUID = 1L;<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> private File logDir;<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private LogEntryFormatter leFormatter;<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> private final FileFilter filter = new FileFilter() {<a name="line.59"></a>
-<span class="sourceLineNo">060</span> @Override /* FileFilter */<a name="line.60"></a>
-<span class="sourceLineNo">061</span> public boolean accept(File f) {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> return f.isDirectory() || f.getName().endsWith(".log");<a name="line.62"></a>
-<span class="sourceLineNo">063</span> }<a name="line.63"></a>
-<span class="sourceLineNo">064</span> };<a name="line.64"></a>
-<span class="sourceLineNo">065</span> <a name="line.65"></a>
-<span class="sourceLineNo">066</span> @Override /* RestServlet */<a name="line.66"></a>
-<span class="sourceLineNo">067</span> public synchronized void init(RestConfig config) throws Exception {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> super.init(config);<a name="line.68"></a>
-<span class="sourceLineNo">069</span> ConfigFile cf = config.getConfigFile();<a name="line.69"></a>
-<span class="sourceLineNo">070</span> <a name="line.70"></a>
-<span class="sourceLineNo">071</span> logDir = new File(cf.getString("Logging/logDir", "."));<a name="line.71"></a>
-<span class="sourceLineNo">072</span> leFormatter = new LogEntryFormatter(<a name="line.72"></a>
-<span class="sourceLineNo">073</span> cf.getString("Logging/format", "[{date} {level}] {msg}%n"),<a name="line.73"></a>
-<span class="sourceLineNo">074</span> cf.getString("Logging/dateFormat", "yyyy.MM.dd hh:mm:ss"),<a name="line.74"></a>
-<span class="sourceLineNo">075</span> cf.getBoolean("Logging/useStackTraceHashes")<a name="line.75"></a>
-<span class="sourceLineNo">076</span> );<a name="line.76"></a>
-<span class="sourceLineNo">077</span> }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> /**<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * [GET /*] - Get file details or directory listing.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> *<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * @param req The HTTP request<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * @param properties The writable properties for setting the descriptions.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * @param path The log file path.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * @return The log file.<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * @throws Exception<a name="line.86"></a>
-<span class="sourceLineNo">087</span> */<a name="line.87"></a>
-<span class="sourceLineNo">088</span> @RestMethod(name="GET", path="/*", responses={@Response(200),@Response(404)})<a name="line.88"></a>
-<span class="sourceLineNo">089</span> public Object getFileOrDirectory(RestRequest req, @Properties ObjectMap properties, @PathRemainder String path) throws Exception {<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> File f = getFile(path);<a name="line.91"></a>
+<span class="sourceLineNo">035</span>import org.apache.juneau.utils.*;<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> * REST resource for viewing and accessing log files.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>@RestResource(<a name="line.40"></a>
+<span class="sourceLineNo">041</span> path="/logs",<a name="line.41"></a>
+<span class="sourceLineNo">042</span> title="Log files",<a name="line.42"></a>
+<span class="sourceLineNo">043</span> description="Log files from this service",<a name="line.43"></a>
+<span class="sourceLineNo">044</span> properties={<a name="line.44"></a>
+<span class="sourceLineNo">045</span> @Property(name=HTML_uriAnchorText, value=PROPERTY_NAME),<a name="line.45"></a>
+<span class="sourceLineNo">046</span> @Property(name=REST_allowMethodParam, value="true")<a name="line.46"></a>
+<span class="sourceLineNo">047</span> },<a name="line.47"></a>
+<span class="sourceLineNo">048</span> pojoSwaps={<a name="line.48"></a>
+<span class="sourceLineNo">049</span> IteratorSwap.class, // Allows Iterators and Iterables to be serialized.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> DateSwap.ISO8601DT.class // Serialize Date objects as ISO8601 strings.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> }<a name="line.51"></a>
+<span class="sourceLineNo">052</span>)<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@SuppressWarnings("nls")<a name="line.53"></a>
+<span class="sourceLineNo">054</span>public class LogsResource extends Resource {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> private static final long serialVersionUID = 1L;<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> private File logDir;<a name="line.57"></a>
+<span class="sourceLineNo">058</span> private LogEntryFormatter leFormatter;<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span> private final FileFilter filter = new FileFilter() {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> @Override /* FileFilter */<a name="line.61"></a>
+<span class="sourceLineNo">062</span> public boolean accept(File f) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> return f.isDirectory() || f.getName().endsWith(".log");<a name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span> };<a name="line.65"></a>
+<span class="sourceLineNo">066</span> <a name="line.66"></a>
+<span class="sourceLineNo">067</span> @Override /* RestServlet */<a name="line.67"></a>
+<span class="sourceLineNo">068</span> public synchronized void init(RestConfig config) throws Exception {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> super.init(config);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> ConfigFile cf = config.getConfigFile();<a name="line.70"></a>
+<span class="sourceLineNo">071</span> <a name="line.71"></a>
+<span class="sourceLineNo">072</span> logDir = new File(cf.getString("Logging/logDir", "."));<a name="line.72"></a>
+<span class="sourceLineNo">073</span> leFormatter = new LogEntryFormatter(<a name="line.73"></a>
+<span class="sourceLineNo">074</span> cf.getString("Logging/format", "[{date} {level}] {msg}%n"),<a name="line.74"></a>
+<span class="sourceLineNo">075</span> cf.getString("Logging/dateFormat", "yyyy.MM.dd hh:mm:ss"),<a name="line.75"></a>
+<span class="sourceLineNo">076</span> cf.getBoolean("Logging/useStackTraceHashes")<a name="line.76"></a>
+<span class="sourceLineNo">077</span> );<a name="line.77"></a>
+<span class="sourceLineNo">078</span> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> /**<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * [GET /*] - Get file details or directory listing.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> *<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * @param req The HTTP request<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * @param res The HTTP response<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * @param properties The writable properties for setting the descriptions.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * @param path The log file path.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * @return The log file.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * @throws Exception<a name="line.88"></a>
+<span class="sourceLineNo">089</span> */<a name="line.89"></a>
+<span class="sourceLineNo">090</span> @RestMethod(name="GET", path="/*", responses={@Response(200),@Response(404)})<a name="line.90"></a>
+<span class="sourceLineNo">091</span> public Object getFileOrDirectory(RestRequest req, RestResponse res, @Properties ObjectMap properties, @PathRemainder String path) throws Exception {<a name="line.91"></a>
<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span> if (f.isDirectory()) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> Set<FileResource> l = new TreeSet<FileResource>(new FileResourceComparator());<a name="line.94"></a>
-<span class="sourceLineNo">095</span> File[] files = f.listFiles(filter);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> if (files != null) {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> for (File fc : files) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> URL fUrl = new URL(req.getTrimmedRequestURL().append('/').append(fc.getName()).toString());<a name="line.98"></a>
-<span class="sourceLineNo">099</span> l.add(new FileResource(fc, fUrl));<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span> properties.put(HTMLDOC_description, "Contents of " + f.getAbsolutePath());<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return l;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> properties.put(HTMLDOC_description, "File details on " + f.getAbsolutePath());<a name="line.106"></a>
-<span class="sourceLineNo">107</span> return new FileResource(f, new URL(req.getTrimmedRequestURL().toString()));<a name="line.107"></a>
-<span class="sourceLineNo">108</span> }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> /**<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * [VIEW /*] - Retrieve the contents of a log file.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> *<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * @param req The HTTP request.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * @param res The HTTP response.<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * @param path The log file path.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * @param properties The writable properties for setting the descriptions.<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * @param highlight If <code>true</code>, add color highlighting based on severity.<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&amp;start=2014-01-23 11:25:47".<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&amp;end=2014-01-23 11:25:47".<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&amp;thread=pool-33-thread-1".<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&amp;severity=(ERROR,WARN)".<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @throws Exception<a name="line.123"></a>
-<span class="sourceLineNo">124</span> */<a name="line.124"></a>
-<span class="sourceLineNo">125</span> @RestMethod(name="VIEW", path="/*", responses={@Response(200),@Response(404)})<a name="line.125"></a>
-<span class="sourceLineNo">126</span> @SuppressWarnings("nls")<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public void viewFile(RestRequest req, RestResponse res, @PathRemainder String path, @Properties ObjectMap properties, @Query("highlight") boolean highlight, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> File f = getFile(path);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> if (f.isDirectory())<a name="line.130"></a>
-<span class="sourceLineNo">131</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> Date startDate = StringUtils.parseISO8601Date(start), endDate = StringUtils.parseISO8601Date(end);<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> if (! highlight) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> Object o = getReader(f, startDate, endDate, thread, loggers, severity);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> res.setContentType("text/plain");<a name="line.137"></a>
-<span class="sourceLineNo">138</span> if (o instanceof Reader)<a name="line.138"></a>
-<span class="sourceLineNo">139</span> res.setOutput(o);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> else {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> LogParser p = (LogParser)o;<a name="line.141"></a>
-<span class="sourceLineNo">142</span> Writer w = res.getNegotiatedWriter();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> try {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> p.writeTo(w);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> } finally {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> w.flush();<a name="line.146"></a>
-<span class="sourceLineNo">147</span> w.close();<a name="line.147"></a>
-<span class="sourceLineNo">148</span> }<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> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> res.setContentType("text/html");<a name="line.153"></a>
-<span class="sourceLineNo">154</span> PrintWriter w = res.getNegotiatedWriter();<a name="line.154"></a>
-<span class="sourceLineNo">155</span> try {<a name="line.155"></a>
-<span class="sourceLineNo">156</span> w.println("<html><body style='font-family:monospace;font-size:8pt;white-space:pre;'>");<a name="line.156"></a>
-<span class="sourceLineNo">157</span> LogParser lp = getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> try {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> if (! lp.hasNext())<a name="line.159"></a>
-<span class="sourceLineNo">160</span> w.append("<span style='color:gray'>[EMPTY]</span>");<a name="line.160"></a>
-<span class="sourceLineNo">161</span> else for (LogParser.Entry le : lp) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> char s = le.severity.charAt(0);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> String color = "black";<a name="line.163"></a>
-<span class="sourceLineNo">164</span> //SEVERE|WARNING|INFO|CONFIG|FINE|FINER|FINEST<a name="line.164"></a>
-<span class="sourceLineNo">165</span> if (s == 'I')<a name="line.165"></a>
-<span class="sourceLineNo">166</span> color = "#006400";<a name="line.166"></a>
-<span class="sourceLineNo">167</span> else if (s == 'W')<a name="line.167"></a>
-<span class="sourceLineNo">168</span> color = "#CC8400";<a name="line.168"></a>
-<span class="sourceLineNo">169</span> else if (s == 'E' || s == 'S')<a name="line.169"></a>
-<span class="sourceLineNo">170</span> color = "#DD0000";<a name="line.170"></a>
-<span class="sourceLineNo">171</span> else if (s == 'D' || s == 'F' || s == 'T')<a name="line.171"></a>
-<span class="sourceLineNo">172</span> color = "#000064";<a name="line.172"></a>
-<span class="sourceLineNo">173</span> w.append("<span style='color:").append(color).append("'>");<a name="line.173"></a>
-<span class="sourceLineNo">174</span> le.appendHtml(w).append("</span>");<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> w.append("</body></html>");<a name="line.176"></a>
-<span class="sourceLineNo">177</span> } finally {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> lp.close();<a name="line.178"></a>
-<span class="sourceLineNo">179</span> }<a name="line.179"></a>
-<span class="sourceLineNo">180</span> } finally {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> w.close();<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> /**<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * [VIEW /*] - Retrieve the contents of a log file as parsed entries.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> *<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * @param req The HTTP request.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * @param path The log file path.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&amp;start=2014-01-23 11:25:47".<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&amp;end=2014-01-23 11:25:47".<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&amp;thread=pool-33-thread-1".<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&amp;severity=(ERROR,WARN)".<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * @return The parsed contents of the log file.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * @throws Exception<a name="line.196"></a>
-<span class="sourceLineNo">197</span> */<a name="line.197"></a>
-<span class="sourceLineNo">198</span> @RestMethod(name="PARSE", path="/*", converters=Queryable.class, responses={@Response(200),@Response(404)})<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public LogParser viewParsedEntries(RestRequest req, @PathRemainder String path, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> File f = getFile(path);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> Date startDate = StringUtils.parseISO8601Date(start), endDate = StringUtils.parseISO8601Date(end);<a name="line.202"></a>
+<span class="sourceLineNo">093</span> File f = getFile(path);<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span> if (f.isDirectory()) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> Set<FileResource> l = new TreeSet<FileResource>(new FileResourceComparator());<a name="line.96"></a>
+<span class="sourceLineNo">097</span> File[] files = f.listFiles(filter);<a name="line.97"></a>
+<span class="sourceLineNo">098</span> if (files != null) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> for (File fc : files) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> URL fUrl = new URL(req.getTrimmedRequestURL().append('/').append(fc.getName()).toString());<a name="line.100"></a>
+<span class="sourceLineNo">101</span> l.add(new FileResource(fc, fUrl));<a name="line.101"></a>
+<span class="sourceLineNo">102</span> }<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span> res.setPageText(new StringMessage("Contents of {0}", f.getAbsolutePath()));<a name="line.104"></a>
+<span class="sourceLineNo">105</span> properties.put(HTMLDOC_text, "Contents of " + f.getAbsolutePath());<a name="line.105"></a>
+<span class="sourceLineNo">106</span> return l;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> res.setPageText(new StringMessage("File details on {0}", f.getAbsolutePath()));<a name="line.109"></a>
+<span class="sourceLineNo">110</span> return new FileResource(f, new URL(req.getTrimmedRequestURL().toString()));<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> /**<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * [VIEW /*] - Retrieve the contents of a log file.<a name="line.114"></a>
+<span class="sourceLineNo">115</span> *<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * @param req The HTTP request.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * @param res The HTTP response.<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * @param path The log file path.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * @param properties The writable properties for setting the descriptions.<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * @param highlight If <code>true</code>, add color highlighting based on severity.<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&amp;start=2014-01-23 11:25:47".<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&amp;end=2014-01-23 11:25:47".<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&amp;thread=pool-33-thread-1".<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&amp;severity=(ERROR,WARN)".<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * @throws Exception<a name="line.126"></a>
+<span class="sourceLineNo">127</span> */<a name="line.127"></a>
+<span class="sourceLineNo">128</span> @RestMethod(name="VIEW", path="/*", responses={@Response(200),@Response(404)})<a name="line.128"></a>
+<span class="sourceLineNo">129</span> @SuppressWarnings("nls")<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public void viewFile(RestRequest req, RestResponse res, @PathRemainder String path, @Properties ObjectMap properties, @Query("highlight") boolean highlight, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> File f = getFile(path);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (f.isDirectory())<a name="line.133"></a>
+<span class="sourceLineNo">134</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> Date startDate = StringUtils.parseISO8601Date(start), endDate = StringUtils.parseISO8601Date(end);<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> if (! highlight) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> Object o = getReader(f, startDate, endDate, thread, loggers, severity);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> res.setContentType("text/plain");<a name="line.140"></a>
+<span class="sourceLineNo">141</span> if (o instanceof Reader)<a name="line.141"></a>
+<span class="sourceLineNo">142</span> res.setOutput(o);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> else {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> LogParser p = (LogParser)o;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> Writer w = res.getNegotiatedWriter();<a name="line.145"></a>
+<span class="sourceLineNo">146</span> try {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> p.writeTo(w);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> } finally {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> w.flush();<a name="line.149"></a>
+<span class="sourceLineNo">150</span> w.close();<a name="line.150"></a>
+<span class="sourceLineNo">151</span> }<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span> return;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> res.setContentType("text/html");<a name="line.156"></a>
+<span class="sourceLineNo">157</span> PrintWriter w = res.getNegotiatedWriter();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> try {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> w.println("<html><body style='font-family:monospace;font-size:8pt;white-space:pre;'>");<a name="line.159"></a>
+<span class="sourceLineNo">160</span> LogParser lp = getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> try {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> if (! lp.hasNext())<a name="line.162"></a>
+<span class="sourceLineNo">163</span> w.append("<span style='color:gray'>[EMPTY]</span>");<a name="line.163"></a>
+<span class="sourceLineNo">164</span> else for (LogParser.Entry le : lp) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> char s = le.severity.charAt(0);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> String color = "black";<a name="line.166"></a>
+<span class="sourceLineNo">167</span> //SEVERE|WARNING|INFO|CONFIG|FINE|FINER|FINEST<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (s == 'I')<a name="line.168"></a>
+<span class="sourceLineNo">169</span> color = "#006400";<a name="line.169"></a>
+<span class="sourceLineNo">170</span> else if (s == 'W')<a name="line.170"></a>
+<span class="sourceLineNo">171</span> color = "#CC8400";<a name="line.171"></a>
+<span class="sourceLineNo">172</span> else if (s == 'E' || s == 'S')<a name="line.172"></a>
+<span class="sourceLineNo">173</span> color = "#DD0000";<a name="line.173"></a>
+<span class="sourceLineNo">174</span> else if (s == 'D' || s == 'F' || s == 'T')<a name="line.174"></a>
+<span class="sourceLineNo">175</span> color = "#000064";<a name="line.175"></a>
+<span class="sourceLineNo">176</span> w.append("<span style='color:").append(color).append("'>");<a name="line.176"></a>
+<span class="sourceLineNo">177</span> le.appendHtml(w).append("</span>");<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> w.append("</body></html>");<a name="line.179"></a>
+<span class="sourceLineNo">180</span> } finally {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> lp.close();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> } finally {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> w.close();<a name="line.184"></a>
+<span class="sourceLineNo">185</span> }<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> /**<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * [VIEW /*] - Retrieve the contents of a log file as parsed entries.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> *<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * @param req The HTTP request.<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * @param path The log file path.<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&amp;start=2014-01-23 11:25:47".<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&amp;end=2014-01-23 11:25:47".<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&amp;thread=pool-33-thread-1".<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&amp;severity=(ERROR,WARN)".<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * @return The parsed contents of the log file.<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * @throws Exception<a name="line.199"></a>
+<span class="sourceLineNo">200</span> */<a name="line.200"></a>
+<span class="sourceLineNo">201</span> @RestMethod(name="PARSE", path="/*", converters=Queryable.class, responses={@Response(200),@Response(404)})<a name="line.201"></a>
+<span class="sourceLineNo">202</span> public LogParser viewParsedEntries(RestRequest req, @PathRemainder String path, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> if (f.isDirectory())<a name="line.204"></a>
-<span class="sourceLineNo">205</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.205"></a>
+<span class="sourceLineNo">204</span> File f = getFile(path);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> Date startDate = StringUtils.parseISO8601Date(start), endDate = StringUtils.parseISO8601Date(end);<a name="line.205"></a>
<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> return getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">207</span> if (f.isDirectory())<a name="line.207"></a>
+<span class="sourceLineNo">208</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<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> * [DOWNLOAD /*] - Download file.<a name="line.211"></a>
-<span class="sourceLineNo">212</span> *<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * @param res The HTTP response.<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * @param path The log file path.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * @return The contents of the log file.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * @throws Exception<a name="line.216"></a>
-<span class="sourceLineNo">217</span> */<a name="line.217"></a>
-<span class="sourceLineNo">218</span> @RestMethod(name="DOWNLOAD", path="/*", responses={@Response(200),@Response(404)})<a name="line.218"></a>
-<span class="sourceLineNo">219</span> public Object downloadFile(RestResponse res, @PathRemainder String path) throws Exception {<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> File f = getFile(path);<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> if (f.isDirectory())<a name="line.223"></a>
-<span class="sourceLineNo">224</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "Download not available on directories");<a name="line.224"></a>
+<span class="sourceLineNo">210</span> return getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span> /**<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * [DOWNLOAD /*] - Download file.<a name="line.214"></a>
+<span class="sourceLineNo">215</span> *<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * @param res The HTTP response.<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * @param path The log file path.<a name="line.217"></a>
+<span class="sourceLineNo">218</span> * @return The contents of the log file.<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * @throws Exception<a name="line.219"></a>
+<span class="sourceLineNo">220</span> */<a name="line.220"></a>
+<span class="sourceLineNo">221</span> @RestMethod(name="DOWNLOAD", path="/*", responses={@Response(200),@Response(404)})<a name="line.221"></a>
+<span class="sourceLineNo">222</span> public Object downloadFile(RestResponse res, @PathRemainder String path) throws Exception {<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> File f = getFile(path);<a name="line.224"></a>
<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> res.setContentType("application/octet-stream"); //$NON-NLS-1$<a name="line.226"></a>
-<span class="sourceLineNo">227</span> res.setContentLength((int)f.length());<a name="line.227"></a>
-<span class="sourceLineNo">228</span> return new FileInputStream(f);<a name="line.228"></a>
-<span class="sourceLineNo">229</span> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> /**<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * [DELETE /*] - Delete a file.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> *<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * @param path The log file path.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * @return A redirect object to the root.<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * @throws Exception<a name="line.236"></a>
-<span class="sourceLineNo">237</span> */<a name="line.237"></a>
-<span class="sourceLineNo">238</span> @RestMethod(name="DELETE", path="/*", responses={@Response(200),@Response(404)})<a name="line.238"></a>
-<span class="sourceLineNo">239</span> public Object deleteFile(@PathRemainder String path) throws Exception {<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> File f = getFile(path);<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span> if (f.isDirectory())<a name="line.243"></a>
-<span class="sourceLineNo">244</span> throw new RestException(SC_BAD_REQUEST, "Delete not available on directories.");<a name="line.244"></a>
+<span class="sourceLineNo">226</span> if (f.isDirectory())<a name="line.226"></a>
+<span class="sourceLineNo">227</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "Download not available on directories");<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> res.setContentType("application/octet-stream"); //$NON-NLS-1$<a name="line.229"></a>
+<span class="sourceLineNo">230</span> res.setContentLength((int)f.length());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return new FileInputStream(f);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> /**<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * [DELETE /*] - Delete a file.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> *<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * @param path The log file path.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * @return A redirect object to the root.<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * @throws Exception<a name="line.239"></a>
+<span class="sourceLineNo">240</span> */<a name="line.240"></a>
+<span class="sourceLineNo">241</span> @RestMethod(name="DELETE", path="/*", responses={@Response(200),@Response(404)})<a name="line.241"></a>
+<span class="sourceLineNo">242</span> public Object deleteFile(@PathRemainder String path) throws Exception {<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span> File f = getFile(path);<a name="line.244"></a>
<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> if (f.canWrite())<a name="line.246"></a>
-<span class="sourceLineNo">247</span> if (! f.delete())<a name="line.247"></a>
-<span class="sourceLineNo">248</span> throw new RestException(SC_FORBIDDEN, "Could not delete file.");<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> return new Redirect(path + "/.."); //$NON-NLS-1$<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">246</span> if (f.isDirectory())<a name="line.246"></a>
+<span class="sourceLineNo">247</span> throw new RestException(SC_BAD_REQUEST, "Delete not available on directories.");<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> if (f.canWrite())<a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (! f.delete())<a name="line.250"></a>
+<span class="sourceLineNo">251</span> throw new RestException(SC_FORBIDDEN, "Could not delete file.");<a name="line.251"></a>
<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> private static BufferedReader getReader(File f) throws IOException {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> return new BufferedReader(new InputStreamReader(new FileInputStream(f), Charset.defaultCharset()));<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> private File getFile(String path) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> if (path != null && path.indexOf("..") != -1)<a name="line.258"></a>
-<span class="sourceLineNo">259</span> throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.259"></a>
-<span class="sourceLineNo">260</span> File f = (path == null ? logDir : new File(logDir.getAbsolutePath() + '/' + path));<a name="line.260"></a>
-<span class="sourceLineNo">261</span> if (filter.accept(f))<a name="line.261"></a>
-<span class="sourceLineNo">262</span> return f;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> /**<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * File bean.<a name="line.267"></a>
-<span class="sourceLineNo">268</span> */<a name="line.268"></a>
-<span class="sourceLineNo">269</span> @SuppressWarnings("javadoc")<a name="line.269"></a>
-<span class="sourceLineNo">270</span> public static class FileResource {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> private File f;<a name="line.271"></a>
-<span class="sourceLineNo">272</span> public String type;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> public Object name;<a name="line.273"></a>
-<span class="sourceLineNo">274</span> public Long size;<a name="line.274"></a>
-<span class="sourceLineNo">275</span> @BeanProperty(swap=DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public URL view, highlighted, parsed, download, delete;<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span> public FileResource(File f, URL url) throws IOException {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> this.f = f;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> this.type = (f.isDirectory() ? "dir" : "file");<a name="line.280"></a>
-<span class="sourceLineNo">281</span> this.name = f.isDirectory() ? new Link(f.getName(), url.toString()) : f.getName();<a name="line.281"></a>
-<span class="sourceLineNo">282</span> this.size = f.isDirectory() ? null : f.length();<a name="line.282"></a>
-<span class="sourceLineNo">283</span> this.lastModified = new Date(f.lastModified());<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (f.canRead() && ! f.isDirectory()) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> this.view = new URL(url + "?method=VIEW");<a name="line.285"></a>
-<span class="sourceLineNo">286</span> this.highlighted = new URL(url + "?method=VIEW&highlight=true");<a name="line.286"></a>
-<span class="sourceLineNo">287</span> this.parsed = new URL(url + "?method=PARSE");<a name="line.287"></a>
-<span class="sourceLineNo">288</span> this.download = new URL(url + "?method=DOWNLOAD");<a name="line.288"></a>
-<span class="sourceLineNo">289</span> this.delete = new URL(url + "?method=DELETE");<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> private static class FileResourceComparator implements Comparator<FileResource>, Serializable {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> private static final long serialVersionUID = 1L;<a name="line.295"></a>
-<span class="sourceLineNo">296</span> @Override /* Comparator */<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public int compare(FileResource o1, FileResource o2) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> int c = o1.type.compareTo(o2.type);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return c != 0 ? c : o1.f.getName().compareTo(o2.f.getName());<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span> private Object getReader(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.303"></a>
-<span class="sourceLineNo">304</span> if (start == null && end == null && thread == null && loggers == null)<a name="line.304"></a>
-<span class="sourceLineNo">305</span> return getReader(f);<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return getLogParser(f, start, end, thread, loggers, severity);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> }<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span> private LogParser getLogParser(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> return new LogParser(leFormatter, f, start, end, thread, loggers, severity);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>}<a name="line.312"></a>
+<span class="sourceLineNo">253</span> return new Redirect(path + "/.."); //$NON-NLS-1$<a name="line.253"></a>
+<span class="sourceLineNo">254</span> }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span> private static BufferedReader getReader(File f) throws IOException {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> return new BufferedReader(new InputStreamReader(new FileInputStream(f), Charset.defaultCharset()));<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span> private File getFile(String path) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if (path != null && path.indexOf("..") != -1)<a name="line.261"></a>
+<span class="sourceLineNo">262</span> throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.262"></a>
+<span class="sourceLineNo">263</span> File f = (path == null ? logDir : new File(logDir.getAbsolutePath() + '/' + path));<a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (filter.accept(f))<a name="line.264"></a>
+<span class="sourceLineNo">265</span> return f;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> /**<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * File bean.<a name="line.270"></a>
+<span class="sourceLineNo">271</span> */<a name="line.271"></a>
+<span class="sourceLineNo">272</span> @SuppressWarnings("javadoc")<a name="line.272"></a>
+<span class="sourceLineNo">273</span> public static class FileResource {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> private File f;<a name="line.274"></a>
+<span class="sourceLineNo">275</span> public String type;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public Object name;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> public Long size;<a name="line.277"></a>
+<span class="sourceLineNo">278</span> @BeanProperty(swap=DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.278"></a>
+<span class="sourceLineNo">279</span> public URL view, highlighted, parsed, download, delete;<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> public FileResource(File f, URL url) throws IOException {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> this.f = f;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> this.type = (f.isDirectory() ? "dir" : "file");<a name="line.283"></a>
+<span class="sourceLineNo">284</span> this.name = f.isDirectory() ? new Link(f.getName(), url.toString()) : f.getName();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> this.size = f.isDirectory() ? null : f.length();<a name="line.285"></a>
+<span class="sourceLineNo">286</span> this.lastModified = new Date(f.lastModified());<a name="line.286"></a>
+<span class="sourceLineNo">287</span> if (f.canRead() && ! f.isDirectory()) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> this.view = new URL(url + "?method=VIEW");<a name="line.288"></a>
+<span class="sourceLineNo">289</span> this.highlighted = new URL(url + "?method=VIEW&highlight=true");<a name="line.289"></a>
+<span class="sourceLineNo">290</span> this.parsed = new URL(url + "?method=PARSE");<a name="line.290"></a>
+<span class="sourceLineNo">291</span> this.download = new URL(url + "?method=DOWNLOAD");<a name="line.291"></a>
+<span class="sourceLineNo">292</span> this.delete = new URL(url + "?method=DELETE");<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span> }<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span> private static class FileResourceComparator implements Comparator<FileResource>, Serializable {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> private static final long serialVersionUID = 1L;<a name="line.298"></a>
+<span class="sourceLineNo">299</span> @Override /* Comparator */<a name="line.299"></a>
+<span class="sourceLineNo">300</span> public int compare(FileResource o1, FileResource o2) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> int c = o1.type.compareTo(o2.type);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> return c != 0 ? c : o1.f.getName().compareTo(o2.f.getName());<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> private Object getReader(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> if (start == null && end == null && thread == null && loggers == null)<a name="line.307"></a>
+<span class="sourceLineNo">308</span> return getReader(f);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> return getLogParser(f, start, end, thread, loggers, severity);<a name="line.309"></a>
+<span class="sourceLineNo">310</span> }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span> private LogParser getLogParser(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> return new LogParser(leFormatter, f, start, end, thread, loggers, severity);<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span>}<a name="line.315"></a>
[42/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html b/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html
index b5cf134..7bc1075 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html
@@ -225,7 +225,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/json/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/package-summary.html b/content/site/apidocs/org/apache/juneau/json/package-summary.html
index f70c984..dbc766f 100644
--- a/content/site/apidocs/org/apache/juneau/json/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/json/package-summary.html
@@ -1161,12 +1161,12 @@
// Consists of an in-memory address book repository.</jc>
<ja>@RestResource</ja>(
messages=<js>"nls/AddressBookResource"</js>,
+ title=<js>"$L{title}"</js>,
+ description=<js>"$L{description}"</js>,
+ pageLinks=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>,
properties={
<ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
- <ja>@Property</ja>(name=HtmlSerializerContext.<jsf>HTML_uriAnchorText</jsf>, value=<jsf>TO_STRING</jsf>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, value=<js>"$L{title}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"$L{description}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>)
+ <ja>@Property</ja>(name=HtmlSerializerContext.<jsf>HTML_uriAnchorText</jsf>, value=<jsf>TO_STRING</jsf>)
},
encoders=GzipEncoder.<jk>class</jk>
)
@@ -1195,8 +1195,8 @@
<p class='bcode'>
<jc>// GET person request handler</jc>
<ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/people/{id}/*"</js>, rc={200,404})
- <jk>public</jk> Person getPerson(RestRequest req, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
- properties.put(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, req.getPathInfo());
+ <jk>public</jk> Person getPerson(RestRequest req, RestResponse res, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
+ res.setPageTitle(req.getPathInfo());
<jk>return</jk> findPerson(id);
}
@@ -1255,8 +1255,8 @@
<ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>)
}
)
- <jk>public</jk> Person getPerson(RestRequest req, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
- properties.put(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, req.getPathInfo());
+ <jk>public</jk> Person getPerson(RestRequest req, RestResponse res, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
+ res.setPageTitle(req.getPathInfo());
<jk>return</jk> findPerson(id);
}
</p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/microservice/Microservice.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/Microservice.html b/content/site/apidocs/org/apache/juneau/microservice/Microservice.html
index e0778d9..91b4240 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/Microservice.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/Microservice.html
@@ -725,7 +725,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>join</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.534">join</a>()
+<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.535">join</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Joins the application with the current thread.
<p>
@@ -744,7 +744,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>stop</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.547">stop</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.548">stop</a>()</pre>
<div class="block">Stop this application.
<p>
Default implementation simply calls <a href="../../../../org/apache/juneau/microservice/Microservice.html#onStop--"><code>onStop()</code></a>.
@@ -762,7 +762,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>kill</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.555">kill</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.556">kill</a>()</pre>
<div class="block">Kill the JVM by calling <code>System.exit(2);</code>.</div>
</li>
</ul>
@@ -772,7 +772,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>onStart</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.571">onStart</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.572">onStart</a>()</pre>
<div class="block">Called at the beginning of the <a href="../../../../org/apache/juneau/microservice/Microservice.html#start--"><code>start()</code></a> call.
<p>
Subclasses can override this method to hook into the lifecycle of this application.</div>
@@ -784,7 +784,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>onStop</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.578">onStop</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.579">onStop</a>()</pre>
<div class="block">Called at the end of the <a href="../../../../org/apache/juneau/microservice/Microservice.html#stop--"><code>stop()</code></a> call.
<p>
Subclasses can override this method to hook into the lifecycle of this application.</div>
@@ -796,7 +796,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>onConfigSave</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.587">onConfigSave</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.588">onConfigSave</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
<div class="block">Called if the <a href="../../../../org/apache/juneau/ini/ConfigFile.html#save--"><code>ConfigFile.save()</code></a> is called on the config file.
<p>
Subclasses can override this method to listen for config file changes.</div>
@@ -812,7 +812,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>onConfigChange</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.597">onConfigChange</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf,
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.598">onConfigChange</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> changes)</pre>
<div class="block">Called if one or more changes occur in the config file.
<p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/microservice/Resource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/Resource.html b/content/site/apidocs/org/apache/juneau/microservice/Resource.html
index f1e62b9..3d88c29 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/Resource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/Resource.html
@@ -136,7 +136,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#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>="HtmlDocSerializer.links.map",<a href="../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="{up:\'$R{requestParentURI}\',options:\'$R{servletURI}?method=OPTIONS\'}"),
+<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#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>="HtmlDocSerializer.links.map",<a href="../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="{up:\'$R{requestParentURI}\',options:\'?method=OPTIONS\'}"),
<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#config--">config</a>="$S{juneau.configFile}",
<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#stylesheet--">stylesheet</a>="$C{REST/stylesheet,styles/juneau.css}")
public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/Resource.html#line.48">Resource</a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html b/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
index 040f4de..a140a39 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
@@ -141,10 +141,10 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#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>="HtmlDocSerializer.links.map",<a href="../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="{up:\'$R{requestParentURI}\',options:\'$R{servletURI}?method=OPTIONS\'}"),
+<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#pageLinks--">pageLinks</a>="{up:\'$R{requestParentURI}\',options:\'?method=OPTIONS\'}",
<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#config--">config</a>="$S{juneau.configFile}",
<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#stylesheet--">stylesheet</a>="$C{REST/stylesheet,styles/juneau.css}")
-public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.49">ResourceGroup</a>
+public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.45">ResourceGroup</a>
extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></pre>
<div class="block">Superclass for all REST resource groups.
<p>
@@ -272,7 +272,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html
<ul class="blockListLast">
<li class="blockList">
<h4>ResourceGroup</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.49">ResourceGroup</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.45">ResourceGroup</a>()</pre>
</li>
</ul>
</li>
@@ -289,7 +289,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html
<ul class="blockListLast">
<li class="blockList">
<h4>init</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.52">init</a>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)
+<pre>public void <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.48">init</a>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestConfig-">RestServlet</a></code></span></div>
<div class="block">Resource initialization method.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html b/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
index 8d84f53..f5642a3 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
@@ -126,10 +126,10 @@
</dl>
<hr>
<br>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#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>="HtmlDocSerializer.links.map",<a href="../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="{up:\'$R{requestParentURI}\',options:\'$R{servletURI}?method=OPTIONS\'}"),
+<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#pageLinks--">pageLinks</a>="{up:\'$R{requestParentURI}\',options:\'?method=OPTIONS\'}",
<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#config--">config</a>="$S{juneau.configFile}",
<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#stylesheet--">stylesheet</a>="$C{REST/stylesheet,styles/juneau.css}")
-public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJena.html#line.31">ResourceJena</a>
+public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJena.html#line.27">ResourceJena</a>
extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a></pre>
<div class="block">Superclass for all REST resources with RDF support.</div>
<dl>
@@ -220,7 +220,7 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.
<ul class="blockListLast">
<li class="blockList">
<h4>ResourceJena</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJena.html#line.31">ResourceJena</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJena.html#line.27">ResourceJena</a>()</pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/microservice/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/package-summary.html b/content/site/apidocs/org/apache/juneau/microservice/package-summary.html
index faa3da8..663fc7d 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/package-summary.html
@@ -253,7 +253,7 @@
title=<js>"Juneau Microservice Template"</js>,
description=<js>"Template for creating REST microservices"</js>,
properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'$R{servletURI}?method=OPTIONS'}"</js>)
+ <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS'}"</js>)
},
children={
HelloWorldResource.<jk>class</jk>,
@@ -842,7 +842,7 @@
title=<js>"Juneau Microservice Template"</js>,
description=<js>"Template for creating REST microservices"</js>,
properties={
- <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'$R{servletURI}?method=OPTIONS'}"</js>)
+ <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS'}"</js>)
},
children={
HelloWorldResource.<jk>class</jk>,
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html b/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html
index 482666d..0395548 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html
@@ -140,8 +140,8 @@ var activeTableTab = "activeTableTab";
<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#path--">path</a>="/config",
<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#title--">title</a>="Configuration",
<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#description--">description</a>="Contents of configuration file.",
- <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>="HtmlDocSerializer.links.map",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="{up:\'$R{requestParentURI}\',options:\'$R{servletURI}?method=OPTIONS\',edit:\'$R{servletURI}/edit\'}"))
-public class <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.41">ConfigResource</a>
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pageLinks--">pageLinks</a>="{up:\'$R{requestParentURI}\',options:\'?method=OPTIONS\',edit:\'edit\'}")
+public class <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.38">ConfigResource</a>
extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a></pre>
<div class="block">Shows contents of the microservice configuration file.</div>
<dl>
@@ -298,7 +298,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" ti
<ul class="blockListLast">
<li class="blockList">
<h4>ConfigResource</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.41">ConfigResource</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.38">ConfigResource</a>()</pre>
</li>
</ul>
</li>
@@ -318,7 +318,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" ti
<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="GET",
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/",
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Show contents of config file.")
-public <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.51">getConfigContents</a>()
+public <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.48">getConfigContents</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">[GET /] - Show contents of config file.</div>
<dl>
@@ -338,7 +338,7 @@ public <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title
<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="GET",
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/edit",
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Edit config file.")
-public <a href="../../../../../org/apache/juneau/dto/html5/Form.html" title="class in org.apache.juneau.dto.html5">Form</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.63">getConfigEditForm</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req)
+public <a href="../../../../../org/apache/juneau/dto/html5/Form.html" title="class in org.apache.juneau.dto.html5">Form</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.60">getConfigEditForm</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">[GET /edit] - Show config file edit page.</div>
<dl>
@@ -361,7 +361,7 @@ public <a href="../../../../../org/apache/juneau/dto/html5/Form.html" title
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/{section}",
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Show config file section.",
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#parameters--">parameters</a>=<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">@Parameter</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#in--">in</a>="path",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#name--">name</a>="section",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#description--">description</a>="Section name."))
-public <a href="../../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.91">getConfigSection</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="section")
+public <a href="../../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.88">getConfigSection</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="section")
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> section)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">[GET /{section}] - Show config file section.</div>
@@ -382,7 +382,7 @@ public <a href="../../../../../org/apache/juneau/ObjectMap.html" title="cla
<li class="blockList">
<h4>getConfigEntry</h4>
<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="GET",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/{section}/{key}",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Show config file entry.",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#parameters--">parameters</a>={<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">@Parameter</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#in--">in</a>="path",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#name--">name</a>="section",<a href="../../../../../org/apache/juneau/rest/annotation/Paramet
er.html#description--">description</a>="Section name."),<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">@Parameter</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#in--">in</a>="path",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#name--">name</a>="key",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#description--">description</a>="Entry name.")})
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.110">getConfigEntry</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="section")
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.107">getConfigEntry</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="section")
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> section,
<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="key")
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)
@@ -409,7 +409,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/",
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Sets contents of config file from a FORM post.",
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#parameters--">parameters</a>=<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">@Parameter</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#in--">in</a>="formData",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#name--">name</a>="contents",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#description--">description</a>="New contents in INI file format."))
-public <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.127">setConfigContentsFormPost</a>(<a href="../../../../../org/apache/juneau/rest/annotation/FormData.html" title="annotation in org.apache.juneau.rest.annotation">@FormData</a>(<a href="../../../../../org/apache/juneau/rest/annotation/FormData.html#value--">value</a>="contents")
+public <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.124">setConfigContentsFormPost</a>(<a href="../../../../../org/apache/juneau/rest/annotation/FormData.html" title="annotation in org.apache.juneau.rest.annotation">@FormData</a>(<a href="../../../../../org/apache/juneau/rest/annotation/FormData.html#value--">value</a>="contents")
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> contents)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">[POST /] - Sets contents of config file from a FORM post.</div>
@@ -433,7 +433,7 @@ public <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/",
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Sets contents of config file.",
<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#parameters--">parameters</a>=<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">@Parameter</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#in--">in</a>="body",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#description--">description</a>="New contents in INI file format."))
-public <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.144">setConfigContents</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Body.html" title="annotation in org.apache.juneau.rest.annotation">@Body</a>
+public <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.141">setConfigContents</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Body.html" title="annotation in org.apache.juneau.rest.annotation">@Body</a>
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> contents)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">[PUT /] - Sets contents of config file.</div>
@@ -454,7 +454,7 @@ public <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title
<li class="blockList">
<h4>setConfigSection</h4>
<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="PUT",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/{section}",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Add or overwrite a config file section.",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#parameters--">parameters</a>={<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">@Parameter</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#in--">in</a>="path",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#name--">name</a>="section",<a href="../../../../../org/apache/juneau/rest/annotati
on/Parameter.html#description--">description</a>="Section name."),<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">@Parameter</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#in--">in</a>="body",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#description--">description</a>="New contents for section as a simple map with string keys and values.")})
-public <a href="../../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.164">setConfigSection</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="section")
+public <a href="../../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.161">setConfigSection</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="section")
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> section,
<a href="../../../../../org/apache/juneau/rest/annotation/Body.html" title="annotation in org.apache.juneau.rest.annotation">@Body</a>
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> contents)
@@ -478,7 +478,7 @@ public <a href="../../../../../org/apache/juneau/ObjectMap.html" title="cla
<li class="blockList">
<h4>setConfigSection</h4>
<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="PUT",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/{section}/{key}",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Add or overwrite a config file entry.",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#parameters--">parameters</a>={<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">@Parameter</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#in--">in</a>="path",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#name--">name</a>="section",<a href="../../../../../org/apache/juneau/rest/anno
tation/Parameter.html#description--">description</a>="Section name."),<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">@Parameter</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#in--">in</a>="path",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#name--">name</a>="key",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#description--">description</a>="Entry name."),<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">@Parameter</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#in--">in</a>="body",<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#description--">description</a>="New value as a string.")})
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.186">setConfigSection</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="section")
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.183">setConfigSection</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="section")
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> section,
<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="key")
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key,
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.html b/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.html
index a6b18f4..6540ddb 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.html
@@ -137,7 +137,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#title--">title</a>="File System Explorer",<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#description--">description</a>="Contents of $R{attribute.path}",<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--">messages</a>="nls/DirectoryResource",<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>="HtmlSerializer.uriAnchorText",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a
>="PROPERTY_NAME"),<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>="HtmlDocSerializer.links.map",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="{up:\'$R{requestParentURI}\',options:\'?method=OPTIONS\',source:\'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.DirectoryResource)\'}"),<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>="*"),<a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.ju
neau.rest.annotation">@Property</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#name--">name</a>="DirectoryResource.rootDir",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</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>="DirectoryResource.allowViews",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="false"),<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>="DirectoryResource.allowDeletes",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="false"),<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>="DirectoryResource.allowPuts",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="false")})
+<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#title--">title</a>="File System Explorer",<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#description--">description</a>="Contents of $R{attribute.path}",<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--">messages</a>="nls/DirectoryResource",<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pageLinks--">pageLinks</a>="{up:\'$R{requestParentURI}\',options:\'?method=OPTIONS\'}",<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>="HtmlSerializer.uriAnchorText",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="PROPERTY_NAME"),<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>="*"),<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>="DirectoryResource.rootDir",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>=""),<a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apa
che.juneau.rest.annotation">@Property</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#name--">name</a>="DirectoryResource.allowViews",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="false"),<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>="DirectoryResource.allowDeletes",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="false"),<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>="DirectoryResource.allowPuts",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="false")})
public class <a href="../../../../../src-html/org/apache/juneau/microservice/resources/DirectoryResource.html#line.70">DirectoryResource</a>
extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a></pre>
<div class="block">REST resource that allows access to a file system directory.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
index 40d29e4..2a9de2a 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
@@ -106,7 +106,7 @@
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.270">LogsResource.FileResource</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.273">LogsResource.FileResource</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">File bean.</div>
</li>
@@ -217,7 +217,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>type</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.272">type</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.275">type</a></pre>
</li>
</ul>
<a name="name">
@@ -226,7 +226,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>name</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.273">name</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.276">name</a></pre>
</li>
</ul>
<a name="size">
@@ -235,7 +235,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>size</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.274">size</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.277">size</a></pre>
</li>
</ul>
<a name="lastModified">
@@ -245,7 +245,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<li class="blockList">
<h4>lastModified</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#swap--">swap</a>=<a href="../../../../../org/apache/juneau/transforms/DateSwap.DateTimeMedium.html" title="class in org.apache.juneau.transforms">DateSwap.DateTimeMedium.class</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.275">lastModified</a></pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.278">lastModified</a></pre>
</li>
</ul>
<a name="view">
@@ -254,7 +254,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockList">
<li class="blockList">
<h4>view</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.276">view</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.279">view</a></pre>
</li>
</ul>
<a name="highlighted">
@@ -263,7 +263,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockList">
<li class="blockList">
<h4>highlighted</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.276">highlighted</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.279">highlighted</a></pre>
</li>
</ul>
<a name="parsed">
@@ -272,7 +272,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockList">
<li class="blockList">
<h4>parsed</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.276">parsed</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.279">parsed</a></pre>
</li>
</ul>
<a name="download">
@@ -281,7 +281,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockList">
<li class="blockList">
<h4>download</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.276">download</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.279">download</a></pre>
</li>
</ul>
<a name="delete">
@@ -290,7 +290,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockListLast">
<li class="blockList">
<h4>delete</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.276">delete</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.279">delete</a></pre>
</li>
</ul>
</li>
@@ -307,7 +307,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockListLast">
<li class="blockList">
<h4>FileResource</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.278">FileResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f,
+<pre>public <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.281">FileResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f,
<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a> url)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
[45/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerContext.html b/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerContext.html
index e4526f1..184c99a 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerContext.html
@@ -133,7 +133,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerContext.html#line.53">HtmlDocSerializerContext</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerContext.html#line.65">HtmlDocSerializerContext</a>
extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html" title="class in org.apache.juneau.html">HtmlSerializerContext</a></pre>
<div class="block">Properties associated with the <a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html"><code>HtmlDocSerializer</code></a> class.
<p>
@@ -153,6 +153,18 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {
</p>
<p>
+ Note that shortcut annotations are also provided for these particular settings:
+ <p class='bcode'>
+ <ja>@RestResource</ja>(
+ messages=<js>"nls/AddressBookResource"</js>,
+ title=<js>"$L{title}"</js>, <jc>// or pageTitle</jc>
+ description=<js>"$L{description}"</js>, <jc>// or pageText</jc>
+ pageLinks=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>
+ )
+ <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {
+ </p>
+
+ <p>
The <code>$L{...}</code> variable represent localized strings pulled from the resource bundle identified by the <code>messages</code> annotation.
These variables are replaced at runtime based on the HTTP request locale.
Several built-in runtime variable types are defined, and the API can be extended to include user-defined variables.
@@ -205,28 +217,28 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_description">HTMLDOC_description</a></span></code>
-<div class="block"><b>Configuration property:</b> Page description.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_links">HTMLDOC_links</a></span></code>
<div class="block"><b>Configuration property:</b> Page links.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_links_put">HTMLDOC_links_put</a></span></code>
<div class="block"><b>Configuration property:</b> Add to the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_links"><code>HTMLDOC_links</code></a> property.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_nowrap">HTMLDOC_nowrap</a></span></code>
<div class="block"><b>Configuration property:</b> Prevent word wrap on page.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_text">HTMLDOC_text</a></span></code>
+<div class="block"><b>Configuration property:</b> Page description.</div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_title">HTMLDOC_title</a></span></code>
@@ -343,7 +355,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<ul class="blockList">
<li class="blockList">
<h4>HTMLDOC_title</h4>
-<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.90">HTMLDOC_title</a></pre>
+<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.111">HTMLDOC_title</a></pre>
<div class="block"><b>Configuration property:</b> Page title.
<p>
<ul>
@@ -376,20 +388,29 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<p>
...to produce this title on the HTML page...
</p>
- <img class='bordered' src='doc-files/HTML_TITLE.png'></div>
+ <img class='bordered' src='doc-files/HTML_TITLE.png'>
+ <p>
+ Shortcuts on <ja>@RestResource</ja> are also provided for this setting:
+ <p class='bcode'>
+ <ja>@RestResource</ja>(
+ messages=<js>"nls/AddressBookResource"</js>,
+ title=<js>"My title"</js>, <jc>// or pageTitle</jc>
+ )
+ <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {
+ </p></div>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../../constant-values.html#org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_title">Constant Field Values</a></dd>
</dl>
</li>
</ul>
-<a name="HTMLDOC_description">
+<a name="HTMLDOC_text">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>HTMLDOC_description</h4>
-<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.127">HTMLDOC_description</a></pre>
+<h4>HTMLDOC_text</h4>
+<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.157">HTMLDOC_text</a></pre>
<div class="block"><b>Configuration property:</b> Page description.
<p>
<ul>
@@ -408,7 +429,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<ja>@RestResource</ja>(
messages=<js>"nls/AddressBookResource"</js>,
properties={
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"description"</js>, type=<jsf>NLS</jsf>)
+ <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"My description"</js>)
}
)
<jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {
@@ -422,10 +443,19 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<p>
...to produce this description on the HTML page...
</p>
- <img class='bordered' src='doc-files/HTML_DESCRIPTION.png'></div>
+ <img class='bordered' src='doc-files/HTML_DESCRIPTION.png'>
+ <p>
+ Shortcuts on <ja>@RestResource</ja> are also provided for this setting:
+ <p class='bcode'>
+ <ja>@RestResource</ja>(
+ messages=<js>"nls/AddressBookResource"</js>,
+ description=<js>"My description"</js>, <jc>// or pageText</jc>
+ )
+ <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {
+ </p></div>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../constant-values.html#org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_description">Constant Field Values</a></dd>
+<dd><a href="../../../../constant-values.html#org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_text">Constant Field Values</a></dd>
</dl>
</li>
</ul>
@@ -435,7 +465,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<ul class="blockList">
<li class="blockList">
<h4>HTMLDOC_links</h4>
-<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.169">HTMLDOC_links</a></pre>
+<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.208">HTMLDOC_links</a></pre>
<div class="block"><b>Configuration property:</b> Page links.
<p>
<ul>
@@ -473,7 +503,16 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<p>
...to produce this list of links on the HTML page...
</p>
- <img class='bordered' src='doc-files/HTML_LINKS.png'></div>
+ <img class='bordered' src='doc-files/HTML_LINKS.png'>
+ <p>
+ A shortcut on <ja>@RestResource</ja> is also provided for this setting:
+ <p class='bcode'>
+ <ja>@RestResource</ja>(
+ messages=<js>"nls/AddressBookResource"</js>,
+ pageLinks=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>
+ )
+ <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {
+ </p></div>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../../constant-values.html#org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_links">Constant Field Values</a></dd>
@@ -486,7 +525,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<ul class="blockList">
<li class="blockList">
<h4>HTMLDOC_links_put</h4>
-<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.174">HTMLDOC_links_put</a></pre>
+<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.213">HTMLDOC_links_put</a></pre>
<div class="block"><b>Configuration property:</b> Add to the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_links"><code>HTMLDOC_links</code></a> property.</div>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
@@ -500,7 +539,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<ul class="blockList">
<li class="blockList">
<h4>HTMLDOC_cssUrl</h4>
-<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.191">HTMLDOC_cssUrl</a></pre>
+<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.230">HTMLDOC_cssUrl</a></pre>
<div class="block"><b>Configuration property:</b> Stylesheet URL.
<p>
<ul>
@@ -526,7 +565,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<ul class="blockList">
<li class="blockList">
<h4>HTMLDOC_cssImports</h4>
-<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.205">HTMLDOC_cssImports</a></pre>
+<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.244">HTMLDOC_cssImports</a></pre>
<div class="block"><b>Configuration property:</b> CSS imports.
<p>
<ul>
@@ -549,7 +588,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<ul class="blockList">
<li class="blockList">
<h4>HTMLDOC_cssImports_add</h4>
-<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.210">HTMLDOC_cssImports_add</a></pre>
+<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.249">HTMLDOC_cssImports_add</a></pre>
<div class="block"><b>Configuration property:</b> Add to the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_cssImports"><code>HTMLDOC_cssImports</code></a> property.</div>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
@@ -563,7 +602,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<ul class="blockListLast">
<li class="blockList">
<h4>HTMLDOC_nowrap</h4>
-<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.224">HTMLDOC_nowrap</a></pre>
+<pre>public static final <a href="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/html/HtmlDocSerializerContext.html#line.263">HTMLDOC_nowrap</a></pre>
<div class="block"><b>Configuration property:</b> Prevent word wrap on page.
<p>
<ul>
@@ -594,7 +633,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<ul class="blockListLast">
<li class="blockList">
<h4>HtmlDocSerializerContext</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerContext.html#line.238">HtmlDocSerializerContext</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> ps)</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerContext.html#line.277">HtmlDocSerializerContext</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> ps)</pre>
<div class="block">Constructor.
<p>
Typically only called from <a href="../../../../org/apache/juneau/PropertyStore.html#getContext-java.lang.Class-"><code>PropertyStore.getContext(Class)</code></a>.</div>
@@ -618,7 +657,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
<ul class="blockListLast">
<li class="blockList">
<h4>asMap</h4>
-<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerContext.html#line.249">asMap</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerContext.html#line.288">asMap</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/Context.html#asMap--">Context</a></code></span></div>
<div class="block">Returns the properties defined on this bean context as a simple map for debugging purposes.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerSession.html b/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerSession.html
index eba073c..1bde54a 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerSession.html
@@ -213,17 +213,17 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
</td>
</tr>
<tr id="i2" 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/html/HtmlDocSerializerSession.html#getDescription--">getDescription</a></span>()</code>
-<div class="block">Returns the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_description"><code>HtmlDocSerializerContext.HTMLDOC_description</code></a> setting value in this context.</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlDocSerializerSession.html#getLinks--">getLinks</a></span>()</code>
<div class="block">Returns the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_links"><code>HtmlDocSerializerContext.HTMLDOC_links</code></a> setting value in this context.</div>
</td>
</tr>
+<tr id="i3" 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/html/HtmlDocSerializerSession.html#getText--">getText</a></span>()</code>
+<div class="block">Returns the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_text"><code>HtmlDocSerializerContext.HTMLDOC_text</code></a> setting value in this context.</div>
+</td>
+</tr>
<tr id="i4" 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/html/HtmlDocSerializerSession.html#getTitle--">getTitle</a></span>()</code>
@@ -269,7 +269,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
@@ -351,17 +351,17 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
</dl>
</li>
</ul>
-<a name="getDescription--">
+<a name="getText--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getDescription</h4>
-<pre>public final <a href="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/html/HtmlDocSerializerSession.html#line.88">getDescription</a>()</pre>
-<div class="block">Returns the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_description"><code>HtmlDocSerializerContext.HTMLDOC_description</code></a> setting value in this context.</div>
+<h4>getText</h4>
+<pre>public final <a href="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/html/HtmlDocSerializerSession.html#line.88">getText</a>()</pre>
+<div class="block">Returns the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_text"><code>HtmlDocSerializerContext.HTMLDOC_text</code></a> setting value in this context.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_description"><code>HtmlDocSerializerContext.HTMLDOC_description</code></a> setting value in this context.</dd>
+<dd>The <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_text"><code>HtmlDocSerializerContext.HTMLDOC_text</code></a> setting value in this context.</dd>
</dl>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/html/HtmlParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlParser.html b/content/site/apidocs/org/apache/juneau/html/HtmlParser.html
index 4b9aa02..7201b86 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlParser.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlParser.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -241,13 +241,6 @@ extends <a href="../../../../org/apache/juneau/xml/XmlParser.html" title="class
</td>
</tr>
<tr id="i3" class="rowColor">
-<td class="colFirst"><code>protected <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></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)</code>
-<div class="block">Implementation method.</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
<td class="colFirst"><code>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlParser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> c,
@@ -255,7 +248,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlParser.html" title="class
<div class="block">Implementation method.</div>
</td>
</tr>
-<tr id="i5" class="rowColor">
+<tr id="i4" class="altColor">
<td class="colFirst"><code>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlParser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
@@ -284,7 +277,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.
ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.
apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
@@ -378,7 +371,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlParser.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/html/HtmlParserSession.html" title="class in org.apache.juneau.html">HtmlParserSession</a> <a href="../../../../src-html/org/apache/juneau/html/HtmlParser.html#line.579">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
+<pre>public <a href="../../../../org/apache/juneau/html/HtmlParserSession.html" title="class in org.apache.juneau.html">HtmlParserSession</a> <a href="../../../../src-html/org/apache/juneau/html/HtmlParser.html#line.557">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> op,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> javaMethod,
<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> outer,
@@ -416,7 +409,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlParser.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doParse</h4>
-<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/html/HtmlParser.html#line.584">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/html/HtmlParser.html#line.562">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> type)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">Parser</a></code></span></div>
@@ -445,7 +438,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlParser.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>doParseIntoMap</h4>
-<pre>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> <a href="../../../../src-html/org/apache/juneau/html/HtmlParser.html#line.590">doParseIntoMap</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> <a href="../../../../src-html/org/apache/juneau/html/HtmlParser.html#line.568">doParseIntoMap</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> keyType,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> valueType)
@@ -472,10 +465,10 @@ extends <a href="../../../../org/apache/juneau/xml/XmlParser.html" title="class
<a name="doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">
<!-- -->
</a>
-<ul class="blockList">
+<ul class="blockListLast">
<li class="blockList">
<h4>doParseIntoCollection</h4>
-<pre>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> <a href="../../../../src-html/org/apache/juneau/html/HtmlParser.html#line.596">doParseIntoCollection</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> <a href="../../../../src-html/org/apache/juneau/html/HtmlParser.html#line.574">doParseIntoCollection</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> c,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> elementType)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -497,32 +490,6 @@ extends <a href="../../../../org/apache/juneau/xml/XmlParser.html" title="class
</dl>
</li>
</ul>
-<a name="doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>doParseArgs</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[] <a href="../../../../src-html/org/apache/juneau/html/HtmlParser.html#line.602">doParseArgs</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">Parser</a></code></span></div>
-<div class="block">Implementation method.
- Default implementation throws an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/UnsupportedOperationException.html?is-external=true" title="class or interface in java.lang"><code>UnsupportedOperationException</code></a>.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/xml/XmlParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></code> in class <code><a href="../../../../org/apache/juneau/xml/XmlParser.html" title="class in org.apache.juneau.xml">XmlParser</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The runtime session object returned by <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-"><code>Parser.createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</code></a>.
- If <jk>null</jk>, one will be created using <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-"><code>Parser.createSession(Object)</code></a>.</dd>
-<dd><code>argTypes</code> - Specifies the type of objects to create for each entry in the array.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>An array of parsed objects.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code> - If thrown from underlying stream, or if the input contains a syntax error or is malformed.</dd>
-</dl>
-</li>
-</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/html/HtmlParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlParserSession.html b/content/site/apidocs/org/apache/juneau/html/HtmlParserSession.html
index 375aa83..39dfcd8 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlParserSession.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlParserSession.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlParserSession.html" title=
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.html b/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.html
index a449b9f..787cf31 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.html
@@ -561,7 +561,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
<ul class="blockList">
<li class="blockList">
<h4>getSchemaSerializer</h4>
-<pre>public <a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a> <a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.671">getSchemaSerializer</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a> <a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.677">getSchemaSerializer</a>()</pre>
<div class="block">Returns the schema serializer based on the settings of this serializer.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -577,7 +577,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
<ul class="blockList">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html" title="class in org.apache.juneau.html">HtmlSerializerSession</a> <a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.683">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> output,
+<pre>public <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html" title="class in org.apache.juneau.html">HtmlSerializerSession</a> <a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.689">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> output,
<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> op,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> javaMethod,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a> locale,
@@ -624,7 +624,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
<ul class="blockListLast">
<li class="blockList">
<h4>doSerialize</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.688">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a> session,
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.694">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a> session,
<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> o)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">Serializer</a></code></span></div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html b/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html
index cdc39b5..4251de8 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html
@@ -256,7 +256,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" ti
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/ini/ConfigFile.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigFile.html b/content/site/apidocs/org/apache/juneau/ini/ConfigFile.html
index 728f190..a9c08fc 100644
--- a/content/site/apidocs/org/apache/juneau/ini/ConfigFile.html
+++ b/content/site/apidocs/org/apache/juneau/ini/ConfigFile.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li>Prev Class</li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFile.html" target="_top">Frames</a></li>
@@ -1578,7 +1578,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?
<div class="subNav">
<ul class="navList">
<li>Prev Class</li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFile.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/ini/ConfigFileFormat.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigFileFormat.html b/content/site/apidocs/org/apache/juneau/ini/ConfigFileFormat.html
index 19f4b64..62f0e58 100644
--- a/content/site/apidocs/org/apache/juneau/ini/ConfigFileFormat.html
+++ b/content/site/apidocs/org/apache/juneau/ini/ConfigFileFormat.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -316,7 +316,7 @@ not permitted.)</div>
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html b/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html
index 21873f4..78a1b00 100644
--- a/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html
+++ b/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFileWrapped.html" target="_top">Frames</a></li>
@@ -1171,7 +1171,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFileWrapped.html" target="_top">Frames</a></li>
[18/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Turtle.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Turtle.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Turtle.html
index 675f202..9d7976b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Turtle.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Turtle.html
@@ -177,314 +177,315 @@
<span class="sourceLineNo">169</span> // Special case where we're parsing a loose collection of resources.<a name="line.169"></a>
<span class="sourceLineNo">170</span> if (s.isLooseCollections() && type.isCollectionOrArray()) {<a name="line.170"></a>
<span class="sourceLineNo">171</span> Collection c = null;<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if (type.isArray())<a name="line.172"></a>
+<span class="sourceLineNo">172</span> if (type.isArray() || type.isArgs())<a name="line.172"></a>
<span class="sourceLineNo">173</span> c = new ArrayList();<a name="line.173"></a>
<span class="sourceLineNo">174</span> else<a name="line.174"></a>
<span class="sourceLineNo">175</span> c = (type.canCreateNewInstance(session.getOuter()) ? (Collection<?>)type.newInstance(session.getOuter()) : new ObjectList(session));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (Resource resource : roots)<a name="line.176"></a>
-<span class="sourceLineNo">177</span> c.add(parseAnything(s, type.getElementType(), resource, session.getOuter(), null));<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> if (type.isArray())<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return (T)session.toArray(type, c);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> return (T)c;<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (roots.isEmpty())<a name="line.184"></a>
-<span class="sourceLineNo">185</span> return null;<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (roots.size() > 1)<a name="line.186"></a>
-<span class="sourceLineNo">187</span> throw new ParseException(session, "Too many root nodes found in model: {0}", roots.size());<a name="line.187"></a>
-<span class="sourceLineNo">188</span> Resource resource = roots.get(0);<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> return parseAnything(s, type, resource, session.getOuter(), null);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> /*<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * Finds the roots in the model using either the "root" property to identify it,<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * or by resorting to scanning the model for all nodes with no incoming predicates.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> */<a name="line.196"></a>
-<span class="sourceLineNo">197</span> private static List<Resource> getRoots(RdfParserSession session, Model m) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> List<Resource> l = new LinkedList<Resource>();<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> // First try to find the root using the "http://www.apache.org/juneau/root" property.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> Property root = m.createProperty(session.getJuneauNsUri(), RDF_juneauNs_ROOT);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> for (ResIterator i = m.listResourcesWithProperty(root); i.hasNext();)<a name="line.202"></a>
-<span class="sourceLineNo">203</span> l.add(i.next());<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span> if (! l.isEmpty())<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return l;<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> // Otherwise, we need to find all resources that aren't objects.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // We want to explicitly ignore statements where the subject<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // and object are the same node.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> Set<RDFNode> objects = new HashSet<RDFNode>();<a name="line.211"></a>
-<span class="sourceLineNo">212</span> for (StmtIterator i = m.listStatements(); i.hasNext();) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> Statement st = i.next();<a name="line.213"></a>
-<span class="sourceLineNo">214</span> RDFNode subject = st.getSubject();<a name="line.214"></a>
-<span class="sourceLineNo">215</span> RDFNode object = st.getObject();<a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (object.isResource() && ! object.equals(subject))<a name="line.216"></a>
-<span class="sourceLineNo">217</span> objects.add(object);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> for (ResIterator i = m.listSubjects(); i.hasNext();) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> Resource r = i.next();<a name="line.220"></a>
-<span class="sourceLineNo">221</span> if (! objects.contains(r))<a name="line.221"></a>
-<span class="sourceLineNo">222</span> l.add(r);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> return l;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> private <T> BeanMap<T> parseIntoBeanMap(RdfParserSession session, Resource r2, BeanMap<T> m) throws Exception {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> BeanMeta<T> bm = m.getMeta();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.230"></a>
-<span class="sourceLineNo">231</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> Statement st = i.next();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> Property p = st.getPredicate();<a name="line.234"></a>
-<span class="sourceLineNo">235</span> String key = session.decodeString(p.getLocalName());<a name="line.235"></a>
-<span class="sourceLineNo">236</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> session.setCurrentProperty(pMeta);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (pMeta != null) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> RDFNode o = st.getObject();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> if (cm.isCollectionOrArray() && isMultiValuedCollections(session, pMeta)) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> ClassMeta<?> et = cm.getElementType();<a name="line.242"></a>
-<span class="sourceLineNo">243</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> setName(et, value, key);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> pMeta.add(m, value);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> setName(cm, value, key);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> pMeta.set(m, value);<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> session.setCurrentProperty(null);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m;<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> private static boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (pMeta != null && pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> return session.getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.265"></a>
-<span class="sourceLineNo">266</span> private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> if (eType == null)<a name="line.268"></a>
-<span class="sourceLineNo">269</span> eType = (ClassMeta<T>)object();<a name="line.269"></a>
-<span class="sourceLineNo">270</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> session.setCurrentClass(sType);<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (! sType.canCreateNewInstance(outer)) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> if (n.isResource()) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> Statement st = n.asResource().getProperty(session.getTypeProperty());<a name="line.276"></a>
-<span class="sourceLineNo">277</span> if (st != null) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> String c = st.getLiteral().getString();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> ClassMeta tcm = session.getClassMeta(c, pMeta, eType);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (tcm != null)<a name="line.280"></a>
-<span class="sourceLineNo">281</span> sType = eType = tcm;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> Object o = null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> // Do nothing. Leave o == null.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> } else if (sType.isObject()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> if (n.isLiteral()) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> o = n.asLiteral().getValue();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> if (o instanceof String) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> o = session.decodeString(o);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> else if (n.isResource()) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> Resource r = n.asResource();<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (session.wasAlreadyProcessed(r))<a name="line.298"></a>
-<span class="sourceLineNo">299</span> o = r.getURI();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> else if (r.getProperty(session.getValueProperty()) != null) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer, null);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> } else if (isSeq(session, r)) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> o = new ObjectList(session);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.304"></a>
-<span class="sourceLineNo">305</span> } else if (isBag(session, r)) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> o = new ObjectList(session);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> } else if (r.canAs(RDFList.class)) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> o = new ObjectList(session);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> } else {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> // If it has a URI and no child properties, we interpret this as an<a name="line.312"></a>
-<span class="sourceLineNo">313</span> // external resource, and convert it to just a URL.<a name="line.313"></a>
-<span class="sourceLineNo">314</span> String uri = r.getURI();<a name="line.314"></a>
-<span class="sourceLineNo">315</span> if (uri != null && ! r.listProperties().hasNext()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> o = r.getURI();<a name="line.316"></a>
-<span class="sourceLineNo">317</span> } else {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> ObjectMap m2 = new ObjectMap(session);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> parseIntoMap(session, r, m2, null, null, pMeta);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> o = session.cast(m2, pMeta, eType);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span> } else {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } else if (sType.isBoolean()) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> o = session.convertToType(getValue(session, n, outer), boolean.class);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> } else if (sType.isCharSequence()) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> o = session.decodeString(getValue(session, n, outer));<a name="line.329"></a>
-<span class="sourceLineNo">330</span> } else if (sType.isChar()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> o = session.decodeString(getValue(session, n, outer)).charAt(0);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> } else if (sType.isNumber()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass());<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } else if (sType.isMap()) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> Resource r = n.asResource();<a name="line.335"></a>
-<span class="sourceLineNo">336</span> if (session.wasAlreadyProcessed(r))<a name="line.336"></a>
-<span class="sourceLineNo">337</span> return null;<a name="line.337"></a>
-<span class="sourceLineNo">338</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.338"></a>
-<span class="sourceLineNo">339</span> o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType(), pMeta);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> } else if (sType.isCollectionOrArray()) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> if (sType.isArray())<a name="line.341"></a>
-<span class="sourceLineNo">342</span> o = new ArrayList();<a name="line.342"></a>
-<span class="sourceLineNo">343</span> else<a name="line.343"></a>
-<span class="sourceLineNo">344</span> o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(session));<a name="line.344"></a>
-<span class="sourceLineNo">345</span> Resource r = n.asResource();<a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (session.wasAlreadyProcessed(r))<a name="line.346"></a>
-<span class="sourceLineNo">347</span> return null;<a name="line.347"></a>
-<span class="sourceLineNo">348</span> if (isSeq(session, r)) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> } else if (isBag(session, r)) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> } else if (r.canAs(RDFList.class)) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> } else {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> throw new ParseException("Unrecognized node type ''{0}'' for collection", n);<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (sType.isArray())<a name="line.357"></a>
-<span class="sourceLineNo">358</span> o = session.toArray(sType, (Collection)o);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> Resource r = n.asResource();<a name="line.360"></a>
-<span class="sourceLineNo">361</span> if (session.wasAlreadyProcessed(r))<a name="line.361"></a>
-<span class="sourceLineNo">362</span> return null;<a name="line.362"></a>
-<span class="sourceLineNo">363</span> BeanMap<?> bm = session.newBeanMap(outer, sType.getInnerClass());<a name="line.363"></a>
-<span class="sourceLineNo">364</span> o = parseIntoBeanMap(session, r, bm).getBean();<a name="line.364"></a>
-<span class="sourceLineNo">365</span> } else if (sType.isUri() && n.isResource()) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));<a name="line.366"></a>
-<span class="sourceLineNo">367</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass()));<a name="line.370"></a>
-<span class="sourceLineNo">371</span> } else if (n.isResource()) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> Resource r = n.asResource();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> Map m = new ObjectMap(session);<a name="line.373"></a>
-<span class="sourceLineNo">374</span> parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.375"></a>
-<span class="sourceLineNo">376</span> o = session.cast((ObjectMap)m, pMeta, eType);<a name="line.376"></a>
-<span class="sourceLineNo">377</span> else<a name="line.377"></a>
-<span class="sourceLineNo">378</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.378"></a>
-<span class="sourceLineNo">379</span> } else {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> if (transform != null && o != null)<a name="line.383"></a>
-<span class="sourceLineNo">384</span> o = transform.unswap(session, o, eType);<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (outer != null)<a name="line.386"></a>
-<span class="sourceLineNo">387</span> setParent(eType, o, outer);<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> return (T)o;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> private static boolean isSeq(RdfParserSession session, RDFNode n) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (n.isResource()) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.394"></a>
-<span class="sourceLineNo">395</span> if (st != null)<a name="line.395"></a>
-<span class="sourceLineNo">396</span> return RDF_SEQ.equals(st.getResource().getURI());<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span> return false;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> private static boolean isBag(RdfParserSession session, RDFNode n) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> if (n.isResource()) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (st != null)<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return RDF_BAG.equals(st.getResource().getURI());<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return false;<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> private Object getValue(RdfParserSession session, RDFNode n, Object outer) throws Exception {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> if (n.isLiteral())<a name="line.411"></a>
-<span class="sourceLineNo">412</span> return n.asLiteral().getValue();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (n.isResource()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> Statement st = n.asResource().getProperty(session.getValueProperty());<a name="line.414"></a>
-<span class="sourceLineNo">415</span> if (st != null) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> n = st.getObject();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (n.isLiteral())<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return n.asLiteral().getValue();<a name="line.418"></a>
-<span class="sourceLineNo">419</span> return parseAnything(session, object(), st.getObject(), outer, null);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> throw new ParseException(session, "Unknown value type for node ''{0}''", n);<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> private <K,V> Map<K,V> parseIntoMap(RdfParserSession session, Resource r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> // Add URI as "uri" to generic maps.<a name="line.426"></a>
-<span class="sourceLineNo">427</span> if (r.getURI() != null) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> K uri = convertAttrToType(session, m, "uri", keyType);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> V value = convertAttrToType(session, m, r.getURI(), valueType);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> m.put(uri, value);<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for (StmtIterator i = r.listProperties(); i.hasNext();) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> Statement st = i.next();<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Property p = st.getPredicate();<a name="line.434"></a>
-<span class="sourceLineNo">435</span> String key = p.getLocalName();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (! (key.equals("root") && p.getURI().equals(session.getJuneauNsUri()))) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> key = session.decodeString(key);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> RDFNode o = st.getObject();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> K key2 = convertAttrToType(session, m, key, keyType);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> V value = parseAnything(session, valueType, o, m, pMeta);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> setName(valueType, value, key);<a name="line.441"></a>
-<span class="sourceLineNo">442</span> m.put(key2, value);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> return m;<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, Container c, Collection<E> l, ClassMeta<E> et, BeanPropertyMeta pMeta) throws Exception {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> for (NodeIterator ni = c.iterator(); ni.hasNext();) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> E e = parseAnything(session, et, ni.next(), l, pMeta);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> l.add(e);<a name="line.452"></a>
-<span class="sourceLineNo">453</span> }<a name="line.453"></a>
-<span class="sourceLineNo">454</span> return l;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, RDFList list, Collection<E> l, ClassMeta<E> et, BeanPropertyMeta pMeta) throws Exception {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> for (ExtendedIterator<RDFNode> ni = list.iterator(); ni.hasNext();) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span> E e = parseAnything(session, et, ni.next(), l, pMeta);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> l.add(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span> return l;<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> @Override /* Parser */<a name="line.465"></a>
-<span class="sourceLineNo">466</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> throw new UnsupportedOperationException("Parser '"+getClass().getName()+"' does not support this method.");<a name="line.467"></a>
-<span class="sourceLineNo">468</span> }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span> <a name="line.470"></a>
-<span class="sourceLineNo">471</span> //--------------------------------------------------------------------------------<a name="line.471"></a>
-<span class="sourceLineNo">472</span> // Entry point methods<a name="line.472"></a>
-<span class="sourceLineNo">473</span> //--------------------------------------------------------------------------------<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> @Override /* Parser */<a name="line.475"></a>
-<span class="sourceLineNo">476</span> public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span>}<a name="line.479"></a>
+<span class="sourceLineNo">176</span> <a name="line.176"></a>
+<span class="sourceLineNo">177</span> int argIndex = 0;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> for (Resource resource : roots)<a name="line.178"></a>
+<span class="sourceLineNo">179</span> c.add(parseAnything(s, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), resource, session.getOuter(), null));<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> if (type.isArray() || type.isArgs())<a name="line.181"></a>
+<span class="sourceLineNo">182</span> return (T)session.toArray(type, c);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> return (T)c;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (roots.isEmpty())<a name="line.186"></a>
+<span class="sourceLineNo">187</span> return null;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (roots.size() > 1)<a name="line.188"></a>
+<span class="sourceLineNo">189</span> throw new ParseException(session, "Too many root nodes found in model: {0}", roots.size());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> Resource resource = roots.get(0);<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> return parseAnything(s, type, resource, session.getOuter(), null);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<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> * Finds the roots in the model using either the "root" property to identify it,<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * or by resorting to scanning the model for all nodes with no incoming predicates.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> */<a name="line.198"></a>
+<span class="sourceLineNo">199</span> private static List<Resource> getRoots(RdfParserSession session, Model m) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> List<Resource> l = new LinkedList<Resource>();<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> // First try to find the root using the "http://www.apache.org/juneau/root" property.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> Property root = m.createProperty(session.getJuneauNsUri(), RDF_juneauNs_ROOT);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> for (ResIterator i = m.listResourcesWithProperty(root); i.hasNext();)<a name="line.204"></a>
+<span class="sourceLineNo">205</span> l.add(i.next());<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> if (! l.isEmpty())<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return l;<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> // Otherwise, we need to find all resources that aren't objects.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> // We want to explicitly ignore statements where the subject<a name="line.211"></a>
+<span class="sourceLineNo">212</span> // and object are the same node.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> Set<RDFNode> objects = new HashSet<RDFNode>();<a name="line.213"></a>
+<span class="sourceLineNo">214</span> for (StmtIterator i = m.listStatements(); i.hasNext();) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> Statement st = i.next();<a name="line.215"></a>
+<span class="sourceLineNo">216</span> RDFNode subject = st.getSubject();<a name="line.216"></a>
+<span class="sourceLineNo">217</span> RDFNode object = st.getObject();<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (object.isResource() && ! object.equals(subject))<a name="line.218"></a>
+<span class="sourceLineNo">219</span> objects.add(object);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> for (ResIterator i = m.listSubjects(); i.hasNext();) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> Resource r = i.next();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> if (! objects.contains(r))<a name="line.223"></a>
+<span class="sourceLineNo">224</span> l.add(r);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span> return l;<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> private <T> BeanMap<T> parseIntoBeanMap(RdfParserSession session, Resource r2, BeanMap<T> m) throws Exception {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> BeanMeta<T> bm = m.getMeta();<a name="line.230"></a>
+<span class="sourceLineNo">231</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.232"></a>
+<span class="sourceLineNo">233</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.233"></a>
+<span class="sourceLineNo">234</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> Statement st = i.next();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> Property p = st.getPredicate();<a name="line.236"></a>
+<span class="sourceLineNo">237</span> String key = session.decodeString(p.getLocalName());<a name="line.237"></a>
+<span class="sourceLineNo">238</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> session.setCurrentProperty(pMeta);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (pMeta != null) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> RDFNode o = st.getObject();<a name="line.241"></a>
+<span class="sourceLineNo">242</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> if (cm.isCollectionOrArray() && isMultiValuedCollections(session, pMeta)) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> ClassMeta<?> et = cm.getElementType();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> setName(et, value, key);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> pMeta.add(m, value);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> } else {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> setName(cm, value, key);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> pMeta.set(m, value);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> session.setCurrentProperty(null);<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return m;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> private static boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> if (pMeta != null && pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.262"></a>
+<span class="sourceLineNo">263</span> return pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> return session.getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.267"></a>
+<span class="sourceLineNo">268</span> private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> if (eType == null)<a name="line.270"></a>
+<span class="sourceLineNo">271</span> eType = (ClassMeta<T>)object();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.273"></a>
+<span class="sourceLineNo">274</span> session.setCurrentClass(sType);<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> if (! sType.canCreateNewInstance(outer)) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (n.isResource()) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> Statement st = n.asResource().getProperty(session.getTypeProperty());<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (st != null) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> String c = st.getLiteral().getString();<a name="line.280"></a>
+<span class="sourceLineNo">281</span> ClassMeta tcm = session.getClassMeta(c, pMeta, eType);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (tcm != null)<a name="line.282"></a>
+<span class="sourceLineNo">283</span> sType = eType = tcm;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> Object o = null;<a name="line.288"></a>
+<span class="sourceLineNo">289</span> if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // Do nothing. Leave o == null.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> } else if (sType.isObject()) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (n.isLiteral()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> o = n.asLiteral().getValue();<a name="line.293"></a>
+<span class="sourceLineNo">294</span> if (o instanceof String) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> o = session.decodeString(o);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> else if (n.isResource()) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> Resource r = n.asResource();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> if (session.wasAlreadyProcessed(r))<a name="line.300"></a>
+<span class="sourceLineNo">301</span> o = r.getURI();<a name="line.301"></a>
+<span class="sourceLineNo">302</span> else if (r.getProperty(session.getValueProperty()) != null) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer, null);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> } else if (isSeq(session, r)) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> o = new ObjectList(session);<a name="line.305"></a>
+<span class="sourceLineNo">306</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType, pMeta);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> } else if (isBag(session, r)) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> o = new ObjectList(session);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType, pMeta);<a name="line.309"></a>
+<span class="sourceLineNo">310</span> } else if (r.canAs(RDFList.class)) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> o = new ObjectList(session);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType, pMeta);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> } else {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> // If it has a URI and no child properties, we interpret this as an<a name="line.314"></a>
+<span class="sourceLineNo">315</span> // external resource, and convert it to just a URL.<a name="line.315"></a>
+<span class="sourceLineNo">316</span> String uri = r.getURI();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (uri != null && ! r.listProperties().hasNext()) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> o = r.getURI();<a name="line.318"></a>
+<span class="sourceLineNo">319</span> } else {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> ObjectMap m2 = new ObjectMap(session);<a name="line.320"></a>
+<span class="sourceLineNo">321</span> parseIntoMap(session, r, m2, null, null, pMeta);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> o = session.cast(m2, pMeta, eType);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span> } else {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span> } else if (sType.isBoolean()) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> o = session.convertToType(getValue(session, n, outer), boolean.class);<a name="line.329"></a>
+<span class="sourceLineNo">330</span> } else if (sType.isCharSequence()) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> o = session.decodeString(getValue(session, n, outer));<a name="line.331"></a>
+<span class="sourceLineNo">332</span> } else if (sType.isChar()) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> o = session.decodeString(getValue(session, n, outer)).charAt(0);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> } else if (sType.isNumber()) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass());<a name="line.335"></a>
+<span class="sourceLineNo">336</span> } else if (sType.isMap()) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> Resource r = n.asResource();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> if (session.wasAlreadyProcessed(r))<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return null;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.340"></a>
+<span class="sourceLineNo">341</span> o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType(), pMeta);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> } else if (sType.isCollectionOrArray() || sType.isArgs()) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> if (sType.isArray() || sType.isArgs())<a name="line.343"></a>
+<span class="sourceLineNo">344</span> o = new ArrayList();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> else<a name="line.345"></a>
+<span class="sourceLineNo">346</span> o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(session));<a name="line.346"></a>
+<span class="sourceLineNo">347</span> Resource r = n.asResource();<a name="line.347"></a>
+<span class="sourceLineNo">348</span> if (session.wasAlreadyProcessed(r))<a name="line.348"></a>
+<span class="sourceLineNo">349</span> return null;<a name="line.349"></a>
+<span class="sourceLineNo">350</span> if (isSeq(session, r)) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType, pMeta);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> } else if (isBag(session, r)) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType, pMeta);<a name="line.353"></a>
+<span class="sourceLineNo">354</span> } else if (r.canAs(RDFList.class)) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType, pMeta);<a name="line.355"></a>
+<span class="sourceLineNo">356</span> } else {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> throw new ParseException("Unrecognized node type ''{0}'' for collection", n);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> if (sType.isArray() || sType.isArgs())<a name="line.359"></a>
+<span class="sourceLineNo">360</span> o = session.toArray(sType, (Collection)o);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> Resource r = n.asResource();<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (session.wasAlreadyProcessed(r))<a name="line.363"></a>
+<span class="sourceLineNo">364</span> return null;<a name="line.364"></a>
+<span class="sourceLineNo">365</span> BeanMap<?> bm = session.newBeanMap(outer, sType.getInnerClass());<a name="line.365"></a>
+<span class="sourceLineNo">366</span> o = parseIntoBeanMap(session, r, bm).getBean();<a name="line.366"></a>
+<span class="sourceLineNo">367</span> } else if (sType.isUri() && n.isResource()) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));<a name="line.368"></a>
+<span class="sourceLineNo">369</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));<a name="line.370"></a>
+<span class="sourceLineNo">371</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass()));<a name="line.372"></a>
+<span class="sourceLineNo">373</span> } else if (n.isResource()) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> Resource r = n.asResource();<a name="line.374"></a>
+<span class="sourceLineNo">375</span> Map m = new ObjectMap(session);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.377"></a>
+<span class="sourceLineNo">378</span> o = session.cast((ObjectMap)m, pMeta, eType);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> else<a name="line.379"></a>
+<span class="sourceLineNo">380</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.380"></a>
+<span class="sourceLineNo">381</span> } else {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (transform != null && o != null)<a name="line.385"></a>
+<span class="sourceLineNo">386</span> o = transform.unswap(session, o, eType);<a name="line.386"></a>
+<span class="sourceLineNo">387</span><a name="line.387"></a>
+<span class="sourceLineNo">388</span> if (outer != null)<a name="line.388"></a>
+<span class="sourceLineNo">389</span> setParent(eType, o, outer);<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> return (T)o;<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> private static boolean isSeq(RdfParserSession session, RDFNode n) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (n.isResource()) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.396"></a>
+<span class="sourceLineNo">397</span> if (st != null)<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return RDF_SEQ.equals(st.getResource().getURI());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> return false;<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> private static boolean isBag(RdfParserSession session, RDFNode n) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> if (n.isResource()) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if (st != null)<a name="line.406"></a>
+<span class="sourceLineNo">407</span> return RDF_BAG.equals(st.getResource().getURI());<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span> return false;<a name="line.409"></a>
+<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span> private Object getValue(RdfParserSession session, RDFNode n, Object outer) throws Exception {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> if (n.isLiteral())<a name="line.413"></a>
+<span class="sourceLineNo">414</span> return n.asLiteral().getValue();<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (n.isResource()) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> Statement st = n.asResource().getProperty(session.getValueProperty());<a name="line.416"></a>
+<span class="sourceLineNo">417</span> if (st != null) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> n = st.getObject();<a name="line.418"></a>
+<span class="sourceLineNo">419</span> if (n.isLiteral())<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return n.asLiteral().getValue();<a name="line.420"></a>
+<span class="sourceLineNo">421</span> return parseAnything(session, object(), st.getObject(), outer, null);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span> }<a name="line.423"></a>
+<span class="sourceLineNo">424</span> throw new ParseException(session, "Unknown value type for node ''{0}''", n);<a name="line.424"></a>
+<span class="sourceLineNo">425</span> }<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> private <K,V> Map<K,V> parseIntoMap(RdfParserSession session, Resource r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> // Add URI as "uri" to generic maps.<a name="line.428"></a>
+<span class="sourceLineNo">429</span> if (r.getURI() != null) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> K uri = convertAttrToType(session, m, "uri", keyType);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> V value = convertAttrToType(session, m, r.getURI(), valueType);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> m.put(uri, value);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> for (StmtIterator i = r.listProperties(); i.hasNext();) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> Statement st = i.next();<a name="line.435"></a>
+<span class="sourceLineNo">436</span> Property p = st.getPredicate();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> String key = p.getLocalName();<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (! (key.equals("root") && p.getURI().equals(session.getJuneauNsUri()))) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> key = session.decodeString(key);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> RDFNode o = st.getObject();<a name="line.440"></a>
+<span class="sourceLineNo">441</span> K key2 = convertAttrToType(session, m, key, keyType);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> V value = parseAnything(session, valueType, o, m, pMeta);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> setName(valueType, value, key);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> m.put(key2, value);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> }<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span> return m;<a name="line.448"></a>
+<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> @SuppressWarnings("unchecked")<a name="line.451"></a>
+<span class="sourceLineNo">452</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, Container c, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> int argIndex = 0;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> for (NodeIterator ni = c.iterator(); ni.hasNext();) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> E e = (E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), ni.next(), l, pMeta);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> l.add(e);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return l;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span> @SuppressWarnings("unchecked")<a name="line.461"></a>
+<span class="sourceLineNo">462</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, RDFList list, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> int argIndex = 0;<a name="line.463"></a>
+<span class="sourceLineNo">464</span> for (ExtendedIterator<RDFNode> ni = list.iterator(); ni.hasNext();) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> E e = (E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), ni.next(), l, pMeta);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> l.add(e);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span> return l;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> }<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span> <a name="line.471"></a>
+<span class="sourceLineNo">472</span> //--------------------------------------------------------------------------------<a name="line.472"></a>
+<span class="sourceLineNo">473</span> // Entry point methods<a name="line.473"></a>
+<span class="sourceLineNo">474</span> //--------------------------------------------------------------------------------<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span> @Override /* Parser */<a name="line.476"></a>
+<span class="sourceLineNo">477</span> public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span> return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.478"></a>
+<span class="sourceLineNo">479</span> }<a name="line.479"></a>
+<span class="sourceLineNo">480</span>}<a name="line.480"></a>
[26/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Swagger.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Swagger.html b/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Swagger.html
index 6f19807..400b5a2 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Swagger.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Swagger.html
@@ -24,878 +24,877 @@
<span class="sourceLineNo">016</span><a name="line.16"></a>
<span class="sourceLineNo">017</span>import org.apache.juneau.*;<a name="line.17"></a>
<span class="sourceLineNo">018</span>import org.apache.juneau.annotation.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>/**<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * This is the root document object for the API specification.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * <p><a name="line.22"></a>
-<span class="sourceLineNo">023</span> * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> */<a name="line.24"></a>
-<span class="sourceLineNo">025</span>@Bean(properties="swagger,info,tags,externalDocs,basePath,schemes,consumes,produces,paths,definitions,parameters,responses,securityDefinitions,security")<a name="line.25"></a>
-<span class="sourceLineNo">026</span>@SuppressWarnings("hiding")<a name="line.26"></a>
-<span class="sourceLineNo">027</span>public class Swagger extends SwaggerElement {<a name="line.27"></a>
-<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span> /** Represents a null swagger */<a name="line.29"></a>
-<span class="sourceLineNo">030</span> public static final Swagger NULL = new Swagger();<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span> private String swagger = "2.0";<a name="line.32"></a>
-<span class="sourceLineNo">033</span> private Info info;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> private String host, basePath;<a name="line.34"></a>
-<span class="sourceLineNo">035</span> private List<String> schemes;<a name="line.35"></a>
-<span class="sourceLineNo">036</span> private List<MediaType> consumes;<a name="line.36"></a>
-<span class="sourceLineNo">037</span> private List<MediaType> produces;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> private Map<String,Map<String,Operation>> paths;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> private Map<String,SchemaInfo> definitions;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> private Map<String,ParameterInfo> parameters;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> private Map<String,ResponseInfo> responses;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> private Map<String,SecurityScheme> securityDefinitions;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> private List<Map<String,List<String>>> security;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> private List<Tag> tags;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> private ExternalDocumentation externalDocs;<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> * Bean property getter: <property>swagger</property>.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
-<span class="sourceLineNo">050</span> * Required. Specifies the Swagger Specification version being used.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * It can be used by the Swagger UI and other clients to interpret the API listing.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * The value MUST be <js>"2.0"</js>.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> *<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * @return The value of the <property>swagger</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.54"></a>
-<span class="sourceLineNo">055</span> */<a name="line.55"></a>
-<span class="sourceLineNo">056</span> public String getSwagger() {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> return swagger;<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> * Bean property setter: <property>swagger</property>.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <p><a name="line.62"></a>
-<span class="sourceLineNo">063</span> * Required. Specifies the Swagger Specification version being used.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * It can be used by the Swagger UI and other clients to interpret the API listing.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * The value MUST be <js>"2.0"</js>.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> *<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * @param swagger The new value for the <property>swagger</property> property on this bean.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * @return This object (for method chaining).<a name="line.68"></a>
-<span class="sourceLineNo">069</span> */<a name="line.69"></a>
-<span class="sourceLineNo">070</span> public Swagger setSwagger(String swagger) {<a name="line.70"></a>
-<span class="sourceLineNo">071</span> this.swagger = swagger;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> return this;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> /**<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * Synonym for {@link #setSwagger(String)}.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> *<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * @param swagger The new value for the <property>swagger</property> property on this bean.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * @return This object (for method chaining).<a name="line.79"></a>
-<span class="sourceLineNo">080</span> */<a name="line.80"></a>
-<span class="sourceLineNo">081</span> public Swagger swagger(String swagger) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span> return setSwagger(swagger);<a name="line.82"></a>
-<span class="sourceLineNo">083</span> }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span> /**<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * Bean property getter: <property>info</property>.<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * <p><a name="line.87"></a>
-<span class="sourceLineNo">088</span> * Required. Provides metadata about the API.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * The metadata can be used by the clients if needed.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> *<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * @return The value of the <property>info</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> */<a name="line.92"></a>
-<span class="sourceLineNo">093</span> public Info getInfo() {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> return info;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> /**<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * Bean property setter: <property>info</property>.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * <p><a name="line.99"></a>
-<span class="sourceLineNo">100</span> * Required. Provides metadata about the API.<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * The metadata can be used by the clients if needed.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> *<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * @param info The new value for the <property>info</property> property on this bean.<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * @return This object (for method chaining).<a name="line.104"></a>
-<span class="sourceLineNo">105</span> */<a name="line.105"></a>
-<span class="sourceLineNo">106</span> public Swagger setInfo(Info info) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> this.info = info;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> return this;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> /**<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * Synonym for {@link #setInfo(Info)}.<a name="line.112"></a>
-<span class="sourceLineNo">113</span> *<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * @param info The new value for the <property>info</property> property on this bean.<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * @return This object (for method chaining).<a name="line.115"></a>
-<span class="sourceLineNo">116</span> */<a name="line.116"></a>
-<span class="sourceLineNo">117</span> public Swagger info(Info info) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> return setInfo(info);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> }<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> /**<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * Bean property getter: <property>host</property>.<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * <p><a name="line.123"></a>
-<span class="sourceLineNo">124</span> * The host (name or ip) serving the API.<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * This MUST be the host only and does not include the scheme nor sub-paths.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * It MAY include a port.<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * If the host is not included, the host serving the documentation is to be used (including the port).<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * The host does not support <a class="doclink" href="http://swagger.io/specification/#pathTemplating">path templating</a>.<a name="line.128"></a>
-<span class="sourceLineNo">129</span> *<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * @return The value of the <property>host</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.130"></a>
-<span class="sourceLineNo">131</span> */<a name="line.131"></a>
-<span class="sourceLineNo">132</span> public String getHost() {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> return host;<a name="line.133"></a>
-<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> /**<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * Bean property setter: <property>host</property>.<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * <p><a name="line.138"></a>
-<span class="sourceLineNo">139</span> * The host (name or ip) serving the API.<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * This MUST be the host only and does not include the scheme nor sub-paths.<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * It MAY include a port.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * If the host is not included, the host serving the documentation is to be used (including the port).<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * The host does not support <a class="doclink" href="http://swagger.io/specification/#pathTemplating">path templating</a>.<a name="line.143"></a>
-<span class="sourceLineNo">144</span> *<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * @param host The new value for the <property>host</property> property on this bean.<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * @return This object (for method chaining).<a name="line.146"></a>
-<span class="sourceLineNo">147</span> */<a name="line.147"></a>
-<span class="sourceLineNo">148</span> public Swagger setHost(String host) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> this.host = host;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> return this;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> /**<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * Synonym for {@link #setHost(String)}.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> *<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * @param host The new value for the <property>host</property> property on this bean.<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * @return This object (for method chaining).<a name="line.157"></a>
-<span class="sourceLineNo">158</span> */<a name="line.158"></a>
-<span class="sourceLineNo">159</span> public Swagger host(String host) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return setHost(host);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span> /**<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * Bean property getter: <property>basePath</property>.<a name="line.164"></a>
-<span class="sourceLineNo">165</span> * <p><a name="line.165"></a>
-<span class="sourceLineNo">166</span> * The base path on which the API is served, which is relative to the <code>host</code>.<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * If it is not included, the API is served directly under the <code>host</code>.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * The value MUST start with a leading slash (/).<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * The <code>basePath</code> does not support <a class="doclink" href="http://swagger.io/specification/#pathTemplating">path templating</a>.<a name="line.169"></a>
-<span class="sourceLineNo">170</span> *<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * @return The value of the <property>basePath</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.171"></a>
-<span class="sourceLineNo">172</span> */<a name="line.172"></a>
-<span class="sourceLineNo">173</span> public String getBasePath() {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return basePath;<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> /**<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * Bean property setter: <property>basePath</property>.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * <p><a name="line.179"></a>
-<span class="sourceLineNo">180</span> * The base path on which the API is served, which is relative to the <code>host</code>.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * If it is not included, the API is served directly under the <code>host</code>.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> * The value MUST start with a leading slash (/).<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * The <code>basePath</code> does not support <a class="doclink" href="http://swagger.io/specification/#pathTemplating">path templating</a>.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> *<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * @param basePath The new value for the <property>basePath</property> property on this bean.<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * @return This object (for method chaining).<a name="line.186"></a>
-<span class="sourceLineNo">187</span> */<a name="line.187"></a>
-<span class="sourceLineNo">188</span> public Swagger setBasePath(String basePath) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> this.basePath = basePath;<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return this;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> /**<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * Synonym for {@link #setBasePath(String)}.<a name="line.194"></a>
-<span class="sourceLineNo">195</span> *<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * @param basePath The new value for the <property>basePath</property> property on this bean.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * @return This object (for method chaining).<a name="line.197"></a>
-<span class="sourceLineNo">198</span> */<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public Swagger basePath(String basePath) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> return setBasePath(basePath);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span> /**<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * Bean property getter: <property>schemes</property>.<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * <p><a name="line.205"></a>
-<span class="sourceLineNo">206</span> * The transfer protocol of the API.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * Values MUST be from the list: <js>"http"</js>, <js>"https"</js>, <js>"ws"</js>, <js>"wss"</js>.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * If the <code>schemes</code> is not included, the default scheme to be used is the one used to access the Swagger definition itself.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> *<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * @return The value of the <property>schemes</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> */<a name="line.211"></a>
-<span class="sourceLineNo">212</span> public List<String> getSchemes() {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> return schemes;<a name="line.213"></a>
-<span class="sourceLineNo">214</span> }<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> /**<a name="line.216"></a>
-<span class="sourceLineNo">217</span> * Bean property setter: <property>schemes</property>.<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * <p><a name="line.218"></a>
-<span class="sourceLineNo">219</span> * The transfer protocol of the API.<a name="line.219"></a>
-<span class="sourceLineNo">220</span> * Values MUST be from the list: <js>"http"</js>, <js>"https"</js>, <js>"ws"</js>, <js>"wss"</js>.<a name="line.220"></a>
-<span class="sourceLineNo">221</span> * If the <code>schemes</code> is not included, the default scheme to be used is the one used to access the Swagger definition itself.<a name="line.221"></a>
-<span class="sourceLineNo">222</span> *<a name="line.222"></a>
-<span class="sourceLineNo">223</span> * @param schemes The new value for the <property>schemes</property> property on this bean.<a name="line.223"></a>
-<span class="sourceLineNo">224</span> * @return This object (for method chaining).<a name="line.224"></a>
-<span class="sourceLineNo">225</span> */<a name="line.225"></a>
-<span class="sourceLineNo">226</span> public Swagger setSchemes(List<String> schemes) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> this.schemes = schemes;<a name="line.227"></a>
-<span class="sourceLineNo">228</span> return this;<a name="line.228"></a>
-<span class="sourceLineNo">229</span> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> /**<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * Bean property adder: <property>schemes</property>.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * <p><a name="line.233"></a>
-<span class="sourceLineNo">234</span> * The transfer protocol of the API.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * Values MUST be from the list: <js>"http"</js>, <js>"https"</js>, <js>"ws"</js>, <js>"wss"</js>.<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * If the <code>schemes</code> is not included, the default scheme to be used is the one used to access the Swagger definition itself.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> *<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * @param schemes The values to add for the <property>schemes</property> property on this bean.<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * @return This object (for method chaining).<a name="line.239"></a>
-<span class="sourceLineNo">240</span> */<a name="line.240"></a>
-<span class="sourceLineNo">241</span> public Swagger addSchemes(String...schemes) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> return addSchemes(Arrays.asList(schemes));<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span> /**<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * Bean property adder: <property>schemes</property>.<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * <p><a name="line.247"></a>
-<span class="sourceLineNo">248</span> * The transfer protocol of the API.<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * Values MUST be from the list: <js>"http"</js>, <js>"https"</js>, <js>"ws"</js>, <js>"wss"</js>.<a name="line.249"></a>
-<span class="sourceLineNo">250</span> * If the <code>schemes</code> is not included, the default scheme to be used is the one used to access the Swagger definition itself.<a name="line.250"></a>
-<span class="sourceLineNo">251</span> *<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * @param schemes The values to add for the <property>schemes</property> property on this bean.<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * @return This object (for method chaining).<a name="line.253"></a>
-<span class="sourceLineNo">254</span> */<a name="line.254"></a>
-<span class="sourceLineNo">255</span> public Swagger addSchemes(Collection<String> schemes) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> if (schemes != null) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> if (this.schemes == null)<a name="line.257"></a>
-<span class="sourceLineNo">258</span> this.schemes = new LinkedList<String>();<a name="line.258"></a>
-<span class="sourceLineNo">259</span> this.schemes.addAll(schemes);<a name="line.259"></a>
-<span class="sourceLineNo">260</span> }<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return this;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> /**<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * Synonym for {@link #addSchemes(String...)}.<a name="line.265"></a>
-<span class="sourceLineNo">266</span> *<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * @param schemes The values to add for the <property>schemes</property> property on this bean.<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * @return This object (for method chaining).<a name="line.268"></a>
-<span class="sourceLineNo">269</span> */<a name="line.269"></a>
-<span class="sourceLineNo">270</span> public Swagger schemes(String...schemes) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> return addSchemes(schemes);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> /**<a name="line.274"></a>
-<span class="sourceLineNo">275</span> * Bean property getter: <property>consumes</property>.<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * <p><a name="line.276"></a>
-<span class="sourceLineNo">277</span> * A list of MIME types the APIs can consume.<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * This is global to all APIs but can be overridden on specific API calls.<a name="line.278"></a>
-<span class="sourceLineNo">279</span> * Value MUST be as described under <a class="doclink" href="http://swagger.io/specification/#mimeTypes">Mime Types</a>.<a name="line.279"></a>
-<span class="sourceLineNo">280</span> *<a name="line.280"></a>
-<span class="sourceLineNo">281</span> * @return The value of the <property>consumes</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.281"></a>
-<span class="sourceLineNo">282</span> */<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public List<MediaType> getConsumes() {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> return consumes;<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> /**<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * Bean property setter: <property>consumes</property>.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * <p><a name="line.289"></a>
-<span class="sourceLineNo">290</span> * A list of MIME types the APIs can consume.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * This is global to all APIs but can be overridden on specific API calls.<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * Value MUST be as described under <a class="doclink" href="http://swagger.io/specification/#mimeTypes">Mime Types</a>.<a name="line.292"></a>
-<span class="sourceLineNo">293</span> *<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * @param consumes The new value for the <property>consumes</property> property on this bean.<a name="line.294"></a>
-<span class="sourceLineNo">295</span> * @return This object (for method chaining).<a name="line.295"></a>
-<span class="sourceLineNo">296</span> */<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public Swagger setConsumes(List<MediaType> consumes) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> this.consumes = consumes;<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return this;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> /**<a name="line.302"></a>
-<span class="sourceLineNo">303</span> * Bean property adder: <property>consumes</property>.<a name="line.303"></a>
-<span class="sourceLineNo">304</span> * <p><a name="line.304"></a>
-<span class="sourceLineNo">305</span> * A list of MIME types the APIs can consume.<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * This is global to all APIs but can be overridden on specific API calls.<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * Value MUST be as described under <a class="doclink" href="http://swagger.io/specification/#mimeTypes">Mime Types</a>.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> *<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * @param consumes The values to add for the <property>consumes</property> property on this bean.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * @return This object (for method chaining).<a name="line.310"></a>
-<span class="sourceLineNo">311</span> */<a name="line.311"></a>
-<span class="sourceLineNo">312</span> public Swagger addConsumes(MediaType...consumes) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> return addConsumes(Arrays.asList(consumes));<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> /**<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * Bean property adder: <property>consumes</property>.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * <p><a name="line.318"></a>
-<span class="sourceLineNo">319</span> * A list of MIME types the APIs can consume.<a name="line.319"></a>
-<span class="sourceLineNo">320</span> * This is global to all APIs but can be overridden on specific API calls.<a name="line.320"></a>
-<span class="sourceLineNo">321</span> * Value MUST be as described under <a class="doclink" href="http://swagger.io/specification/#mimeTypes">Mime Types</a>.<a name="line.321"></a>
-<span class="sourceLineNo">322</span> *<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * @param consumes The values to add for the <property>consumes</property> property on this bean.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> * @return This object (for method chaining).<a name="line.324"></a>
-<span class="sourceLineNo">325</span> */<a name="line.325"></a>
-<span class="sourceLineNo">326</span> public Swagger addConsumes(Collection<MediaType> consumes) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> if (consumes != null) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> if (this.consumes == null)<a name="line.328"></a>
-<span class="sourceLineNo">329</span> this.consumes = new LinkedList<MediaType>();<a name="line.329"></a>
-<span class="sourceLineNo">330</span> this.consumes.addAll(consumes);<a name="line.330"></a>
-<span class="sourceLineNo">331</span> }<a name="line.331"></a>
-<span class="sourceLineNo">332</span> return this;<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span> /**<a name="line.335"></a>
-<span class="sourceLineNo">336</span> * Synonym for {@link #addConsumes(MediaType...)}.<a name="line.336"></a>
-<span class="sourceLineNo">337</span> *<a name="line.337"></a>
-<span class="sourceLineNo">338</span> * @param consumes The values to add for the <property>consumes</property> property on this bean.<a name="line.338"></a>
-<span class="sourceLineNo">339</span> * @return This object (for method chaining).<a name="line.339"></a>
-<span class="sourceLineNo">340</span> */<a name="line.340"></a>
-<span class="sourceLineNo">341</span> public Swagger consumes(MediaType...consumes) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> return addConsumes(consumes);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span> /**<a name="line.345"></a>
-<span class="sourceLineNo">346</span> * Synonym for {@link #addConsumes(Collection)}.<a name="line.346"></a>
-<span class="sourceLineNo">347</span> *<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * @param consumes The values to add for the <property>consumes</property> property on this bean.<a name="line.348"></a>
-<span class="sourceLineNo">349</span> * @return This object (for method chaining).<a name="line.349"></a>
-<span class="sourceLineNo">350</span> */<a name="line.350"></a>
-<span class="sourceLineNo">351</span> public Swagger consumes(Collection<MediaType> consumes) {<a name="line.351"></a>
-<span class="sourceLineNo">352</span> return addConsumes(consumes);<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> /**<a name="line.355"></a>
-<span class="sourceLineNo">356</span> * Bean property getter: <property>produces</property>.<a name="line.356"></a>
-<span class="sourceLineNo">357</span> * <p><a name="line.357"></a>
-<span class="sourceLineNo">358</span> * A list of MIME types the APIs can produce.<a name="line.358"></a>
-<span class="sourceLineNo">359</span> * This is global to all APIs but can be overridden on specific API calls.<a name="line.359"></a>
-<span class="sourceLineNo">360</span> * Value MUST be as described under <a class="doclink" href="http://swagger.io/specification/#mimeTypes">Mime Types</a>.<a name="line.360"></a>
-<span class="sourceLineNo">361</span> *<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * @return The value of the <property>produces</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.362"></a>
-<span class="sourceLineNo">363</span> */<a name="line.363"></a>
-<span class="sourceLineNo">364</span> public List<MediaType> getProduces() {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return produces;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> /**<a name="line.368"></a>
-<span class="sourceLineNo">369</span> * Bean property setter: <property>produces</property>.<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * <p><a name="line.370"></a>
-<span class="sourceLineNo">371</span> * A list of MIME types the APIs can produce.<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * This is global to all APIs but can be overridden on specific API calls.<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * Value MUST be as described under <a class="doclink" href="http://swagger.io/specification/#mimeTypes">Mime Types</a>.<a name="line.373"></a>
-<span class="sourceLineNo">374</span> *<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * @param produces The new value for the <property>produces</property> property on this bean.<a name="line.375"></a>
-<span class="sourceLineNo">376</span> * @return This object (for method chaining).<a name="line.376"></a>
-<span class="sourceLineNo">377</span> */<a name="line.377"></a>
-<span class="sourceLineNo">378</span> public Swagger setProduces(List<MediaType> produces) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> this.produces = produces;<a name="line.379"></a>
-<span class="sourceLineNo">380</span> return this;<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> /**<a name="line.383"></a>
-<span class="sourceLineNo">384</span> * Bean property adder: <property>produces</property>.<a name="line.384"></a>
-<span class="sourceLineNo">385</span> * <p><a name="line.385"></a>
-<span class="sourceLineNo">386</span> * A list of MIME types the APIs can produce.<a name="line.386"></a>
-<span class="sourceLineNo">387</span> * This is global to all APIs but can be overridden on specific API calls.<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * Value MUST be as described under <a class="doclink" href="http://swagger.io/specification/#mimeTypes">Mime Types</a>.<a name="line.388"></a>
-<span class="sourceLineNo">389</span> *<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * @param produces The values to add for the <property>produces</property> property on this bean.<a name="line.390"></a>
-<span class="sourceLineNo">391</span> * @return This object (for method chaining).<a name="line.391"></a>
-<span class="sourceLineNo">392</span> */<a name="line.392"></a>
-<span class="sourceLineNo">393</span> public Swagger addProduces(MediaType...produces) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> return addProduces(Arrays.asList(produces));<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> /**<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * Bean property adder: <property>produces</property>.<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * <p><a name="line.399"></a>
-<span class="sourceLineNo">400</span> * A list of MIME types the APIs can produce.<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * This is global to all APIs but can be overridden on specific API calls.<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * Value MUST be as described under <a class="doclink" href="http://swagger.io/specification/#mimeTypes">Mime Types</a>.<a name="line.402"></a>
-<span class="sourceLineNo">403</span> *<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * @param produces The values to add for the <property>produces</property> property on this bean.<a name="line.404"></a>
-<span class="sourceLineNo">405</span> * @return This object (for method chaining).<a name="line.405"></a>
-<span class="sourceLineNo">406</span> */<a name="line.406"></a>
-<span class="sourceLineNo">407</span> public Swagger addProduces(Collection<MediaType> produces) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> if (produces != null) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> if (this.produces == null)<a name="line.409"></a>
-<span class="sourceLineNo">410</span> this.produces = new LinkedList<MediaType>();<a name="line.410"></a>
-<span class="sourceLineNo">411</span> this.produces.addAll(produces);<a name="line.411"></a>
-<span class="sourceLineNo">412</span> }<a name="line.412"></a>
-<span class="sourceLineNo">413</span> return this;<a name="line.413"></a>
-<span class="sourceLineNo">414</span> }<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span> /**<a name="line.416"></a>
-<span class="sourceLineNo">417</span> * Synonym for {@link #addProduces(MediaType...)}.<a name="line.417"></a>
-<span class="sourceLineNo">418</span> *<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * @param produces The values to add for the <property>produces</property> property on this bean.<a name="line.419"></a>
-<span class="sourceLineNo">420</span> * @return This object (for method chaining).<a name="line.420"></a>
-<span class="sourceLineNo">421</span> */<a name="line.421"></a>
-<span class="sourceLineNo">422</span> public Swagger produces(MediaType...produces) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> return addProduces(produces);<a name="line.423"></a>
-<span class="sourceLineNo">424</span> }<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span> /**<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * Synonym for {@link #addProduces(Collection)}.<a name="line.427"></a>
-<span class="sourceLineNo">428</span> *<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * @param produces The values to add for the <property>produces</property> property on this bean.<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * @return This object (for method chaining).<a name="line.430"></a>
-<span class="sourceLineNo">431</span> */<a name="line.431"></a>
-<span class="sourceLineNo">432</span> public Swagger produces(Collection<MediaType> produces) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> return addProduces(produces);<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> /**<a name="line.436"></a>
-<span class="sourceLineNo">437</span> * Bean property getter: <property>paths</property>.<a name="line.437"></a>
-<span class="sourceLineNo">438</span> * <p><a name="line.438"></a>
-<span class="sourceLineNo">439</span> * Required. The available paths and operations for the API.<a name="line.439"></a>
-<span class="sourceLineNo">440</span> *<a name="line.440"></a>
-<span class="sourceLineNo">441</span> * @return The value of the <property>paths</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.441"></a>
-<span class="sourceLineNo">442</span> */<a name="line.442"></a>
-<span class="sourceLineNo">443</span> public Map<String,Map<String,Operation>> getPaths() {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> return paths;<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span> /**<a name="line.447"></a>
-<span class="sourceLineNo">448</span> * Bean property setter: <property>paths</property>.<a name="line.448"></a>
-<span class="sourceLineNo">449</span> * <p><a name="line.449"></a>
-<span class="sourceLineNo">450</span> * Required. The available paths and operations for the API.<a name="line.450"></a>
-<span class="sourceLineNo">451</span> *<a name="line.451"></a>
-<span class="sourceLineNo">452</span> * @param paths The new value for the <property>paths</property> property on this bean.<a name="line.452"></a>
-<span class="sourceLineNo">453</span> * @return This object (for method chaining).<a name="line.453"></a>
-<span class="sourceLineNo">454</span> */<a name="line.454"></a>
-<span class="sourceLineNo">455</span> public Swagger setPaths(Map<String,Map<String,Operation>> paths) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> this.paths = paths;<a name="line.456"></a>
-<span class="sourceLineNo">457</span> return this;<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> /**<a name="line.460"></a>
-<span class="sourceLineNo">461</span> * Bean property adder: <property>paths</property>.<a name="line.461"></a>
-<span class="sourceLineNo">462</span> * <p><a name="line.462"></a>
-<span class="sourceLineNo">463</span> * Required. The available paths and operations for the API.<a name="line.463"></a>
-<span class="sourceLineNo">464</span> *<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * @param path The path template.<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * @param methodName The HTTP method name.<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * @param operation The operation that describes the path.<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * @return This object (for method chaining).<a name="line.468"></a>
-<span class="sourceLineNo">469</span> */<a name="line.469"></a>
-<span class="sourceLineNo">470</span> public Swagger addPath(String path, String methodName, Operation operation) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (paths == null)<a name="line.471"></a>
-<span class="sourceLineNo">472</span> paths = new TreeMap<String,Map<String,Operation>>();<a name="line.472"></a>
-<span class="sourceLineNo">473</span> Map<String,Operation> p = paths.get(path);<a name="line.473"></a>
-<span class="sourceLineNo">474</span> if (p == null) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span> p = new TreeMap<String,Operation>(new MethodSorter());<a name="line.475"></a>
-<span class="sourceLineNo">476</span> paths.put(path, p);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> }<a name="line.477"></a>
-<span class="sourceLineNo">478</span> p.put(methodName, operation);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> return this;<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> /**<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * Synonym for {@link #path(String,String,Operation)}.<a name="line.483"></a>
-<span class="sourceLineNo">484</span> *<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * @param path The path template.<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * @param methodName The HTTP method name.<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * @param operation The operation that describes the path.<a name="line.487"></a>
-<span class="sourceLineNo">488</span> * @return This object (for method chaining).<a name="line.488"></a>
-<span class="sourceLineNo">489</span> */<a name="line.489"></a>
-<span class="sourceLineNo">490</span> public Swagger path(String path, String methodName, Operation operation) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> return addPath(path, methodName, operation);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span> /**<a name="line.494"></a>
-<span class="sourceLineNo">495</span> * Bean property getter: <property>definitions</property>.<a name="line.495"></a>
-<span class="sourceLineNo">496</span> * <p><a name="line.496"></a>
-<span class="sourceLineNo">497</span> * An object to hold data types produced and consumed by operations.<a name="line.497"></a>
-<span class="sourceLineNo">498</span> *<a name="line.498"></a>
-<span class="sourceLineNo">499</span> * @return The value of the <property>definitions</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.499"></a>
-<span class="sourceLineNo">500</span> */<a name="line.500"></a>
-<span class="sourceLineNo">501</span> public Map<String,SchemaInfo> getDefinitions() {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> return definitions;<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> /**<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * Bean property setter: <property>definitions</property>.<a name="line.506"></a>
-<span class="sourceLineNo">507</span> * <p><a name="line.507"></a>
-<span class="sourceLineNo">508</span> * An object to hold data types produced and consumed by operations.<a name="line.508"></a>
-<span class="sourceLineNo">509</span> *<a name="line.509"></a>
-<span class="sourceLineNo">510</span> * @param definitions The new value for the <property>definitions</property> property on this bean.<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * @return This object (for method chaining).<a name="line.511"></a>
-<span class="sourceLineNo">512</span> */<a name="line.512"></a>
-<span class="sourceLineNo">513</span> public Swagger setDefinitions(Map<String,SchemaInfo> definitions) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> this.definitions = definitions;<a name="line.514"></a>
-<span class="sourceLineNo">515</span> return this;<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span> /**<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * Bean property adder: <property>definitions</property>.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> * <p><a name="line.520"></a>
-<span class="sourceLineNo">521</span> * An object to hold data types produced and consumed by operations.<a name="line.521"></a>
-<span class="sourceLineNo">522</span> *<a name="line.522"></a>
-<span class="sourceLineNo">523</span> * @param name A definition name.<a name="line.523"></a>
-<span class="sourceLineNo">524</span> * @param schema The schema that the name defines.<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * @return This object (for method chaining).<a name="line.525"></a>
-<span class="sourceLineNo">526</span> */<a name="line.526"></a>
-<span class="sourceLineNo">527</span> public Swagger addDefinition(String name, SchemaInfo schema) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> if (definitions == null)<a name="line.528"></a>
-<span class="sourceLineNo">529</span> definitions = new TreeMap<String,SchemaInfo>();<a name="line.529"></a>
-<span class="sourceLineNo">530</span> definitions.put(name, schema);<a name="line.530"></a>
-<span class="sourceLineNo">531</span> return this;<a name="line.531"></a>
-<span class="sourceLineNo">532</span> }<a name="line.532"></a>
-<span class="sourceLineNo">533</span><a name="line.533"></a>
-<span class="sourceLineNo">534</span> /**<a name="line.534"></a>
-<span class="sourceLineNo">535</span> * Synonym for {@link #addDefinition(String,SchemaInfo)}.<a name="line.535"></a>
-<span class="sourceLineNo">536</span> *<a name="line.536"></a>
-<span class="sourceLineNo">537</span> * @param name A definition name.<a name="line.537"></a>
-<span class="sourceLineNo">538</span> * @param schema The schema that the name defines.<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * @return This object (for method chaining).<a name="line.539"></a>
-<span class="sourceLineNo">540</span> */<a name="line.540"></a>
-<span class="sourceLineNo">541</span> public Swagger xxx(String name, SchemaInfo schema) {<a name="line.541"></a>
-<span class="sourceLineNo">542</span> return addDefinition(name, schema);<a name="line.542"></a>
-<span class="sourceLineNo">543</span> }<a name="line.543"></a>
-<span class="sourceLineNo">544</span><a name="line.544"></a>
-<span class="sourceLineNo">545</span> /**<a name="line.545"></a>
-<span class="sourceLineNo">546</span> * Bean property getter: <property>parameters</property>.<a name="line.546"></a>
-<span class="sourceLineNo">547</span> * <p><a name="line.547"></a>
-<span class="sourceLineNo">548</span> * An object to hold parameters that can be used across operations.<a name="line.548"></a>
-<span class="sourceLineNo">549</span> * This property does not define global parameters for all operations.<a name="line.549"></a>
-<span class="sourceLineNo">550</span> *<a name="line.550"></a>
-<span class="sourceLineNo">551</span> * @return The value of the <property>parameters</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.551"></a>
-<span class="sourceLineNo">552</span> */<a name="line.552"></a>
-<span class="sourceLineNo">553</span> public Map<String,ParameterInfo> getParameters() {<a name="line.553"></a>
-<span class="sourceLineNo">554</span> return parameters;<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span> /**<a name="line.557"></a>
-<span class="sourceLineNo">558</span> * Bean property setter: <property>parameters</property>.<a name="line.558"></a>
-<span class="sourceLineNo">559</span> * <p><a name="line.559"></a>
-<span class="sourceLineNo">560</span> * An object to hold parameters that can be used across operations.<a name="line.560"></a>
-<span class="sourceLineNo">561</span> * This property does not define global parameters for all operations.<a name="line.561"></a>
-<span class="sourceLineNo">562</span> *<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * @param parameters The new value for the <property>parameters</property> property on this bean.<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * @return This object (for method chaining).<a name="line.564"></a>
-<span class="sourceLineNo">565</span> */<a name="line.565"></a>
-<span class="sourceLineNo">566</span> public Swagger setParameters(Map<String,ParameterInfo> parameters) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span> this.parameters = parameters;<a name="line.567"></a>
-<span class="sourceLineNo">568</span> return this;<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span> /**<a name="line.571"></a>
-<span class="sourceLineNo">572</span> * Bean property adder: <property>parameters</property>.<a name="line.572"></a>
-<span class="sourceLineNo">573</span> * <p><a name="line.573"></a>
-<span class="sourceLineNo">574</span> * An object to hold parameters that can be used across operations.<a name="line.574"></a>
-<span class="sourceLineNo">575</span> * This property does not define global parameters for all operations.<a name="line.575"></a>
-<span class="sourceLineNo">576</span> *<a name="line.576"></a>
-<span class="sourceLineNo">577</span> * @param name The parameter name.<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * @param parameter The parameter definition.<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * @return This object (for method chaining).<a name="line.579"></a>
-<span class="sourceLineNo">580</span> */<a name="line.580"></a>
-<span class="sourceLineNo">581</span> public Swagger addParameter(String name, ParameterInfo parameter) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span> if (parameters == null)<a name="line.582"></a>
-<span class="sourceLineNo">583</span> parameters = new TreeMap<String,ParameterInfo>();<a name="line.583"></a>
-<span class="sourceLineNo">584</span> parameters.put(name, parameter);<a name="line.584"></a>
-<span class="sourceLineNo">585</span> return this;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span> /**<a name="line.588"></a>
-<span class="sourceLineNo">589</span> * Synonym for {@link #addParameter(String,ParameterInfo)}.<a name="line.589"></a>
-<span class="sourceLineNo">590</span> *<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * @param name The parameter name.<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @param parameter The parameter definition.<a name="line.592"></a>
-<span class="sourceLineNo">593</span> * @return This object (for method chaining).<a name="line.593"></a>
-<span class="sourceLineNo">594</span> */<a name="line.594"></a>
-<span class="sourceLineNo">595</span> public Swagger parameter(String name, ParameterInfo parameter) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span> return addParameter(name, parameter);<a name="line.596"></a>
-<span class="sourceLineNo">597</span> }<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span> /**<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * Bean property getter: <property>responses</property>.<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * <p><a name="line.601"></a>
-<span class="sourceLineNo">602</span> * An object to hold responses that can be used across operations.<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * This property does not define global responses for all operations.<a name="line.603"></a>
-<span class="sourceLineNo">604</span> *<a name="line.604"></a>
-<span class="sourceLineNo">605</span> * @return The value of the <property>responses</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.605"></a>
-<span class="sourceLineNo">606</span> */<a name="line.606"></a>
-<span class="sourceLineNo">607</span> public Map<String,ResponseInfo> getResponses() {<a name="line.607"></a>
-<span class="sourceLineNo">608</span> return responses;<a name="line.608"></a>
-<span class="sourceLineNo">609</span> }<a name="line.609"></a>
-<span class="sourceLineNo">610</span><a name="line.610"></a>
-<span class="sourceLineNo">611</span> /**<a name="line.611"></a>
-<span class="sourceLineNo">612</span> * Bean property setter: <property>responses</property>.<a name="line.612"></a>
-<span class="sourceLineNo">613</span> * <p><a name="line.613"></a>
-<span class="sourceLineNo">614</span> * An object to hold responses that can be used across operations.<a name="line.614"></a>
-<span class="sourceLineNo">615</span> * This property does not define global responses for all operations.<a name="line.615"></a>
-<span class="sourceLineNo">616</span> *<a name="line.616"></a>
-<span class="sourceLineNo">617</span> * @param responses The new value for the <property>responses</property> property on this bean.<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * @return This object (for method chaining).<a name="line.618"></a>
-<span class="sourceLineNo">619</span> */<a name="line.619"></a>
-<span class="sourceLineNo">620</span> public Swagger setResponses(Map<String,ResponseInfo> responses) {<a name="line.620"></a>
-<span class="sourceLineNo">621</span> this.responses = responses;<a name="line.621"></a>
-<span class="sourceLineNo">622</span> return this;<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span> /**<a name="line.625"></a>
-<span class="sourceLineNo">626</span> * Bean property adder: <property>responses</property>.<a name="line.626"></a>
-<span class="sourceLineNo">627</span> * <p><a name="line.627"></a>
-<span class="sourceLineNo">628</span> * An object to hold responses that can be used across operations.<a name="line.628"></a>
-<span class="sourceLineNo">629</span> * This property does not define global responses for all operations.<a name="line.629"></a>
-<span class="sourceLineNo">630</span> *<a name="line.630"></a>
-<span class="sourceLineNo">631</span> * @param name The response name.<a name="line.631"></a>
-<span class="sourceLineNo">632</span> * @param response The response definition.<a name="line.632"></a>
-<span class="sourceLineNo">633</span> * @return This object (for method chaining).<a name="line.633"></a>
-<span class="sourceLineNo">634</span> */<a name="line.634"></a>
-<span class="sourceLineNo">635</span> public Swagger addResponse(String name, ResponseInfo response) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span> if (responses == null)<a name="line.636"></a>
-<span class="sourceLineNo">637</span> responses = new TreeMap<String,ResponseInfo>();<a name="line.637"></a>
-<span class="sourceLineNo">638</span> responses.put(name, response);<a name="line.638"></a>
-<span class="sourceLineNo">639</span> return this;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span> /**<a name="line.642"></a>
-<span class="sourceLineNo">643</span> * Synonym for {@link #addResponse(String,ResponseInfo)}.<a name="line.643"></a>
-<span class="sourceLineNo">644</span> *<a name="line.644"></a>
-<span class="sourceLineNo">645</span> * @param name The response name.<a name="line.645"></a>
-<span class="sourceLineNo">646</span> * @param response The response definition.<a name="line.646"></a>
-<span class="sourceLineNo">647</span> * @return This object (for method chaining).<a name="line.647"></a>
-<span class="sourceLineNo">648</span> */<a name="line.648"></a>
-<span class="sourceLineNo">649</span> public Swagger response(String name, ResponseInfo response) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span> return addResponse(name, response);<a name="line.650"></a>
-<span class="sourceLineNo">651</span> }<a name="line.651"></a>
-<span class="sourceLineNo">652</span><a name="line.652"></a>
-<span class="sourceLineNo">653</span> /**<a name="line.653"></a>
-<span class="sourceLineNo">654</span> * Bean property getter: <property>securityDefinitions</property>.<a name="line.654"></a>
-<span class="sourceLineNo">655</span> * <p><a name="line.655"></a>
-<span class="sourceLineNo">656</span> * Security scheme definitions that can be used across the specification.<a name="line.656"></a>
-<span class="sourceLineNo">657</span> *<a name="line.657"></a>
-<span class="sourceLineNo">658</span> * @return The value of the <property>securityDefinitions</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.658"></a>
-<span class="sourceLineNo">659</span> */<a name="line.659"></a>
-<span class="sourceLineNo">660</span> public Map<String,SecurityScheme> getSecurityDefinitions() {<a name="line.660"></a>
-<span class="sourceLineNo">661</span> return securityDefinitions;<a name="line.661"></a>
-<span class="sourceLineNo">662</span> }<a name="line.662"></a>
-<span class="sourceLineNo">663</span><a name="line.663"></a>
-<span class="sourceLineNo">664</span> /**<a name="line.664"></a>
-<span class="sourceLineNo">665</span> * Bean property setter: <property>securityDefinitions</property>.<a name="line.665"></a>
-<span class="sourceLineNo">666</span> * <p><a name="line.666"></a>
-<span class="sourceLineNo">667</span> * Security scheme definitions that can be used across the specification.<a name="line.667"></a>
-<span class="sourceLineNo">668</span> *<a name="line.668"></a>
-<span class="sourceLineNo">669</span> * @param securityDefinitions The new value for the <property>securityDefinitions</property> property on this bean.<a name="line.669"></a>
-<span class="sourceLineNo">670</span> * @return This object (for method chaining).<a name="line.670"></a>
-<span class="sourceLineNo">671</span> */<a name="line.671"></a>
-<span class="sourceLineNo">672</span> public Swagger setSecurityDefinitions(Map<String,SecurityScheme> securityDefinitions) {<a name="line.672"></a>
-<span class="sourceLineNo">673</span> this.securityDefinitions = securityDefinitions;<a name="line.673"></a>
-<span class="sourceLineNo">674</span> return this;<a name="line.674"></a>
-<span class="sourceLineNo">675</span> }<a name="line.675"></a>
-<span class="sourceLineNo">676</span><a name="line.676"></a>
-<span class="sourceLineNo">677</span> /**<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * Bean property adder: <property>securityDefinitions</property>.<a name="line.678"></a>
-<span class="sourceLineNo">679</span> * <p><a name="line.679"></a>
-<span class="sourceLineNo">680</span> * Security scheme definitions that can be used across the specification.<a name="line.680"></a>
-<span class="sourceLineNo">681</span> *<a name="line.681"></a>
-<span class="sourceLineNo">682</span> * @param name A security name.<a name="line.682"></a>
-<span class="sourceLineNo">683</span> * @param securityScheme A security schema.<a name="line.683"></a>
-<span class="sourceLineNo">684</span> * @return This object (for method chaining).<a name="line.684"></a>
-<span class="sourceLineNo">685</span> */<a name="line.685"></a>
-<span class="sourceLineNo">686</span> public Swagger addSecurityDefinition(String name, SecurityScheme securityScheme) {<a name="line.686"></a>
-<span class="sourceLineNo">687</span> if (securityDefinitions == null)<a name="line.687"></a>
-<span class="sourceLineNo">688</span> securityDefinitions = new TreeMap<String,SecurityScheme>();<a name="line.688"></a>
-<span class="sourceLineNo">689</span> securityDefinitions.put(name, securityScheme);<a name="line.689"></a>
-<span class="sourceLineNo">690</span> return this;<a name="line.690"></a>
-<span class="sourceLineNo">691</span> }<a name="line.691"></a>
-<span class="sourceLineNo">692</span><a name="line.692"></a>
-<span class="sourceLineNo">693</span> /**<a name="line.693"></a>
-<span class="sourceLineNo">694</span> * Synonym for {@link #addSecurityDefinition(String,SecurityScheme)}.<a name="line.694"></a>
-<span class="sourceLineNo">695</span> *<a name="line.695"></a>
-<span class="sourceLineNo">696</span> * @param name A security name.<a name="line.696"></a>
-<span class="sourceLineNo">697</span> * @param securityScheme A security schema.<a name="line.697"></a>
-<span class="sourceLineNo">698</span> * @return This object (for method chaining).<a name="line.698"></a>
-<span class="sourceLineNo">699</span> */<a name="line.699"></a>
-<span class="sourceLineNo">700</span> public Swagger securityDefinition(String name, SecurityScheme securityScheme) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> return addSecurityDefinition(name, securityScheme);<a name="line.701"></a>
-<span class="sourceLineNo">702</span> }<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span> /**<a name="line.704"></a>
-<span class="sourceLineNo">705</span> * Bean property getter: <property>security</property>.<a name="line.705"></a>
-<span class="sourceLineNo">706</span> * <p><a name="line.706"></a>
-<span class="sourceLineNo">707</span> * A declaration of which security schemes are applied for the API as a whole.<a name="line.707"></a>
-<span class="sourceLineNo">708</span> * The list of values describes alternative security schemes that can be used (that is, there is a logical OR between the security requirements).<a name="line.708"></a>
-<span class="sourceLineNo">709</span> * Individual operations can override this definition.<a name="line.709"></a>
-<span class="sourceLineNo">710</span> *<a name="line.710"></a>
-<span class="sourceLineNo">711</span> * @return The value of the <property>security</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.711"></a>
-<span class="sourceLineNo">712</span> */<a name="line.712"></a>
-<span class="sourceLineNo">713</span> public List<Map<String,List<String>>> getSecurity() {<a name="line.713"></a>
-<span class="sourceLineNo">714</span> return security;<a name="line.714"></a>
-<span class="sourceLineNo">715</span> }<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span> /**<a name="line.717"></a>
-<span class="sourceLineNo">718</span> * Bean property setter: <property>security</property>.<a name="line.718"></a>
-<span class="sourceLineNo">719</span> * <p><a name="line.719"></a>
-<span class="sourceLineNo">720</span> * A declaration of which security schemes are applied for the API as a whole.<a name="line.720"></a>
-<span class="sourceLineNo">721</span> * The list of values describes alternative security schemes that can be used (that is, there is a logical OR between the security requirements).<a name="line.721"></a>
-<span class="sourceLineNo">722</span> * Individual operations can override this definition.<a name="line.722"></a>
-<span class="sourceLineNo">723</span> *<a name="line.723"></a>
-<span class="sourceLineNo">724</span> * @param security The new value for the <property>security</property> property on this bean.<a name="line.724"></a>
-<span class="sourceLineNo">725</span> * @return This object (for method chaining).<a name="line.725"></a>
-<span class="sourceLineNo">726</span> */<a name="line.726"></a>
-<span class="sourceLineNo">727</span> public Swagger setSecurity(List<Map<String,List<String>>> security) {<a name="line.727"></a>
-<span class="sourceLineNo">728</span> this.security = security;<a name="line.728"></a>
-<span class="sourceLineNo">729</span> return this;<a name="line.729"></a>
-<span class="sourceLineNo">730</span> }<a name="line.730"></a>
-<span class="sourceLineNo">731</span><a name="line.731"></a>
-<span class="sourceLineNo">732</span> /**<a name="line.732"></a>
-<span class="sourceLineNo">733</span> * Bean property adder: <property>security</property>.<a name="line.733"></a>
-<span class="sourceLineNo">734</span> * <p><a name="line.734"></a>
-<span class="sourceLineNo">735</span> * A declaration of which security schemes are applied for the API as a whole.<a name="line.735"></a>
-<span class="sourceLineNo">736</span> * The list of values describes alternative security schemes that can be used (that is, there is a logical OR between the security requirements).<a name="line.736"></a>
-<span class="sourceLineNo">737</span> * Individual operations can override this definition.<a name="line.737"></a>
-<span class="sourceLineNo">738</span> *<a name="line.738"></a>
-<span class="sourceLineNo">739</span> * @param security The value to add for the <property>security</property> property on this bean.<a name="line.739"></a>
-<span class="sourceLineNo">740</span> * @return This object (for method chaining).<a name="line.740"></a>
-<span class="sourceLineNo">741</span> */<a name="line.741"></a>
-<span class="sourceLineNo">742</span> public Swagger addSecurity(Map<String,List<String>> security) {<a name="line.742"></a>
-<span class="sourceLineNo">743</span> if (this.security == null)<a name="line.743"></a>
-<span class="sourceLineNo">744</span> this.security = new LinkedList<Map<String,List<String>>>();<a name="line.744"></a>
-<span class="sourceLineNo">745</span> this.security.add(security);<a name="line.745"></a>
-<span class="sourceLineNo">746</span> return this;<a name="line.746"></a>
-<span class="sourceLineNo">747</span> }<a name="line.747"></a>
-<span class="sourceLineNo">748</span><a name="line.748"></a>
-<span class="sourceLineNo">749</span> /**<a name="line.749"></a>
-<span class="sourceLineNo">750</span> * Synonym for {@link #addSecurity(Map)}.<a name="line.750"></a>
-<span class="sourceLineNo">751</span> *<a name="line.751"></a>
-<span class="sourceLineNo">752</span> * @param scheme The security scheme that applies to this operation<a name="line.752"></a>
-<span class="sourceLineNo">753</span> * @param alternatives The list of values describes alternative security schemes that can be used (that is, there is a logical OR between the security requirements).<a name="line.753"></a>
-<span class="sourceLineNo">754</span> * @return This object (for method chaining).<a name="line.754"></a>
-<span class="sourceLineNo">755</span> */<a name="line.755"></a>
-<span class="sourceLineNo">756</span> public Swagger security(String scheme, String...alternatives) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span> Map<String,List<String>> m = new LinkedHashMap<String,List<String>>();<a name="line.757"></a>
-<span class="sourceLineNo">758</span> m.put(scheme, Arrays.asList(alternatives));<a name="line.758"></a>
-<span class="sourceLineNo">759</span> return addSecurity(m);<a name="line.759"></a>
-<span class="sourceLineNo">760</span> }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span> /**<a name="line.762"></a>
-<span class="sourceLineNo">763</span> * Bean property getter: <property>tags</property>.<a name="line.763"></a>
-<span class="sourceLineNo">764</span> * <p><a name="line.764"></a>
-<span class="sourceLineNo">765</span> * A list of tags used by the specification with additional metadata.<a name="line.765"></a>
-<span class="sourceLineNo">766</span> * The order of the tags can be used to reflect on their order by the parsing tools.<a name="line.766"></a>
-<span class="sourceLineNo">767</span> * Not all tags that are used by the <a class="doclink" href="http://swagger.io/specification/#operationObject">Operation Object</a> must be declared.<a name="line.767"></a>
-<span class="sourceLineNo">768</span> * The tags that are not declared may be organized randomly or based on the tools' logic.<a name="line.768"></a>
-<span class="sourceLineNo">769</span> * Each tag name in the list MUST be unique.<a name="line.769"></a>
-<span class="sourceLineNo">770</span> *<a name="line.770"></a>
-<span class="sourceLineNo">771</span> * @return The value of the <property>tags</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.771"></a>
-<span class="sourceLineNo">772</span> */<a name="line.772"></a>
-<span class="sourceLineNo">773</span> public List<Tag> getTags() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span> return tags;<a name="line.774"></a>
-<span class="sourceLineNo">775</span> }<a name="line.775"></a>
-<span class="sourceLineNo">776</span><a name="line.776"></a>
-<span class="sourceLineNo">777</span> /**<a name="line.777"></a>
-<span class="sourceLineNo">778</span> * Bean property setter: <property>tags</property>.<a name="line.778"></a>
-<span class="sourceLineNo">779</span> * <p><a name="line.779"></a>
-<span class="sourceLineNo">780</span> * A list of tags used by the specification with additional metadata.<a name="line.780"></a>
-<span class="sourceLineNo">781</span> * The order of the tags can be used to reflect on their order by the parsing tools.<a name="line.781"></a>
-<span class="sourceLineNo">782</span> * Not all tags that are used by the <a class="doclink" href="http://swagger.io/specification/#operationObject">Operation Object</a> must be declared.<a name="line.782"></a>
-<span class="sourceLineNo">783</span> * The tags that are not declared may be organized randomly or based on the tools' logic.<a name="line.783"></a>
-<span class="sourceLineNo">784</span> * Each tag name in the list MUST be unique.<a name="line.784"></a>
-<span class="sourceLineNo">785</span> *<a name="line.785"></a>
-<span class="sourceLineNo">786</span> * @param tags The new value for the <property>tags</property> property on this bean.<a name="line.786"></a>
-<span class="sourceLineNo">787</span> * @return This object (for method chaining).<a name="line.787"></a>
-<span class="sourceLineNo">788</span> */<a name="line.788"></a>
-<span class="sourceLineNo">789</span> public Swagger setTags(List<Tag> tags) {<a name="line.789"></a>
-<span class="sourceLineNo">790</span> this.tags = tags;<a name="line.790"></a>
-<span class="sourceLineNo">791</span> return this;<a name="line.791"></a>
-<span class="sourceLineNo">792</span> }<a name="line.792"></a>
-<span class="sourceLineNo">793</span><a name="line.793"></a>
-<span class="sourceLineNo">794</span> /**<a name="line.794"></a>
-<span class="sourceLineNo">795</span> * Bean property adder: <property>tags</property>.<a name="line.795"></a>
-<span class="sourceLineNo">796</span> * <p><a name="line.796"></a>
-<span class="sourceLineNo">797</span> * A list of tags used by the specification with additional metadata.<a name="line.797"></a>
-<span class="sourceLineNo">798</span> * The order of the tags can be used to reflect on their order by the parsing tools.<a name="line.798"></a>
-<span class="sourceLineNo">799</span> * Not all tags that are used by the <a class="doclink" href="http://swagger.io/specification/#operationObject">Operation Object</a> must be declared.<a name="line.799"></a>
-<span class="sourceLineNo">800</span> * The tags that are not declared may be organized randomly or based on the tools' logic.<a name="line.800"></a>
-<span class="sourceLineNo">801</span> * Each tag name in the list MUST be unique.<a name="line.801"></a>
-<span class="sourceLineNo">802</span> *<a name="line.802"></a>
-<span class="sourceLineNo">803</span> * @param tags The values to add for the <property>tags</property> property on this bean.<a name="line.803"></a>
-<span class="sourceLineNo">804</span> * @return This object (for method chaining).<a name="line.804"></a>
-<span class="sourceLineNo">805</span> */<a name="line.805"></a>
-<span class="sourceLineNo">806</span> public Swagger addTags(Tag...tags) {<a name="line.806"></a>
-<span class="sourceLineNo">807</span> if (this.tags == null)<a name="line.807"></a>
-<span class="sourceLineNo">808</span> this.tags = new LinkedList<Tag>();<a name="line.808"></a>
-<span class="sourceLineNo">809</span> this.tags.addAll(Arrays.asList(tags));<a name="line.809"></a>
-<span class="sourceLineNo">810</span> return this;<a name="line.810"></a>
-<span class="sourceLineNo">811</span> }<a name="line.811"></a>
-<span class="sourceLineNo">812</span><a name="line.812"></a>
-<span class="sourceLineNo">813</span> /**<a name="line.813"></a>
-<span class="sourceLineNo">814</span> * Synonym for {@link #addTags(Tag...)}.<a name="line.814"></a>
-<span class="sourceLineNo">815</span> *<a name="line.815"></a>
-<span class="sourceLineNo">816</span> * @param tags The values to add for the <property>tags</property> property on this bean.<a name="line.816"></a>
-<span class="sourceLineNo">817</span> * @return This object (for method chaining).<a name="line.817"></a>
-<span class="sourceLineNo">818</span> */<a name="line.818"></a>
-<span class="sourceLineNo">819</span> public Swagger tags(Tag...tags) {<a name="line.819"></a>
-<span class="sourceLineNo">820</span> return addTags(tags);<a name="line.820"></a>
-<span class="sourceLineNo">821</span> }<a name="line.821"></a>
-<span class="sourceLineNo">822</span><a name="line.822"></a>
-<span class="sourceLineNo">823</span> /**<a name="line.823"></a>
-<span class="sourceLineNo">824</span> * Synonym for {@link #setTags(List)}.<a name="line.824"></a>
-<span class="sourceLineNo">825</span> *<a name="line.825"></a>
-<span class="sourceLineNo">826</span> * @param tags The values to add for the <property>tags</property> property on this bean.<a name="line.826"></a>
-<span class="sourceLineNo">827</span> * @return This object (for method chaining).<a name="line.827"></a>
-<span class="sourceLineNo">828</span> */<a name="line.828"></a>
-<span class="sourceLineNo">829</span> public Swagger tags(List<Tag> tags) {<a name="line.829"></a>
-<span class="sourceLineNo">830</span> return setTags(tags);<a name="line.830"></a>
-<span class="sourceLineNo">831</span> }<a name="line.831"></a>
-<span class="sourceLineNo">832</span><a name="line.832"></a>
-<span class="sourceLineNo">833</span> /**<a name="line.833"></a>
-<span class="sourceLineNo">834</span> * Bean property getter: <property>externalDocs</property>.<a name="line.834"></a>
-<span class="sourceLineNo">835</span> * <p><a name="line.835"></a>
-<span class="sourceLineNo">836</span> * Additional external documentation.<a name="line.836"></a>
-<span class="sourceLineNo">837</span> *<a name="line.837"></a>
-<span class="sourceLineNo">838</span> * @return The value of the <property>externalDocs</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.838"></a>
-<span class="sourceLineNo">839</span> */<a name="line.839"></a>
-<span class="sourceLineNo">840</span> public ExternalDocumentation getExternalDocs() {<a name="line.840"></a>
-<span class="sourceLineNo">841</span> return externalDocs;<a name="line.841"></a>
-<span class="sourceLineNo">842</span> }<a name="line.842"></a>
-<span class="sourceLineNo">843</span><a name="line.843"></a>
-<span class="sourceLineNo">844</span> /**<a name="line.844"></a>
-<span class="sourceLineNo">845</span> * Bean property setter: <property>externalDocs</property>.<a name="line.845"></a>
-<span class="sourceLineNo">846</span> * <p><a name="line.846"></a>
-<span class="sourceLineNo">847</span> * Additional external documentation.<a name="line.847"></a>
-<span class="sourceLineNo">848</span> *<a name="line.848"></a>
-<span class="sourceLineNo">849</span> * @param externalDocs The new value for the <property>externalDocs</property> property on this bean.<a name="line.849"></a>
-<span class="sourceLineNo">850</span> * @return This object (for method chaining).<a name="line.850"></a>
-<span class="sourceLineNo">851</span> */<a name="line.851"></a>
-<span class="sourceLineNo">852</span> public Swagger setExternalDocs(ExternalDocumentation externalDocs) {<a name="line.852"></a>
-<span class="sourceLineNo">853</span> this.externalDocs = externalDocs;<a name="line.853"></a>
-<span class="sourceLineNo">854</span> return this;<a name="line.854"></a>
-<span class="sourceLineNo">855</span> }<a name="line.855"></a>
-<span class="sourceLineNo">856</span><a name="line.856"></a>
-<span class="sourceLineNo">857</span> /**<a name="line.857"></a>
-<span class="sourceLineNo">858</span> * Synonym for {@link #setExternalDocs(ExternalDocumentation)}.<a name="line.858"></a>
-<span class="sourceLineNo">859</span> *<a name="line.859"></a>
-<span class="sourceLineNo">860</span> * @param externalDocs The new value for the <property>externalDocs</property> property on this bean.<a name="line.860"></a>
-<span class="sourceLineNo">861</span> * @return This object (for method chaining).<a name="line.861"></a>
-<span class="sourceLineNo">862</span> */<a name="line.862"></a>
-<span class="sourceLineNo">863</span> public Swagger externalDocs(ExternalDocumentation externalDocs) {<a name="line.863"></a>
-<span class="sourceLineNo">864</span> return setExternalDocs(externalDocs);<a name="line.864"></a>
-<span class="sourceLineNo">865</span> }<a name="line.865"></a>
-<span class="sourceLineNo">866</span><a name="line.866"></a>
-<span class="sourceLineNo">867</span> private static class MethodSorter implements Comparator<String> {<a name="line.867"></a>
-<span class="sourceLineNo">868</span> @SuppressWarnings("serial")<a name="line.868"></a>
-<span class="sourceLineNo">869</span> private final Map<String,Integer> methods = new HashMap<String,Integer>(){{<a name="line.869"></a>
-<span class="sourceLineNo">870</span> put("get",7);<a name="line.870"></a>
-<span class="sourceLineNo">871</span> put("put",6);<a name="line.871"></a>
-<span class="sourceLineNo">872</span> put("post",5);<a name="line.872"></a>
-<span class="sourceLineNo">873</span> put("delete",4);<a name="line.873"></a>
-<span class="sourceLineNo">874</span> put("options",3);<a name="line.874"></a>
-<span class="sourceLineNo">875</span> put("head",2);<a name="line.875"></a>
-<span class="sourceLineNo">876</span> put("patch",1);<a name="line.876"></a>
-<span class="sourceLineNo">877</span> }};<a name="line.877"></a>
-<span class="sourceLineNo">878</span><a name="line.878"></a>
-<span class="sourceLineNo">879</span> @Override<a name="line.879"></a>
-<span class="sourceLineNo">880</span> public int compare(String o1, String o2) {<a name="line.880"></a>
-<span class="sourceLineNo">881</span> Integer i1 = methods.get(o1);<a name="line.881"></a>
-<span class="sourceLineNo">882</span> Integer i2 = methods.get(o2);<a name="line.882"></a>
-<span class="sourceLineNo">883</span> if (i1 == null)<a name="line.883"></a>
-<span class="sourceLineNo">884</span> i1 = 0;<a name="line.884"></a>
-<span class="sourceLineNo">885</span> if (i2 == null)<a name="line.885"></a>
-<span class="sourceLineNo">886</span> i2 = 0;<a name="line.886"></a>
-<span class="sourceLineNo">887</span> return i2.compareTo(i1);<a name="line.887"></a>
-<span class="sourceLineNo">888</span> }<a name="line.888"></a>
-<span class="sourceLineNo">889</span> }<a name="line.889"></a>
-<span class="sourceLineNo">890</span>}<a name="line.890"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.utils.*;<a name="line.19"></a>
+<span class="sourceLineNo">020</span><a name="line.20"></a>
+<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * This is the root document object for the API specification.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * <p><a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> */<a name="line.25"></a>
+<span class="sourceLineNo">026</span>@Bean(pr
<TRUNCATED>
[11/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html
index 5cd598c..1dd44a8 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html
@@ -40,284 +40,287 @@
<span class="sourceLineNo">032</span>import org.apache.juneau.rest.annotation.Properties;<a name="line.32"></a>
<span class="sourceLineNo">033</span>import org.apache.juneau.rest.converters.*;<a name="line.33"></a>
<span class="sourceLineNo">034</span>import org.apache.juneau.transforms.*;<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> * REST resource for viewing and accessing log files.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> */<a name="line.38"></a>
-<span class="sourceLineNo">039</span>@RestResource(<a name="line.39"></a>
-<span class="sourceLineNo">040</span> path="/logs",<a name="line.40"></a>
-<span class="sourceLineNo">041</span> title="Log files",<a name="line.41"></a>
-<span class="sourceLineNo">042</span> description="Log files from this service",<a name="line.42"></a>
-<span class="sourceLineNo">043</span> properties={<a name="line.43"></a>
-<span class="sourceLineNo">044</span> @Property(name=HTML_uriAnchorText, value=PROPERTY_NAME),<a name="line.44"></a>
-<span class="sourceLineNo">045</span> @Property(name=REST_allowMethodParam, value="true")<a name="line.45"></a>
-<span class="sourceLineNo">046</span> },<a name="line.46"></a>
-<span class="sourceLineNo">047</span> pojoSwaps={<a name="line.47"></a>
-<span class="sourceLineNo">048</span> IteratorSwap.class, // Allows Iterators and Iterables to be serialized.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> DateSwap.ISO8601DT.class // Serialize Date objects as ISO8601 strings.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> }<a name="line.50"></a>
-<span class="sourceLineNo">051</span>)<a name="line.51"></a>
-<span class="sourceLineNo">052</span>@SuppressWarnings("nls")<a name="line.52"></a>
-<span class="sourceLineNo">053</span>public class LogsResource extends Resource {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private static final long serialVersionUID = 1L;<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> private File logDir;<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private LogEntryFormatter leFormatter;<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> private final FileFilter filter = new FileFilter() {<a name="line.59"></a>
-<span class="sourceLineNo">060</span> @Override /* FileFilter */<a name="line.60"></a>
-<span class="sourceLineNo">061</span> public boolean accept(File f) {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> return f.isDirectory() || f.getName().endsWith(".log");<a name="line.62"></a>
-<span class="sourceLineNo">063</span> }<a name="line.63"></a>
-<span class="sourceLineNo">064</span> };<a name="line.64"></a>
-<span class="sourceLineNo">065</span> <a name="line.65"></a>
-<span class="sourceLineNo">066</span> @Override /* RestServlet */<a name="line.66"></a>
-<span class="sourceLineNo">067</span> public synchronized void init(RestConfig config) throws Exception {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> super.init(config);<a name="line.68"></a>
-<span class="sourceLineNo">069</span> ConfigFile cf = config.getConfigFile();<a name="line.69"></a>
-<span class="sourceLineNo">070</span> <a name="line.70"></a>
-<span class="sourceLineNo">071</span> logDir = new File(cf.getString("Logging/logDir", "."));<a name="line.71"></a>
-<span class="sourceLineNo">072</span> leFormatter = new LogEntryFormatter(<a name="line.72"></a>
-<span class="sourceLineNo">073</span> cf.getString("Logging/format", "[{date} {level}] {msg}%n"),<a name="line.73"></a>
-<span class="sourceLineNo">074</span> cf.getString("Logging/dateFormat", "yyyy.MM.dd hh:mm:ss"),<a name="line.74"></a>
-<span class="sourceLineNo">075</span> cf.getBoolean("Logging/useStackTraceHashes")<a name="line.75"></a>
-<span class="sourceLineNo">076</span> );<a name="line.76"></a>
-<span class="sourceLineNo">077</span> }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> /**<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * [GET /*] - Get file details or directory listing.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> *<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * @param req The HTTP request<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * @param properties The writable properties for setting the descriptions.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * @param path The log file path.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * @return The log file.<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * @throws Exception<a name="line.86"></a>
-<span class="sourceLineNo">087</span> */<a name="line.87"></a>
-<span class="sourceLineNo">088</span> @RestMethod(name="GET", path="/*", responses={@Response(200),@Response(404)})<a name="line.88"></a>
-<span class="sourceLineNo">089</span> public Object getFileOrDirectory(RestRequest req, @Properties ObjectMap properties, @PathRemainder String path) throws Exception {<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> File f = getFile(path);<a name="line.91"></a>
+<span class="sourceLineNo">035</span>import org.apache.juneau.utils.*;<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> * REST resource for viewing and accessing log files.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>@RestResource(<a name="line.40"></a>
+<span class="sourceLineNo">041</span> path="/logs",<a name="line.41"></a>
+<span class="sourceLineNo">042</span> title="Log files",<a name="line.42"></a>
+<span class="sourceLineNo">043</span> description="Log files from this service",<a name="line.43"></a>
+<span class="sourceLineNo">044</span> properties={<a name="line.44"></a>
+<span class="sourceLineNo">045</span> @Property(name=HTML_uriAnchorText, value=PROPERTY_NAME),<a name="line.45"></a>
+<span class="sourceLineNo">046</span> @Property(name=REST_allowMethodParam, value="true")<a name="line.46"></a>
+<span class="sourceLineNo">047</span> },<a name="line.47"></a>
+<span class="sourceLineNo">048</span> pojoSwaps={<a name="line.48"></a>
+<span class="sourceLineNo">049</span> IteratorSwap.class, // Allows Iterators and Iterables to be serialized.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> DateSwap.ISO8601DT.class // Serialize Date objects as ISO8601 strings.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> }<a name="line.51"></a>
+<span class="sourceLineNo">052</span>)<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@SuppressWarnings("nls")<a name="line.53"></a>
+<span class="sourceLineNo">054</span>public class LogsResource extends Resource {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> private static final long serialVersionUID = 1L;<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> private File logDir;<a name="line.57"></a>
+<span class="sourceLineNo">058</span> private LogEntryFormatter leFormatter;<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span> private final FileFilter filter = new FileFilter() {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> @Override /* FileFilter */<a name="line.61"></a>
+<span class="sourceLineNo">062</span> public boolean accept(File f) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> return f.isDirectory() || f.getName().endsWith(".log");<a name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span> };<a name="line.65"></a>
+<span class="sourceLineNo">066</span> <a name="line.66"></a>
+<span class="sourceLineNo">067</span> @Override /* RestServlet */<a name="line.67"></a>
+<span class="sourceLineNo">068</span> public synchronized void init(RestConfig config) throws Exception {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> super.init(config);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> ConfigFile cf = config.getConfigFile();<a name="line.70"></a>
+<span class="sourceLineNo">071</span> <a name="line.71"></a>
+<span class="sourceLineNo">072</span> logDir = new File(cf.getString("Logging/logDir", "."));<a name="line.72"></a>
+<span class="sourceLineNo">073</span> leFormatter = new LogEntryFormatter(<a name="line.73"></a>
+<span class="sourceLineNo">074</span> cf.getString("Logging/format", "[{date} {level}] {msg}%n"),<a name="line.74"></a>
+<span class="sourceLineNo">075</span> cf.getString("Logging/dateFormat", "yyyy.MM.dd hh:mm:ss"),<a name="line.75"></a>
+<span class="sourceLineNo">076</span> cf.getBoolean("Logging/useStackTraceHashes")<a name="line.76"></a>
+<span class="sourceLineNo">077</span> );<a name="line.77"></a>
+<span class="sourceLineNo">078</span> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> /**<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * [GET /*] - Get file details or directory listing.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> *<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * @param req The HTTP request<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * @param res The HTTP response<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * @param properties The writable properties for setting the descriptions.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * @param path The log file path.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * @return The log file.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * @throws Exception<a name="line.88"></a>
+<span class="sourceLineNo">089</span> */<a name="line.89"></a>
+<span class="sourceLineNo">090</span> @RestMethod(name="GET", path="/*", responses={@Response(200),@Response(404)})<a name="line.90"></a>
+<span class="sourceLineNo">091</span> public Object getFileOrDirectory(RestRequest req, RestResponse res, @Properties ObjectMap properties, @PathRemainder String path) throws Exception {<a name="line.91"></a>
<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span> if (f.isDirectory()) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> Set<FileResource> l = new TreeSet<FileResource>(new FileResourceComparator());<a name="line.94"></a>
-<span class="sourceLineNo">095</span> File[] files = f.listFiles(filter);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> if (files != null) {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> for (File fc : files) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> URL fUrl = new URL(req.getTrimmedRequestURL().append('/').append(fc.getName()).toString());<a name="line.98"></a>
-<span class="sourceLineNo">099</span> l.add(new FileResource(fc, fUrl));<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span> properties.put(HTMLDOC_description, "Contents of " + f.getAbsolutePath());<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return l;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> properties.put(HTMLDOC_description, "File details on " + f.getAbsolutePath());<a name="line.106"></a>
-<span class="sourceLineNo">107</span> return new FileResource(f, new URL(req.getTrimmedRequestURL().toString()));<a name="line.107"></a>
-<span class="sourceLineNo">108</span> }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> /**<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * [VIEW /*] - Retrieve the contents of a log file.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> *<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * @param req The HTTP request.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * @param res The HTTP response.<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * @param path The log file path.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * @param properties The writable properties for setting the descriptions.<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * @param highlight If <code>true</code>, add color highlighting based on severity.<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&amp;start=2014-01-23 11:25:47".<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&amp;end=2014-01-23 11:25:47".<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&amp;thread=pool-33-thread-1".<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&amp;severity=(ERROR,WARN)".<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @throws Exception<a name="line.123"></a>
-<span class="sourceLineNo">124</span> */<a name="line.124"></a>
-<span class="sourceLineNo">125</span> @RestMethod(name="VIEW", path="/*", responses={@Response(200),@Response(404)})<a name="line.125"></a>
-<span class="sourceLineNo">126</span> @SuppressWarnings("nls")<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public void viewFile(RestRequest req, RestResponse res, @PathRemainder String path, @Properties ObjectMap properties, @Query("highlight") boolean highlight, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> File f = getFile(path);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> if (f.isDirectory())<a name="line.130"></a>
-<span class="sourceLineNo">131</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> Date startDate = StringUtils.parseISO8601Date(start), endDate = StringUtils.parseISO8601Date(end);<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> if (! highlight) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> Object o = getReader(f, startDate, endDate, thread, loggers, severity);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> res.setContentType("text/plain");<a name="line.137"></a>
-<span class="sourceLineNo">138</span> if (o instanceof Reader)<a name="line.138"></a>
-<span class="sourceLineNo">139</span> res.setOutput(o);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> else {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> LogParser p = (LogParser)o;<a name="line.141"></a>
-<span class="sourceLineNo">142</span> Writer w = res.getNegotiatedWriter();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> try {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> p.writeTo(w);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> } finally {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> w.flush();<a name="line.146"></a>
-<span class="sourceLineNo">147</span> w.close();<a name="line.147"></a>
-<span class="sourceLineNo">148</span> }<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> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> res.setContentType("text/html");<a name="line.153"></a>
-<span class="sourceLineNo">154</span> PrintWriter w = res.getNegotiatedWriter();<a name="line.154"></a>
-<span class="sourceLineNo">155</span> try {<a name="line.155"></a>
-<span class="sourceLineNo">156</span> w.println("<html><body style='font-family:monospace;font-size:8pt;white-space:pre;'>");<a name="line.156"></a>
-<span class="sourceLineNo">157</span> LogParser lp = getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> try {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> if (! lp.hasNext())<a name="line.159"></a>
-<span class="sourceLineNo">160</span> w.append("<span style='color:gray'>[EMPTY]</span>");<a name="line.160"></a>
-<span class="sourceLineNo">161</span> else for (LogParser.Entry le : lp) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> char s = le.severity.charAt(0);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> String color = "black";<a name="line.163"></a>
-<span class="sourceLineNo">164</span> //SEVERE|WARNING|INFO|CONFIG|FINE|FINER|FINEST<a name="line.164"></a>
-<span class="sourceLineNo">165</span> if (s == 'I')<a name="line.165"></a>
-<span class="sourceLineNo">166</span> color = "#006400";<a name="line.166"></a>
-<span class="sourceLineNo">167</span> else if (s == 'W')<a name="line.167"></a>
-<span class="sourceLineNo">168</span> color = "#CC8400";<a name="line.168"></a>
-<span class="sourceLineNo">169</span> else if (s == 'E' || s == 'S')<a name="line.169"></a>
-<span class="sourceLineNo">170</span> color = "#DD0000";<a name="line.170"></a>
-<span class="sourceLineNo">171</span> else if (s == 'D' || s == 'F' || s == 'T')<a name="line.171"></a>
-<span class="sourceLineNo">172</span> color = "#000064";<a name="line.172"></a>
-<span class="sourceLineNo">173</span> w.append("<span style='color:").append(color).append("'>");<a name="line.173"></a>
-<span class="sourceLineNo">174</span> le.appendHtml(w).append("</span>");<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> w.append("</body></html>");<a name="line.176"></a>
-<span class="sourceLineNo">177</span> } finally {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> lp.close();<a name="line.178"></a>
-<span class="sourceLineNo">179</span> }<a name="line.179"></a>
-<span class="sourceLineNo">180</span> } finally {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> w.close();<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> /**<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * [VIEW /*] - Retrieve the contents of a log file as parsed entries.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> *<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * @param req The HTTP request.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * @param path The log file path.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&amp;start=2014-01-23 11:25:47".<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&amp;end=2014-01-23 11:25:47".<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&amp;thread=pool-33-thread-1".<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&amp;severity=(ERROR,WARN)".<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * @return The parsed contents of the log file.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * @throws Exception<a name="line.196"></a>
-<span class="sourceLineNo">197</span> */<a name="line.197"></a>
-<span class="sourceLineNo">198</span> @RestMethod(name="PARSE", path="/*", converters=Queryable.class, responses={@Response(200),@Response(404)})<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public LogParser viewParsedEntries(RestRequest req, @PathRemainder String path, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> File f = getFile(path);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> Date startDate = StringUtils.parseISO8601Date(start), endDate = StringUtils.parseISO8601Date(end);<a name="line.202"></a>
+<span class="sourceLineNo">093</span> File f = getFile(path);<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span> if (f.isDirectory()) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> Set<FileResource> l = new TreeSet<FileResource>(new FileResourceComparator());<a name="line.96"></a>
+<span class="sourceLineNo">097</span> File[] files = f.listFiles(filter);<a name="line.97"></a>
+<span class="sourceLineNo">098</span> if (files != null) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> for (File fc : files) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> URL fUrl = new URL(req.getTrimmedRequestURL().append('/').append(fc.getName()).toString());<a name="line.100"></a>
+<span class="sourceLineNo">101</span> l.add(new FileResource(fc, fUrl));<a name="line.101"></a>
+<span class="sourceLineNo">102</span> }<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span> res.setPageText(new StringMessage("Contents of {0}", f.getAbsolutePath()));<a name="line.104"></a>
+<span class="sourceLineNo">105</span> properties.put(HTMLDOC_text, "Contents of " + f.getAbsolutePath());<a name="line.105"></a>
+<span class="sourceLineNo">106</span> return l;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> res.setPageText(new StringMessage("File details on {0}", f.getAbsolutePath()));<a name="line.109"></a>
+<span class="sourceLineNo">110</span> return new FileResource(f, new URL(req.getTrimmedRequestURL().toString()));<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> /**<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * [VIEW /*] - Retrieve the contents of a log file.<a name="line.114"></a>
+<span class="sourceLineNo">115</span> *<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * @param req The HTTP request.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * @param res The HTTP response.<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * @param path The log file path.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * @param properties The writable properties for setting the descriptions.<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * @param highlight If <code>true</code>, add color highlighting based on severity.<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&amp;start=2014-01-23 11:25:47".<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&amp;end=2014-01-23 11:25:47".<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&amp;thread=pool-33-thread-1".<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&amp;severity=(ERROR,WARN)".<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * @throws Exception<a name="line.126"></a>
+<span class="sourceLineNo">127</span> */<a name="line.127"></a>
+<span class="sourceLineNo">128</span> @RestMethod(name="VIEW", path="/*", responses={@Response(200),@Response(404)})<a name="line.128"></a>
+<span class="sourceLineNo">129</span> @SuppressWarnings("nls")<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public void viewFile(RestRequest req, RestResponse res, @PathRemainder String path, @Properties ObjectMap properties, @Query("highlight") boolean highlight, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> File f = getFile(path);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (f.isDirectory())<a name="line.133"></a>
+<span class="sourceLineNo">134</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> Date startDate = StringUtils.parseISO8601Date(start), endDate = StringUtils.parseISO8601Date(end);<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> if (! highlight) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> Object o = getReader(f, startDate, endDate, thread, loggers, severity);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> res.setContentType("text/plain");<a name="line.140"></a>
+<span class="sourceLineNo">141</span> if (o instanceof Reader)<a name="line.141"></a>
+<span class="sourceLineNo">142</span> res.setOutput(o);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> else {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> LogParser p = (LogParser)o;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> Writer w = res.getNegotiatedWriter();<a name="line.145"></a>
+<span class="sourceLineNo">146</span> try {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> p.writeTo(w);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> } finally {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> w.flush();<a name="line.149"></a>
+<span class="sourceLineNo">150</span> w.close();<a name="line.150"></a>
+<span class="sourceLineNo">151</span> }<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span> return;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> res.setContentType("text/html");<a name="line.156"></a>
+<span class="sourceLineNo">157</span> PrintWriter w = res.getNegotiatedWriter();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> try {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> w.println("<html><body style='font-family:monospace;font-size:8pt;white-space:pre;'>");<a name="line.159"></a>
+<span class="sourceLineNo">160</span> LogParser lp = getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> try {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> if (! lp.hasNext())<a name="line.162"></a>
+<span class="sourceLineNo">163</span> w.append("<span style='color:gray'>[EMPTY]</span>");<a name="line.163"></a>
+<span class="sourceLineNo">164</span> else for (LogParser.Entry le : lp) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> char s = le.severity.charAt(0);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> String color = "black";<a name="line.166"></a>
+<span class="sourceLineNo">167</span> //SEVERE|WARNING|INFO|CONFIG|FINE|FINER|FINEST<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (s == 'I')<a name="line.168"></a>
+<span class="sourceLineNo">169</span> color = "#006400";<a name="line.169"></a>
+<span class="sourceLineNo">170</span> else if (s == 'W')<a name="line.170"></a>
+<span class="sourceLineNo">171</span> color = "#CC8400";<a name="line.171"></a>
+<span class="sourceLineNo">172</span> else if (s == 'E' || s == 'S')<a name="line.172"></a>
+<span class="sourceLineNo">173</span> color = "#DD0000";<a name="line.173"></a>
+<span class="sourceLineNo">174</span> else if (s == 'D' || s == 'F' || s == 'T')<a name="line.174"></a>
+<span class="sourceLineNo">175</span> color = "#000064";<a name="line.175"></a>
+<span class="sourceLineNo">176</span> w.append("<span style='color:").append(color).append("'>");<a name="line.176"></a>
+<span class="sourceLineNo">177</span> le.appendHtml(w).append("</span>");<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> w.append("</body></html>");<a name="line.179"></a>
+<span class="sourceLineNo">180</span> } finally {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> lp.close();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> } finally {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> w.close();<a name="line.184"></a>
+<span class="sourceLineNo">185</span> }<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> /**<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * [VIEW /*] - Retrieve the contents of a log file as parsed entries.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> *<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * @param req The HTTP request.<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * @param path The log file path.<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&amp;start=2014-01-23 11:25:47".<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&amp;end=2014-01-23 11:25:47".<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&amp;thread=pool-33-thread-1".<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&amp;severity=(ERROR,WARN)".<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * @return The parsed contents of the log file.<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * @throws Exception<a name="line.199"></a>
+<span class="sourceLineNo">200</span> */<a name="line.200"></a>
+<span class="sourceLineNo">201</span> @RestMethod(name="PARSE", path="/*", converters=Queryable.class, responses={@Response(200),@Response(404)})<a name="line.201"></a>
+<span class="sourceLineNo">202</span> public LogParser viewParsedEntries(RestRequest req, @PathRemainder String path, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> if (f.isDirectory())<a name="line.204"></a>
-<span class="sourceLineNo">205</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.205"></a>
+<span class="sourceLineNo">204</span> File f = getFile(path);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> Date startDate = StringUtils.parseISO8601Date(start), endDate = StringUtils.parseISO8601Date(end);<a name="line.205"></a>
<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> return getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">207</span> if (f.isDirectory())<a name="line.207"></a>
+<span class="sourceLineNo">208</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<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> * [DOWNLOAD /*] - Download file.<a name="line.211"></a>
-<span class="sourceLineNo">212</span> *<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * @param res The HTTP response.<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * @param path The log file path.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * @return The contents of the log file.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * @throws Exception<a name="line.216"></a>
-<span class="sourceLineNo">217</span> */<a name="line.217"></a>
-<span class="sourceLineNo">218</span> @RestMethod(name="DOWNLOAD", path="/*", responses={@Response(200),@Response(404)})<a name="line.218"></a>
-<span class="sourceLineNo">219</span> public Object downloadFile(RestResponse res, @PathRemainder String path) throws Exception {<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> File f = getFile(path);<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> if (f.isDirectory())<a name="line.223"></a>
-<span class="sourceLineNo">224</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "Download not available on directories");<a name="line.224"></a>
+<span class="sourceLineNo">210</span> return getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span> /**<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * [DOWNLOAD /*] - Download file.<a name="line.214"></a>
+<span class="sourceLineNo">215</span> *<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * @param res The HTTP response.<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * @param path The log file path.<a name="line.217"></a>
+<span class="sourceLineNo">218</span> * @return The contents of the log file.<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * @throws Exception<a name="line.219"></a>
+<span class="sourceLineNo">220</span> */<a name="line.220"></a>
+<span class="sourceLineNo">221</span> @RestMethod(name="DOWNLOAD", path="/*", responses={@Response(200),@Response(404)})<a name="line.221"></a>
+<span class="sourceLineNo">222</span> public Object downloadFile(RestResponse res, @PathRemainder String path) throws Exception {<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> File f = getFile(path);<a name="line.224"></a>
<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> res.setContentType("application/octet-stream"); //$NON-NLS-1$<a name="line.226"></a>
-<span class="sourceLineNo">227</span> res.setContentLength((int)f.length());<a name="line.227"></a>
-<span class="sourceLineNo">228</span> return new FileInputStream(f);<a name="line.228"></a>
-<span class="sourceLineNo">229</span> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> /**<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * [DELETE /*] - Delete a file.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> *<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * @param path The log file path.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * @return A redirect object to the root.<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * @throws Exception<a name="line.236"></a>
-<span class="sourceLineNo">237</span> */<a name="line.237"></a>
-<span class="sourceLineNo">238</span> @RestMethod(name="DELETE", path="/*", responses={@Response(200),@Response(404)})<a name="line.238"></a>
-<span class="sourceLineNo">239</span> public Object deleteFile(@PathRemainder String path) throws Exception {<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> File f = getFile(path);<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span> if (f.isDirectory())<a name="line.243"></a>
-<span class="sourceLineNo">244</span> throw new RestException(SC_BAD_REQUEST, "Delete not available on directories.");<a name="line.244"></a>
+<span class="sourceLineNo">226</span> if (f.isDirectory())<a name="line.226"></a>
+<span class="sourceLineNo">227</span> throw new RestException(SC_METHOD_NOT_ALLOWED, "Download not available on directories");<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> res.setContentType("application/octet-stream"); //$NON-NLS-1$<a name="line.229"></a>
+<span class="sourceLineNo">230</span> res.setContentLength((int)f.length());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return new FileInputStream(f);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> /**<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * [DELETE /*] - Delete a file.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> *<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * @param path The log file path.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * @return A redirect object to the root.<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * @throws Exception<a name="line.239"></a>
+<span class="sourceLineNo">240</span> */<a name="line.240"></a>
+<span class="sourceLineNo">241</span> @RestMethod(name="DELETE", path="/*", responses={@Response(200),@Response(404)})<a name="line.241"></a>
+<span class="sourceLineNo">242</span> public Object deleteFile(@PathRemainder String path) throws Exception {<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span> File f = getFile(path);<a name="line.244"></a>
<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> if (f.canWrite())<a name="line.246"></a>
-<span class="sourceLineNo">247</span> if (! f.delete())<a name="line.247"></a>
-<span class="sourceLineNo">248</span> throw new RestException(SC_FORBIDDEN, "Could not delete file.");<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> return new Redirect(path + "/.."); //$NON-NLS-1$<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">246</span> if (f.isDirectory())<a name="line.246"></a>
+<span class="sourceLineNo">247</span> throw new RestException(SC_BAD_REQUEST, "Delete not available on directories.");<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> if (f.canWrite())<a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (! f.delete())<a name="line.250"></a>
+<span class="sourceLineNo">251</span> throw new RestException(SC_FORBIDDEN, "Could not delete file.");<a name="line.251"></a>
<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> private static BufferedReader getReader(File f) throws IOException {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> return new BufferedReader(new InputStreamReader(new FileInputStream(f), Charset.defaultCharset()));<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> private File getFile(String path) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> if (path != null && path.indexOf("..") != -1)<a name="line.258"></a>
-<span class="sourceLineNo">259</span> throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.259"></a>
-<span class="sourceLineNo">260</span> File f = (path == null ? logDir : new File(logDir.getAbsolutePath() + '/' + path));<a name="line.260"></a>
-<span class="sourceLineNo">261</span> if (filter.accept(f))<a name="line.261"></a>
-<span class="sourceLineNo">262</span> return f;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> /**<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * File bean.<a name="line.267"></a>
-<span class="sourceLineNo">268</span> */<a name="line.268"></a>
-<span class="sourceLineNo">269</span> @SuppressWarnings("javadoc")<a name="line.269"></a>
-<span class="sourceLineNo">270</span> public static class FileResource {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> private File f;<a name="line.271"></a>
-<span class="sourceLineNo">272</span> public String type;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> public Object name;<a name="line.273"></a>
-<span class="sourceLineNo">274</span> public Long size;<a name="line.274"></a>
-<span class="sourceLineNo">275</span> @BeanProperty(swap=DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public URL view, highlighted, parsed, download, delete;<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span> public FileResource(File f, URL url) throws IOException {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> this.f = f;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> this.type = (f.isDirectory() ? "dir" : "file");<a name="line.280"></a>
-<span class="sourceLineNo">281</span> this.name = f.isDirectory() ? new Link(f.getName(), url.toString()) : f.getName();<a name="line.281"></a>
-<span class="sourceLineNo">282</span> this.size = f.isDirectory() ? null : f.length();<a name="line.282"></a>
-<span class="sourceLineNo">283</span> this.lastModified = new Date(f.lastModified());<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (f.canRead() && ! f.isDirectory()) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> this.view = new URL(url + "?method=VIEW");<a name="line.285"></a>
-<span class="sourceLineNo">286</span> this.highlighted = new URL(url + "?method=VIEW&highlight=true");<a name="line.286"></a>
-<span class="sourceLineNo">287</span> this.parsed = new URL(url + "?method=PARSE");<a name="line.287"></a>
-<span class="sourceLineNo">288</span> this.download = new URL(url + "?method=DOWNLOAD");<a name="line.288"></a>
-<span class="sourceLineNo">289</span> this.delete = new URL(url + "?method=DELETE");<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> private static class FileResourceComparator implements Comparator<FileResource>, Serializable {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> private static final long serialVersionUID = 1L;<a name="line.295"></a>
-<span class="sourceLineNo">296</span> @Override /* Comparator */<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public int compare(FileResource o1, FileResource o2) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> int c = o1.type.compareTo(o2.type);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return c != 0 ? c : o1.f.getName().compareTo(o2.f.getName());<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span> private Object getReader(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.303"></a>
-<span class="sourceLineNo">304</span> if (start == null && end == null && thread == null && loggers == null)<a name="line.304"></a>
-<span class="sourceLineNo">305</span> return getReader(f);<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return getLogParser(f, start, end, thread, loggers, severity);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> }<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span> private LogParser getLogParser(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> return new LogParser(leFormatter, f, start, end, thread, loggers, severity);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>}<a name="line.312"></a>
+<span class="sourceLineNo">253</span> return new Redirect(path + "/.."); //$NON-NLS-1$<a name="line.253"></a>
+<span class="sourceLineNo">254</span> }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span> private static BufferedReader getReader(File f) throws IOException {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> return new BufferedReader(new InputStreamReader(new FileInputStream(f), Charset.defaultCharset()));<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span> private File getFile(String path) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if (path != null && path.indexOf("..") != -1)<a name="line.261"></a>
+<span class="sourceLineNo">262</span> throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.262"></a>
+<span class="sourceLineNo">263</span> File f = (path == null ? logDir : new File(logDir.getAbsolutePath() + '/' + path));<a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (filter.accept(f))<a name="line.264"></a>
+<span class="sourceLineNo">265</span> return f;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> /**<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * File bean.<a name="line.270"></a>
+<span class="sourceLineNo">271</span> */<a name="line.271"></a>
+<span class="sourceLineNo">272</span> @SuppressWarnings("javadoc")<a name="line.272"></a>
+<span class="sourceLineNo">273</span> public static class FileResource {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> private File f;<a name="line.274"></a>
+<span class="sourceLineNo">275</span> public String type;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public Object name;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> public Long size;<a name="line.277"></a>
+<span class="sourceLineNo">278</span> @BeanProperty(swap=DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.278"></a>
+<span class="sourceLineNo">279</span> public URL view, highlighted, parsed, download, delete;<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> public FileResource(File f, URL url) throws IOException {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> this.f = f;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> this.type = (f.isDirectory() ? "dir" : "file");<a name="line.283"></a>
+<span class="sourceLineNo">284</span> this.name = f.isDirectory() ? new Link(f.getName(), url.toString()) : f.getName();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> this.size = f.isDirectory() ? null : f.length();<a name="line.285"></a>
+<span class="sourceLineNo">286</span> this.lastModified = new Date(f.lastModified());<a name="line.286"></a>
+<span class="sourceLineNo">287</span> if (f.canRead() && ! f.isDirectory()) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> this.view = new URL(url + "?method=VIEW");<a name="line.288"></a>
+<span class="sourceLineNo">289</span> this.highlighted = new URL(url + "?method=VIEW&highlight=true");<a name="line.289"></a>
+<span class="sourceLineNo">290</span> this.parsed = new URL(url + "?method=PARSE");<a name="line.290"></a>
+<span class="sourceLineNo">291</span> this.download = new URL(url + "?method=DOWNLOAD");<a name="line.291"></a>
+<span class="sourceLineNo">292</span> this.delete = new URL(url + "?method=DELETE");<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span> }<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span> private static class FileResourceComparator implements Comparator<FileResource>, Serializable {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> private static final long serialVersionUID = 1L;<a name="line.298"></a>
+<span class="sourceLineNo">299</span> @Override /* Comparator */<a name="line.299"></a>
+<span class="sourceLineNo">300</span> public int compare(FileResource o1, FileResource o2) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> int c = o1.type.compareTo(o2.type);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> return c != 0 ? c : o1.f.getName().compareTo(o2.f.getName());<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> private Object getReader(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> if (start == null && end == null && thread == null && loggers == null)<a name="line.307"></a>
+<span class="sourceLineNo">308</span> return getReader(f);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> return getLogParser(f, start, end, thread, loggers, severity);<a name="line.309"></a>
+<span class="sourceLineNo">310</span> }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span> private LogParser getLogParser(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> return new LogParser(leFormatter, f, start, end, thread, loggers, severity);<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span>}<a name="line.315"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParser.html b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParser.html
index 597de10..9afa873 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParser.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParser.html
@@ -168,7 +168,7 @@
<span class="sourceLineNo">160</span> } else {<a name="line.160"></a>
<span class="sourceLineNo">161</span> throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, sType);<a name="line.161"></a>
<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span> } else if (sType.isArray()) {<a name="line.163"></a>
+<span class="sourceLineNo">163</span> } else if (sType.isArray() || sType.isArgs()) {<a name="line.163"></a>
<span class="sourceLineNo">164</span> if (dt == MAP) {<a name="line.164"></a>
<span class="sourceLineNo">165</span> ObjectMap m = new ObjectMap(session);<a name="line.165"></a>
<span class="sourceLineNo">166</span> for (int i = 0; i < length; i++)<a name="line.166"></a>
@@ -177,7 +177,7 @@
<span class="sourceLineNo">169</span> } else if (dt == ARRAY) {<a name="line.169"></a>
<span class="sourceLineNo">170</span> Collection l = (sType.isCollection() && sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance() : new ObjectList(session));<a name="line.170"></a>
<span class="sourceLineNo">171</span> for (int i = 0; i < length; i++)<a name="line.171"></a>
-<span class="sourceLineNo">172</span> l.add(parseAnything(session, sType.getElementType(), is, l, pMeta));<a name="line.172"></a>
+<span class="sourceLineNo">172</span> l.add(parseAnything(session, sType.isArgs() ? sType.getArg(i) : sType.getElementType(), is, l, pMeta));<a name="line.172"></a>
<span class="sourceLineNo">173</span> o = session.toArray(sType, l);<a name="line.173"></a>
<span class="sourceLineNo">174</span> } else {<a name="line.174"></a>
<span class="sourceLineNo">175</span> throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, sType);<a name="line.175"></a>
@@ -204,49 +204,24 @@
<span class="sourceLineNo">196</span> return (T)o;<a name="line.196"></a>
<span class="sourceLineNo">197</span> }<a name="line.197"></a>
<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span> private Object[] parseArgs(MsgPackParserSession session, MsgPackInputStream is, ClassMeta<?>[] argTypes) throws Exception {<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> Object[] o = new Object[argTypes.length];<a name="line.201"></a>
-<span class="sourceLineNo">202</span> DataType dt = is.readDataType();<a name="line.202"></a>
-<span class="sourceLineNo">203</span> int length = (int)is.readLength();<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span> if (dt != ARRAY)<a name="line.205"></a>
-<span class="sourceLineNo">206</span> throw new ParseException("Expected ARRAY but was {0}", dt);<a name="line.206"></a>
-<span class="sourceLineNo">207</span> if (length != argTypes.length)<a name="line.207"></a>
-<span class="sourceLineNo">208</span> throw new ParseException("Expected array length {0} but was {1}", argTypes.length, length);<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span> for (int i = 0; i < length; i++)<a name="line.210"></a>
-<span class="sourceLineNo">211</span> o[i] = parseAnything(session, argTypes[i], is, null, null);<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> return o;<a name="line.213"></a>
-<span class="sourceLineNo">214</span> }<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> <a name="line.216"></a>
-<span class="sourceLineNo">217</span> //--------------------------------------------------------------------------------<a name="line.217"></a>
-<span class="sourceLineNo">218</span> // Entry point methods<a name="line.218"></a>
-<span class="sourceLineNo">219</span> //--------------------------------------------------------------------------------<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> @Override /* Parser */<a name="line.221"></a>
-<span class="sourceLineNo">222</span> public MsgPackParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> return new MsgPackParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> @Override /* Parser */<a name="line.226"></a>
-<span class="sourceLineNo">227</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> MsgPackParserSession s = (MsgPackParserSession)session;<a name="line.228"></a>
-<span class="sourceLineNo">229</span> MsgPackInputStream is = s.getInputStream();<a name="line.229"></a>
-<span class="sourceLineNo">230</span> T o = parseAnything(s, type, is, s.getOuter(), null);<a name="line.230"></a>
-<span class="sourceLineNo">231</span> return o;<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> @Override /* ReaderParser */<a name="line.234"></a>
-<span class="sourceLineNo">235</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> MsgPackParserSession s = (MsgPackParserSession)session;<a name="line.236"></a>
-<span class="sourceLineNo">237</span> MsgPackInputStream is = s.getInputStream();<a name="line.237"></a>
-<span class="sourceLineNo">238</span> Object[] a = parseArgs(s, is, argTypes);<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return a;<a name="line.239"></a>
-<span class="sourceLineNo">240</span> }<a name="line.240"></a>
-<span class="sourceLineNo">241</span>}<a name="line.241"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span> //--------------------------------------------------------------------------------<a name="line.200"></a>
+<span class="sourceLineNo">201</span> // Entry point methods<a name="line.201"></a>
+<span class="sourceLineNo">202</span> //--------------------------------------------------------------------------------<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span> @Override /* Parser */<a name="line.204"></a>
+<span class="sourceLineNo">205</span> public MsgPackParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> return new MsgPackParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> @Override /* Parser */<a name="line.209"></a>
+<span class="sourceLineNo">210</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> MsgPackParserSession s = (MsgPackParserSession)session;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> MsgPackInputStream is = s.getInputStream();<a name="line.212"></a>
+<span class="sourceLineNo">213</span> T o = parseAnything(s, type, is, s.getOuter(), null);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> return o;<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span>}<a name="line.216"></a>
[07/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.NoOp.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.NoOp.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.NoOp.html
index a9cf015..6d151c9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.NoOp.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.NoOp.html
@@ -202,7 +202,7 @@
<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> private static boolean isNoTrace(HttpServletRequest req) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> return "true".equals(req.getHeader("No-Trace")) || req.getQueryString().contains("noTrace=true");<a name="line.197"></a>
+<span class="sourceLineNo">197</span> return "true".equals(req.getHeader("No-Trace")) || (req.getQueryString() != null && req.getQueryString().contains("noTrace=true"));<a name="line.197"></a>
<span class="sourceLineNo">198</span> }<a name="line.198"></a>
<span class="sourceLineNo">199</span><a name="line.199"></a>
<span class="sourceLineNo">200</span> private static boolean isDebug(HttpServletRequest req) {<a name="line.200"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.Normal.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.Normal.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.Normal.html
index a9cf015..6d151c9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.Normal.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.Normal.html
@@ -202,7 +202,7 @@
<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> private static boolean isNoTrace(HttpServletRequest req) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> return "true".equals(req.getHeader("No-Trace")) || req.getQueryString().contains("noTrace=true");<a name="line.197"></a>
+<span class="sourceLineNo">197</span> return "true".equals(req.getHeader("No-Trace")) || (req.getQueryString() != null && req.getQueryString().contains("noTrace=true"));<a name="line.197"></a>
<span class="sourceLineNo">198</span> }<a name="line.198"></a>
<span class="sourceLineNo">199</span><a name="line.199"></a>
<span class="sourceLineNo">200</span> private static boolean isDebug(HttpServletRequest req) {<a name="line.200"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.html
index a9cf015..6d151c9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestLogger.html
@@ -202,7 +202,7 @@
<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> private static boolean isNoTrace(HttpServletRequest req) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> return "true".equals(req.getHeader("No-Trace")) || req.getQueryString().contains("noTrace=true");<a name="line.197"></a>
+<span class="sourceLineNo">197</span> return "true".equals(req.getHeader("No-Trace")) || (req.getQueryString() != null && req.getQueryString().contains("noTrace=true"));<a name="line.197"></a>
<span class="sourceLineNo">198</span> }<a name="line.198"></a>
<span class="sourceLineNo">199</span><a name="line.199"></a>
<span class="sourceLineNo">200</span> private static boolean isDebug(HttpServletRequest req) {<a name="line.200"></a>
[36/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/rest/RestResponse.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestResponse.html b/content/site/apidocs/org/apache/juneau/rest/RestResponse.html
index 65be367..988cc62 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestResponse.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestResponse.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.50">RestResponse</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.53">RestResponse</a>
extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServletResponseWrapper.html?is-external=true" title="class or interface in javax.servlet.http">HttpServletResponseWrapper</a></pre>
<div class="block">Represents an HTTP response for a REST resource.
<p>
@@ -136,7 +136,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<p class='bcode'>
<ja>@RestMethod</ja>(name=<js>"GET"</js>)
<jk>public void</jk> doGet(RestRequest req, RestResponse res) {
- res.setProperty(HtmlSerializerContext.<jsf>HTMLDOC_title</jsf>, <js>"My title"</js>)
+ res.setPageTitle(<js>"My title"</js>)
.setOutput(<js>"Simple string response"</js>);
}
</p>
@@ -293,6 +293,24 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
</tr>
<tr id="i19" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestResponse.html#setPageLinks-java.lang.Object-">setPageLinks</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> links)</code>
+<div class="block">Sets the page text for HTML views.</div>
+</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestResponse.html#setPageText-java.lang.Object-">setPageText</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> text)</code>
+<div class="block">Sets the page text for HTML views.</div>
+</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestResponse.html#setPageTitle-java.lang.Object-">setPageTitle</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> title)</code>
+<div class="block">Sets the page title for HTML views.</div>
+</td>
+</tr>
+<tr id="i22" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestResponse.html#setProperty-java.lang.String-java.lang.Object-">setProperty</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Add a serializer property to send to the serializers to override a default value.</div>
@@ -347,7 +365,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getSerializerGroup</h4>
-<pre>public <a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.120">getSerializerGroup</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.123">getSerializerGroup</a>()</pre>
<div class="block">Gets the serializer group for the response.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -361,7 +379,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getSupportedMediaTypes</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.129">getSupportedMediaTypes</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.132">getSupportedMediaTypes</a>()</pre>
<div class="block">Returns the media types that are valid for <code>Accept</code> headers on the request.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -375,7 +393,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getSupportedEncodings</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="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/RestResponse.html#line.139">getSupportedEncodings</a>()
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="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/RestResponse.html#line.142">getSupportedEncodings</a>()
throws <a href="../../../../org/apache/juneau/rest/RestServletException.html" title="class in org.apache.juneau.rest">RestServletException</a></pre>
<div class="block">Returns the codings that are valid for <code>Accept-Encoding</code> and <code>Content-Encoding</code> headers on the request.</div>
<dl>
@@ -392,7 +410,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setOutput</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.160">setOutput</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> output)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.163">setOutput</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> output)</pre>
<div class="block">Sets the HTTP output on the response.
<p>
Calling this method is functionally equivalent to returning the object in the REST Java method.
@@ -419,7 +437,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setProperty</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.181">setProperty</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key,
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.184">setProperty</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Add a serializer property to send to the serializers to override a default value.
<p>
@@ -445,7 +463,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getProperties</h4>
-<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.191">getProperties</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.194">getProperties</a>()</pre>
<div class="block">Returns the properties set via <a href="../../../../org/apache/juneau/rest/RestResponse.html#setProperty-java.lang.String-java.lang.Object-"><code>setProperty(String, Object)</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -459,7 +477,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setOutputs</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.210">setOutputs</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... output)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.213">setOutputs</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... output)</pre>
<div class="block">Shortcut method that allows you to use varargs to simplify setting array output.
<h5 class='section'>Example:</h5>
@@ -484,7 +502,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getOutput</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.220">getOutput</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.223">getOutput</a>()</pre>
<div class="block">Returns the output that was set by calling <a href="../../../../org/apache/juneau/rest/RestResponse.html#setOutput-java.lang.Object-"><code>setOutput(Object)</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -498,7 +516,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>hasOutput</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.229">hasOutput</a>()</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.232">hasOutput</a>()</pre>
<div class="block">Returns <jk>true</jk> if this response has any output associated with it.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -512,7 +530,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>sendPlainText</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.240">sendPlainText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.243">sendPlainText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Sets the output to a plain-text message regardless of the content type.</div>
<dl>
@@ -531,7 +549,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getNegotiatedOutputStream</h4>
-<pre>public <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletOutputStream.html?is-external=true" title="class or interface in javax.servlet">ServletOutputStream</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.254">getNegotiatedOutputStream</a>()
+<pre>public <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletOutputStream.html?is-external=true" title="class or interface in javax.servlet">ServletOutputStream</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.257">getNegotiatedOutputStream</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Equivalent to <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletResponse.html?is-external=true#getOutputStream--" title="class or interface in javax.servlet"><code>ServletResponse.getOutputStream()</code></a>, except
wraps the output stream if an <a href="../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders"><code>Encoder</code></a> was found that matched
@@ -550,7 +568,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getOutputStream</h4>
-<pre>public <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletOutputStream.html?is-external=true" title="class or interface in javax.servlet">ServletOutputStream</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.305">getOutputStream</a>()
+<pre>public <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletOutputStream.html?is-external=true" title="class or interface in javax.servlet">ServletOutputStream</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.308">getOutputStream</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -568,7 +586,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getOutputStreamCalled</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.316">getOutputStreamCalled</a>()</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.319">getOutputStreamCalled</a>()</pre>
<div class="block">Returns <jk>true</jk> if <a href="../../../../org/apache/juneau/rest/RestResponse.html#getOutputStream--"><code>getOutputStream()</code></a> has been called.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -582,7 +600,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getWriter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.326">getWriter</a>()
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.329">getWriter</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Returns the writer to the response body.
This methods bypasses any specified encoders and returns a regular unbuffered writer.
@@ -603,7 +621,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getDirectWriter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.339">getDirectWriter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> contentType)
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.342">getDirectWriter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> contentType)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Convenience method meant to be used when rendering directly to a browser with no buffering.
Sets the header <js>"x-content-type-options=nosniff"</js> so that output is rendered
@@ -624,7 +642,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getNegotiatedWriter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.354">getNegotiatedWriter</a>()
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.357">getNegotiatedWriter</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Equivalent to <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletResponse.html?is-external=true#getWriter--" title="class or interface in javax.servlet"><code>ServletResponse.getWriter()</code></a>, except
wraps the output stream if an <a href="../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders"><code>Encoder</code></a> was found that matched
@@ -644,7 +662,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getMediaType</h4>
-<pre>public <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.379">getMediaType</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.382">getMediaType</a>()</pre>
<div class="block">Returns the <code>Content-Type</code> header stripped of the charset attribute if present.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -658,7 +676,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>sendRedirect</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.391">sendRedirect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.394">sendRedirect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Redirects to the specified URI.
<p>
@@ -681,7 +699,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getUrlEncodingSerializer</h4>
-<pre>public <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.403">getUrlEncodingSerializer</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.406">getUrlEncodingSerializer</a>()</pre>
<div class="block">Returns the URL-encoding serializer associated with this response.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -692,10 +710,10 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<a name="setHeader-java.lang.String-java.lang.String-">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>setHeader</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.408">setHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.411">setHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> value)</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -705,6 +723,82 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
</dl>
</li>
</ul>
+<a name="setPageTitle-java.lang.Object-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPageTitle</h4>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.436">setPageTitle</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> title)</pre>
+<div class="block">Sets the page title for HTML views.
+ <p>
+ This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageTitle--"><code>@RestResource#pageTitle()</code></a>/
+ <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#pageTitle--"><code>@RestMethod#pageTitle()</code></a> annotations.
+ <p>
+ This is a shortcut for calling <code>setProperty(<jsf>HTMLDOC_title</jsf>, title);</code>
+ <p class='info'>
+ <b>Tip:</b> Use <a href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils"><code>StringMessage</code></a> to generate a page title with delayed serialization so as not to
+ waste string concatenation cycles on non-HTML views.
+ </p></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>title</code> - The localized page title to render on the page.
+ Object will be converted to a string using <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang"><code>Object.toString()</code></a>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
+<a name="setPageText-java.lang.Object-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPageText</h4>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.455">setPageText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> text)</pre>
+<div class="block">Sets the page text for HTML views.
+ <p>
+ This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageText--"><code>@RestResource#pageText()</code></a>/
+ <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#pageText--"><code>@RestMethod#pageText()</code></a> annotations.
+ <p>
+ This is a shortcut for calling <code>setProperty(<jsf>HTMLDOC_text</jsf>, text);</code>
+ <p class='info'>
+ <b>Tip:</b> Use <a href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils"><code>StringMessage</code></a> to generate page text with delayed serialization so as not to
+ waste string concatenation cycles on non-HTML views.
+ </p></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>text</code> - The localized page text to render on the page.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
+<a name="setPageLinks-java.lang.Object-">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setPageLinks</h4>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.474">setPageLinks</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> links)</pre>
+<div class="block">Sets the page text for HTML views.
+ <p>
+ This is the programmatic equivalent to the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#pageLinks--"><code>@RestResource#pageLinks()</code></a>/
+ <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#pageLinks--"><code>@RestMethod#pageLinks()</code></a> annotations.
+ <p>
+ This is a shortcut for calling <code>setProperty(<jsf>HTMLDOC_links</jsf>, links);</code>
+ <p class='info'>
+ <b>Tip:</b> Use <a href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils"><code>StringMessage</code></a> to generate page links with delayed serialization so as not to
+ waste string concatenation cycles on non-HTML views.
+ </p></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>links</code> - The localized page links render on the page.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/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 d5a99dd..2af0748 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html
@@ -131,8 +131,13 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#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/jso/JsoSerializer.html" title="class in org.apache.juneau.jso">JsoSerializer.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">PlainTextParser.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/Property.html" title="annotation in org.apache.juneau.rest.annotation">@Property</a>(<a href="../../../../org/apache/juneau/rest/annotation/Property.html#name--">name</a>="HtmlSerializer.title",<a href="../../../../org/apache/juneau/rest/annotat
ion/Property.html#value--">value</a>="$R{servletTitle}"),<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>="HtmlSerializer.description",<a href="../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="$R{servletDescription}")},<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#stylesheet--">stylesheet</a>="styles/juneau.css",<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#favicon--">favicon</a>="juneau.png",<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#staticFiles--">staticFiles</a>="{htdocs:\'htdocs\'}")
-public abstract class <a href="../../../../src-html/org/apache/juneau/rest/RestServletDefault.html#line.195">RestServletDefault</a>
+<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/jso/JsoSerializer.html" title="class in org.apache.juneau.jso">JsoSerializer.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#stylesheet--">stylesheet</a>="styles/juneau.css",
+ <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#favicon--">favicon</a>="juneau.png",
+ <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#staticFiles--">staticFiles</a>="{htdocs:\'htdocs\'}")
+public abstract class <a href="../../../../src-html/org/apache/juneau/rest/RestServletDefault.html#line.190">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.
<p>
@@ -353,7 +358,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.195">RestServletDefault</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RestServletDefault.html#line.190">RestServletDefault</a>()</pre>
</li>
</ul>
</li>
@@ -370,8 +375,12 @@ extends <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="cla
<ul class="blockListLast">
<li class="blockList">
<h4>getOptions</h4>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="OPTIONS",<a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",<a href="../../../../org/apache/juneau/rest/annotation/RestMethod.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>="HtmlDocSerializer.links.map",<a href="../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="{back:\'$R{servletURI}\'}"),<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>="HtmlSerializer.description",<a href="../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="Resource options")},<a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Resource options")
-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.211">getOptions</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req)</pre>
+<pre><a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="OPTIONS",
+ <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",
+ <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#pageLinks--">pageLinks</a>="{back:\'$R{servletURI}\'}",
+ <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#summary--">summary</a>="Resource options",
+ <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Description of 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.204">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/5aed2f48/content/site/apidocs/org/apache/juneau/rest/RestUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestUtils.html b/content/site/apidocs/org/apache/juneau/rest/RestUtils.html
index 9644e49..ab33041 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestUtils.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestUtils.html
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/RestUtils.html#line.26">RestUtils</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/RestUtils.html#line.27">RestUtils</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">Various reusable utility methods.</div>
</li>
@@ -224,7 +224,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>RestUtils</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RestUtils.html#line.26">RestUtils</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RestUtils.html#line.27">RestUtils</a>()</pre>
</li>
</ul>
</li>
@@ -241,7 +241,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getHttpResponseText</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RestUtils.html#line.34">getHttpResponseText</a>(int rc)</pre>
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RestUtils.html#line.35">getHttpResponseText</a>(int rc)</pre>
<div class="block">Returns readable text for an HTTP response code.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html
index 2f1808f..d772dba 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html
@@ -96,7 +96,7 @@
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#PARAMETER" title="class or interface in java.lang.annotation">PARAMETER</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/Path.html#line.64">Path</a></pre>
+public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/Path.html#line.73">Path</a></pre>
<div class="block">Annotation that can be applied to a parameter of a <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>RestMethod</code></a> annotated method
to identify it as a variable in a URL path pattern converted to a POJO.
@@ -134,6 +134,15 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ja>@Path</ja>(<js>"baz"</js>) UUID baz, <ja>@Path</ja>(<js>"foo"</js>) String foo, <ja>@Path</ja>(<js>"bar"</js>) <jk>int</jk> bar) {
...
}
+ </p>
+ You can also use <code>{#}</code> notation to specify path parameters without specifying names.
+ <p>
+ <p class='bcode'>
+ <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{0}/{1}/{2}/*"</js>)
+ <jk>public void</jk> doGet(RestRequest req, RestResponse res,
+ <ja>@Path</ja> String foo, <ja>@Path</ja> <jk>int</jk> bar, <ja>@Path</ja> UUID baz) {
+ ...
+ }
</p></div>
</li>
</ul>
@@ -180,7 +189,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockListLast">
<li class="blockList">
<h4>value</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/Path.html#line.71">value</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/Path.html#line.80">value</a></pre>
<div class="block">URL variable name.
<p>
Optional if the attributes are specified in the same order as in the URL path pattern.</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/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 dc7c37d..6e9e573 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/RestMethod.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/RestMethod.html
@@ -179,23 +179,35 @@ 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/RestMethod.html#links--">links</a></span></code>
-<div class="block">TODO</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/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="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#name--">name</a></span></code>
<div class="block">REST method name.</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#pageLinks--">pageLinks</a></span></code>
+<div class="block">Overrides the HTML page links defined on the servlet via the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pageLinks--"><code>@RestResource.pageLinks()</code></a> annotation.</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#pageText--">pageText</a></span></code>
+<div class="block">Overrides the HTML page text defined on the servlet via the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pageText--"><code>@RestResource.pageText()</code></a> annotation.</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#pageTitle--">pageTitle</a></span></code>
+<div class="block">Overrides the HTML page title defined on the servlet via the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pageTitle--"><code>@RestResource.pageTitle()</code></a> annotation.</div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">Parameter</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#parameters--">parameters</a></span></code>
@@ -289,7 +301,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>name</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.63">name</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/RestMethod.html#line.64">name</a></pre>
<div class="block">REST method name.
<p>
Typically <js>"GET"</js>, <js>"PUT"</js>, <js>"POST"</js>, <js>"DELETE"</js>, or <js>"OPTIONS"</js>.
@@ -305,6 +317,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<li><js>""</js> - Auto-detect.
<br>The method name is determined based on the Java method name.
<br>For example, if the method is <code>doPost(...)</code>, then the method name is automatically detected as <js>"POST"</js>.
+ <br>Otherwise, defaults to <js>"GET"</js>.
<li><js>"PROXY"</js> - Remote-proxy interface.
<br>This denotes a Java method that returns an object (usually an interface, often annotated with the <a href="../../../../../org/apache/juneau/annotation/Remoteable.html" title="annotation in org.apache.juneau.annotation"><code>@Remoteable</code></a> annotation)
to be used as a remote proxy using <code>RestClient.getRemoteableProxy(Class<T> interfaceClass, String url)</code>.
@@ -329,12 +342,23 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>path</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.72">path</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/RestMethod.html#line.84">path</a></pre>
<div class="block">Optional path pattern for the specified method.
<p>
Appending <js>"/*"</js> to the end of the path pattern will make it match any remainder too.<br>
Not appending <js>"/*"</js> to the end of the pattern will cause a 404 (Not found) error to occur
- if the exact pattern is not found.</div>
+ if the exact pattern is not found.
+ <p>
+ The path can contain variables that get resolved to <a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation"><code>@Path</code></a> parameters:
+ <p class='bcode'>
+ <jc>// Example 1</jc>
+ <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
+
+ <jc>// Example 2</jc>
+ <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{0}/{1}/{2}/*"</js>)
+ </p>
+ <p>
+ Refer to <a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation"><code>@Path</code></a> on how path variables get resolved.</div>
<dl>
<dt>Default:</dt>
<dd>"/*"</dd>
@@ -350,7 +374,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>priority</h4>
-<pre>public abstract int <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.82">priority</a></pre>
+<pre>public abstract int <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.94">priority</a></pre>
<div class="block">URL path pattern priority.
<p>
To force path patterns to be checked before other path patterns, use a higher priority number.
@@ -372,7 +396,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>guards</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/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.93">guards</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/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.105">guards</a></pre>
<div class="block">Method guards.
<p>
Associates one or more <a href="../../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest"><code>RestGuards</code></a> with a method call.
@@ -395,7 +419,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>converters</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/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.106">converters</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/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.118">converters</a></pre>
<div class="block">Method response converters.
<p>
Associates one or more <a href="../../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest"><code>RestConverters</code></a> with a method call.
@@ -420,7 +444,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>matchers</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/RestMatcher.html" title="class in org.apache.juneau.rest">RestMatcher</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.118">matchers</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/RestMatcher.html" title="class in org.apache.juneau.rest">RestMatcher</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.130">matchers</a></pre>
<div class="block">Method matchers.
<p>
Associates one more more <a href="../../../../../org/apache/juneau/rest/RestMatcher.html" title="class in org.apache.juneau.rest"><code>RestMatchers</code></a> with this method.
@@ -444,7 +468,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>serializers</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/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.142">serializers</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/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.154">serializers</a></pre>
<div class="block">Overrides the list of serializers assigned at the method level.
<p>
Use this annotation when the list of serializers assigned to a method differs from the list of serializers assigned at the servlet level.
@@ -480,7 +504,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>serializersInherit</h4>
-<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Inherit.html" title="enum in org.apache.juneau.rest.annotation">Inherit</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.164">serializersInherit</a></pre>
+<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Inherit.html" title="enum in org.apache.juneau.rest.annotation">Inherit</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.176">serializersInherit</a></pre>
<div class="block">Used in conjunction with <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#serializers--"><code>serializers()</code></a> to identify what class-level settings are inherited by the method serializer group.
<p>
Possible values:
@@ -514,7 +538,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>parsers</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/Parser.html" title="class in org.apache.juneau.parser">Parser</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.188">parsers</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/Parser.html" title="class in org.apache.juneau.parser">Parser</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.200">parsers</a></pre>
<div class="block">Overrides the list of parsers assigned at the method level.
<p>
Use this annotation when the list of parsers assigned to a method differs from the list of parsers assigned at the servlet level.
@@ -550,7 +574,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>parsersInherit</h4>
-<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Inherit.html" title="enum in org.apache.juneau.rest.annotation">Inherit</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.209">parsersInherit</a></pre>
+<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Inherit.html" title="enum in org.apache.juneau.rest.annotation">Inherit</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.221">parsersInherit</a></pre>
<div class="block">Used in conjunction with <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#parsers--"><code>parsers()</code></a> to identify what class-level settings are inherited by the method parser group.
<p>
Possible values:
@@ -583,7 +607,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>encoders</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/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.234">encoders</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/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.246">encoders</a></pre>
<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.
<p>
Use this annotation when the list of encoders assigned to a method differs from the list of encoders assigned at the servlet level.
@@ -620,7 +644,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>inheritEncoders</h4>
-<pre>public abstract boolean <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.239">inheritEncoders</a></pre>
+<pre>public abstract boolean <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.251">inheritEncoders</a></pre>
<div class="block">Specifies whether the method should inherit encoders from the servlet.</div>
<dl>
<dt>Default:</dt>
@@ -637,7 +661,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>properties</h4>
-<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation">Property</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.246">properties</a></pre>
+<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation">Property</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.258">properties</a></pre>
<div class="block">Same as <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#properties--"><code>RestResource.properties()</code></a>, except defines property values by default when this method is called.
<p>
This is equivalent to simply calling <code>res.addProperties()</code> in the Java method, but is provided for convenience.</div>
@@ -656,7 +680,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>beanFilters</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><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.251">beanFilters</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><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.263">beanFilters</a></pre>
<div class="block">Appends the specified bean filters to all serializers and parsers used by this method.</div>
<dl>
<dt>Default:</dt>
@@ -673,7 +697,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>pojoSwaps</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><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.256">pojoSwaps</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><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.268">pojoSwaps</a></pre>
<div class="block">Appends the specified POJO swaps to all serializers and parsers used by this method.</div>
<dl>
<dt>Default:</dt>
@@ -690,7 +714,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>defaultRequestHeaders</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.281">defaultRequestHeaders</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/RestMethod.html#line.293">defaultRequestHeaders</a></pre>
<div class="block">Specifies default values for request headers.
<p>
Strings are of the format <js>"Header-Name: header-value"</js>.
@@ -727,7 +751,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>summary</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.300">summary</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/RestMethod.html#line.312">summary</a></pre>
<div class="block">Optional summary for the exposed API.
<p>
This summary is used in the following locations:
@@ -758,7 +782,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>description</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.319">description</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/RestMethod.html#line.331">description</a></pre>
<div class="block">Optional description for the exposed API.
<p>
This description is used in the following locations:
@@ -789,7 +813,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>externalDocs</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.346">externalDocs</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/RestMethod.html#line.358">externalDocs</a></pre>
<div class="block">Optional external documentation information for the exposed API.
<p>
Used to populate the Swagger external documentation field.
@@ -828,7 +852,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>tags</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.368">tags</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/RestMethod.html#line.380">tags</a></pre>
<div class="block">Optional tagging information for the exposed API.
<p>
Used to populate the Swagger tags field.
@@ -862,7 +886,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>deprecated</h4>
-<pre>public abstract boolean <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.387">deprecated</a></pre>
+<pre>public abstract boolean <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.399">deprecated</a></pre>
<div class="block">Optional deprecated flag for the exposed API.
<p>
Used to populate the Swagger deprecated field.
@@ -893,7 +917,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>parameters</h4>
-<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">Parameter</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.424">parameters</a></pre>
+<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">Parameter</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.436">parameters</a></pre>
<div class="block">Optional parameter descriptions.
<p>
This annotation is provided for documentation purposes and is used to populate the method <js>"parameters"</js> column
@@ -942,7 +966,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>responses</h4>
-<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">Response</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.460">responses</a></pre>
+<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">Response</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.472">responses</a></pre>
<div class="block">Optional output description.
<p>
This annotation is provided for documentation purposes and is used to populate the method <js>"responses"</js> column
@@ -990,7 +1014,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>clientVersion</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.518">clientVersion</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/RestMethod.html#line.530">clientVersion</a></pre>
<div class="block">Specifies whether this method can be called based on the client version.
<p>
The client version is identified via the HTTP request header identified by <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#clientVersionHeader--"><code>RestResource.clientVersionHeader()</code></a> which
@@ -1054,14 +1078,48 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
</li>
</ul>
<ul class="blockList">
-<li class="blockList"><a name="links--">
+<li class="blockList"><a name="pageTitle--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>pageTitle</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.535">pageTitle</a></pre>
+<div class="block">Overrides the HTML page title defined on the servlet via the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pageTitle--"><code>@RestResource.pageTitle()</code></a> annotation.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="pageText--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>pageText</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.540">pageText</a></pre>
+<div class="block">Overrides the HTML page text defined on the servlet via the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pageText--"><code>@RestResource.pageText()</code></a> annotation.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="pageLinks--">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>links</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.523">links</a></pre>
-<div class="block">TODO</div>
+<h4>pageLinks</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.545">pageLinks</a></pre>
+<div class="block">Overrides the HTML page links defined on the servlet via the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pageLinks--"><code>@RestResource.pageLinks()</code></a> annotation.</div>
<dl>
<dt>Default:</dt>
<dd>""</dd>
[27/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html b/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html
index 7118a34..04cc4cc 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html
@@ -157,7 +157,7 @@
<span class="sourceLineNo">149</span> this(p == null ? BeanContext.DEFAULT.createSession() : p.getBeanContext().createSession());<a name="line.149"></a>
<span class="sourceLineNo">150</span> if (p == null)<a name="line.150"></a>
<span class="sourceLineNo">151</span> p = JsonParser.DEFAULT;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> if (s != null)<a name="line.152"></a>
+<span class="sourceLineNo">152</span> if (! StringUtils.isEmpty(s))<a name="line.152"></a>
<span class="sourceLineNo">153</span> p.parseIntoMap(s, this, session.string(), session.object());<a name="line.153"></a>
<span class="sourceLineNo">154</span> }<a name="line.154"></a>
<span class="sourceLineNo">155</span><a name="line.155"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/PropertyStore.PropertyMap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/PropertyStore.PropertyMap.html b/content/site/apidocs/src-html/org/apache/juneau/PropertyStore.PropertyMap.html
index e8e2edb..405499c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/PropertyStore.PropertyMap.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/PropertyStore.PropertyMap.html
@@ -154,7 +154,7 @@
<span class="sourceLineNo">146</span> * ps.putToProperty(<js>"BeanContext.implClasses.map"</js>, MyInterface.<jk>class</jk>, MyInterfaceImpl.<jk>class</jk>);<a name="line.146"></a>
<span class="sourceLineNo">147</span> *<a name="line.147"></a>
<span class="sourceLineNo">148</span> * <jc>// Append to map property using set().</jc><a name="line.148"></a>
-<span class="sourceLineNo">149</span> * Map m = <jk>new</jk> HashMap(){{put(MyInterface.<jk>class</jk>,MyInterfaceImpl.<jk>class</jk>)}};<a name="line.149"></a>
+<span class="sourceLineNo">149</span> * Map m = <jk>new</jk> AMap().append(MyInterface.<jk>class</jk>,MyInterfaceImpl.<jk>class</jk>);<a name="line.149"></a>
<span class="sourceLineNo">150</span> * ps.setProperty(<js>"BeanContext.implClasses.map.put"</js>, m);<a name="line.150"></a>
<span class="sourceLineNo">151</span> * </p><a name="line.151"></a>
<span class="sourceLineNo">152</span> * <p><a name="line.152"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/PropertyStore.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/PropertyStore.html b/content/site/apidocs/src-html/org/apache/juneau/PropertyStore.html
index e8e2edb..405499c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/PropertyStore.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/PropertyStore.html
@@ -154,7 +154,7 @@
<span class="sourceLineNo">146</span> * ps.putToProperty(<js>"BeanContext.implClasses.map"</js>, MyInterface.<jk>class</jk>, MyInterfaceImpl.<jk>class</jk>);<a name="line.146"></a>
<span class="sourceLineNo">147</span> *<a name="line.147"></a>
<span class="sourceLineNo">148</span> * <jc>// Append to map property using set().</jc><a name="line.148"></a>
-<span class="sourceLineNo">149</span> * Map m = <jk>new</jk> HashMap(){{put(MyInterface.<jk>class</jk>,MyInterfaceImpl.<jk>class</jk>)}};<a name="line.149"></a>
+<span class="sourceLineNo">149</span> * Map m = <jk>new</jk> AMap().append(MyInterface.<jk>class</jk>,MyInterfaceImpl.<jk>class</jk>);<a name="line.149"></a>
<span class="sourceLineNo">150</span> * ps.setProperty(<js>"BeanContext.implClasses.map.put"</js>, m);<a name="line.150"></a>
<span class="sourceLineNo">151</span> * </p><a name="line.151"></a>
<span class="sourceLineNo">152</span> * <p><a name="line.152"></a>
[08/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html
index fe2e718..d1723e2 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html
@@ -285,1208 +285,1244 @@
<span class="sourceLineNo">277</span> */<a name="line.277"></a>
<span class="sourceLineNo">278</span> public static final String REST_methodDescription = "RestServlet.methodDescription";<a name="line.278"></a>
<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> private final Object resource;<a name="line.280"></a>
-<span class="sourceLineNo">281</span> private final RestConfig config;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> private final boolean<a name="line.282"></a>
-<span class="sourceLineNo">283</span> allowHeaderParams,<a name="line.283"></a>
-<span class="sourceLineNo">284</span> allowBodyParam,<a name="line.284"></a>
-<span class="sourceLineNo">285</span> renderResponseStackTraces,<a name="line.285"></a>
-<span class="sourceLineNo">286</span> useStackTraceHashes;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> private final String<a name="line.287"></a>
-<span class="sourceLineNo">288</span> defaultCharset,<a name="line.288"></a>
-<span class="sourceLineNo">289</span> paramFormat,<a name="line.289"></a>
-<span class="sourceLineNo">290</span> clientVersionHeader,<a name="line.290"></a>
-<span class="sourceLineNo">291</span> fullPath;<a name="line.291"></a>
-<span class="sourceLineNo">292</span> private final Set<String> allowMethodParams;<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> private final ObjectMap properties;<a name="line.294"></a>
-<span class="sourceLineNo">295</span> private final Class<?>[]<a name="line.295"></a>
-<span class="sourceLineNo">296</span> beanFilters,<a name="line.296"></a>
-<span class="sourceLineNo">297</span> pojoSwaps;<a name="line.297"></a>
-<span class="sourceLineNo">298</span> private final SerializerGroup serializers;<a name="line.298"></a>
-<span class="sourceLineNo">299</span> private final ParserGroup parsers;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> private final UrlEncodingSerializer urlEncodingSerializer;<a name="line.300"></a>
-<span class="sourceLineNo">301</span> private final UrlEncodingParser urlEncodingParser;<a name="line.301"></a>
-<span class="sourceLineNo">302</span> private final EncoderGroup encoders;<a name="line.302"></a>
-<span class="sourceLineNo">303</span> private final MediaType[]<a name="line.303"></a>
-<span class="sourceLineNo">304</span> supportedContentTypes,<a name="line.304"></a>
-<span class="sourceLineNo">305</span> supportedAcceptTypes;<a name="line.305"></a>
-<span class="sourceLineNo">306</span> private final Map<String,String> defaultRequestHeaders;<a name="line.306"></a>
-<span class="sourceLineNo">307</span> private final Map<String,Object> defaultResponseHeaders;<a name="line.307"></a>
-<span class="sourceLineNo">308</span> private final BeanContext beanContext;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> private final RestConverter[] converters;<a name="line.309"></a>
-<span class="sourceLineNo">310</span> private final RestGuard[] guards;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> private final ResponseHandler[] responseHandlers;<a name="line.311"></a>
-<span class="sourceLineNo">312</span> private final MimetypesFileTypeMap mimetypesFileTypeMap;<a name="line.312"></a>
-<span class="sourceLineNo">313</span> private final StreamResource styleSheet, favIcon;<a name="line.313"></a>
-<span class="sourceLineNo">314</span> private final Map<String,String> staticFilesMap;<a name="line.314"></a>
-<span class="sourceLineNo">315</span> private final String[] staticFilesPrefixes;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> private final MessageBundle msgs;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> private final ConfigFile configFile;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> private final VarResolver varResolver;<a name="line.318"></a>
-<span class="sourceLineNo">319</span> private final Map<String,CallRouter> callRouters;<a name="line.319"></a>
-<span class="sourceLineNo">320</span> private final Map<String,CallMethod> callMethods;<a name="line.320"></a>
-<span class="sourceLineNo">321</span> private final Map<String,RestContext> childResources;<a name="line.321"></a>
-<span class="sourceLineNo">322</span> private final RestLogger logger;<a name="line.322"></a>
-<span class="sourceLineNo">323</span> private final RestCallHandler callHandler;<a name="line.323"></a>
-<span class="sourceLineNo">324</span> private final RestInfoProvider infoProvider;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> private final RestException initException;<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span> // In-memory cache of images and stylesheets in the org.apache.juneau.rest.htdocs package.<a name="line.327"></a>
-<span class="sourceLineNo">328</span> private final Map<String,StreamResource> staticFilesCache = new ConcurrentHashMap<String,StreamResource>();<a name="line.328"></a>
-<span class="sourceLineNo">329</span> private final Map<String,byte[]> resourceStreams = new ConcurrentHashMap<String,byte[]>();<a name="line.329"></a>
-<span class="sourceLineNo">330</span> private final Map<String,String> resourceStrings = new ConcurrentHashMap<String,String>();<a name="line.330"></a>
-<span class="sourceLineNo">331</span> private final ConcurrentHashMap<Integer,AtomicInteger> stackTraceHashes = new ConcurrentHashMap<Integer,AtomicInteger>();<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span> /**<a name="line.334"></a>
-<span class="sourceLineNo">335</span> * Constructor.<a name="line.335"></a>
-<span class="sourceLineNo">336</span> *<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * @param resource The resource class (a class annotated with {@link RestResource @RestResource}).<a name="line.337"></a>
-<span class="sourceLineNo">338</span> * @param config The servlet configuration object.<a name="line.338"></a>
-<span class="sourceLineNo">339</span> * @throws Exception If any initialization problems were encountered.<a name="line.339"></a>
-<span class="sourceLineNo">340</span> */<a name="line.340"></a>
-<span class="sourceLineNo">341</span> @SuppressWarnings("unchecked")<a name="line.341"></a>
-<span class="sourceLineNo">342</span> public RestContext(Object resource, RestConfig config) throws Exception {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> super(null);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> RestException _initException = null;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> try {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> this.resource = resource;<a name="line.346"></a>
-<span class="sourceLineNo">347</span> this.config = config;<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> Builder b = new Builder(resource, config);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> this.allowHeaderParams = b.allowHeaderParams;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> this.allowBodyParam = b.allowBodyParam;<a name="line.351"></a>
-<span class="sourceLineNo">352</span> this.renderResponseStackTraces = b.renderResponseStackTraces;<a name="line.352"></a>
-<span class="sourceLineNo">353</span> this.useStackTraceHashes = b.useStackTraceHashes;<a name="line.353"></a>
-<span class="sourceLineNo">354</span> this.allowMethodParams = Collections.unmodifiableSet(b.allowMethodParams);<a name="line.354"></a>
-<span class="sourceLineNo">355</span> this.defaultCharset = b.defaultCharset;<a name="line.355"></a>
-<span class="sourceLineNo">356</span> this.paramFormat = b.paramFormat;<a name="line.356"></a>
-<span class="sourceLineNo">357</span> this.varResolver = b.varResolver;<a name="line.357"></a>
-<span class="sourceLineNo">358</span> this.configFile = b.configFile;<a name="line.358"></a>
-<span class="sourceLineNo">359</span> this.properties = b.properties;<a name="line.359"></a>
-<span class="sourceLineNo">360</span> this.beanFilters = b.beanFilters;<a name="line.360"></a>
-<span class="sourceLineNo">361</span> this.pojoSwaps = b.pojoSwaps;<a name="line.361"></a>
-<span class="sourceLineNo">362</span> this.serializers = b.serializers;<a name="line.362"></a>
-<span class="sourceLineNo">363</span> this.parsers = b.parsers;<a name="line.363"></a>
-<span class="sourceLineNo">364</span> this.urlEncodingSerializer = b.urlEncodingSerializer;<a name="line.364"></a>
-<span class="sourceLineNo">365</span> this.urlEncodingParser = b.urlEncodingParser;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> this.encoders = b.encoders;<a name="line.366"></a>
-<span class="sourceLineNo">367</span> this.supportedContentTypes = ArrayUtils.toObjectArray(b.supportedContentTypes, MediaType.class);<a name="line.367"></a>
-<span class="sourceLineNo">368</span> this.supportedAcceptTypes = ArrayUtils.toObjectArray(b.supportedAcceptTypes, MediaType.class);<a name="line.368"></a>
-<span class="sourceLineNo">369</span> this.clientVersionHeader = b.clientVersionHeader;<a name="line.369"></a>
-<span class="sourceLineNo">370</span> this.defaultRequestHeaders = Collections.unmodifiableMap(b.defaultRequestHeaders);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> this.defaultResponseHeaders = Collections.unmodifiableMap(b.defaultResponseHeaders);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> this.beanContext = b.beanContext;<a name="line.372"></a>
-<span class="sourceLineNo">373</span> this.converters = b.converters.toArray(new RestConverter[b.converters.size()]);<a name="line.373"></a>
-<span class="sourceLineNo">374</span> this.guards = b.guards.toArray(new RestGuard[b.guards.size()]);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> this.responseHandlers = ArrayUtils.toObjectArray(b.responseHandlers, ResponseHandler.class);<a name="line.375"></a>
-<span class="sourceLineNo">376</span> this.mimetypesFileTypeMap = b.mimetypesFileTypeMap;<a name="line.376"></a>
-<span class="sourceLineNo">377</span> this.styleSheet = b.styleSheet;<a name="line.377"></a>
-<span class="sourceLineNo">378</span> this.favIcon = b.favIcon;<a name="line.378"></a>
-<span class="sourceLineNo">379</span> this.staticFilesMap = Collections.unmodifiableMap(b.staticFilesMap);<a name="line.379"></a>
-<span class="sourceLineNo">380</span> this.staticFilesPrefixes = b.staticFilesPrefixes;<a name="line.380"></a>
-<span class="sourceLineNo">381</span> this.msgs = b.messageBundle;<a name="line.381"></a>
-<span class="sourceLineNo">382</span> this.childResources = Collections.synchronizedMap(new LinkedHashMap<String,RestContext>()); // Not unmodifiable on purpose so that children can be replaced.<a name="line.382"></a>
-<span class="sourceLineNo">383</span> this.logger = b.logger;<a name="line.383"></a>
-<span class="sourceLineNo">384</span> this.fullPath = b.fullPath;<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> //----------------------------------------------------------------------------------------------------<a name="line.386"></a>
-<span class="sourceLineNo">387</span> // Initialize the child resources.<a name="line.387"></a>
-<span class="sourceLineNo">388</span> // Done after initializing fields above since we pass this object to the child resources.<a name="line.388"></a>
-<span class="sourceLineNo">389</span> //----------------------------------------------------------------------------------------------------<a name="line.389"></a>
-<span class="sourceLineNo">390</span> List<String> methodsFound = new LinkedList<String>(); // Temporary to help debug transient duplicate method issue.<a name="line.390"></a>
-<span class="sourceLineNo">391</span> Map<String,CallRouter.Builder> routers = new LinkedHashMap<String,CallRouter.Builder>();<a name="line.391"></a>
-<span class="sourceLineNo">392</span> Map<String,CallMethod> _javaRestMethods = new LinkedHashMap<String,CallMethod>();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> for (java.lang.reflect.Method method : resource.getClass().getMethods()) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> if (method.isAnnotationPresent(RestMethod.class)) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span> RestMethod a = method.getAnnotation(RestMethod.class);<a name="line.395"></a>
-<span class="sourceLineNo">396</span> methodsFound.add(method.getName() + "," + a.name() + "," + a.path());<a name="line.396"></a>
-<span class="sourceLineNo">397</span> try {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> if (! Modifier.isPublic(method.getModifiers()))<a name="line.398"></a>
-<span class="sourceLineNo">399</span> throw new RestServletException("@RestMethod method {0}.{1} must be defined as public.", this.getClass().getName(), method.getName());<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> CallMethod sm = new CallMethod(resource, method, this);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> String httpMethod = sm.getHttpMethod();<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span> // PROXY is a special case where a method returns an interface that we<a name="line.404"></a>
-<span class="sourceLineNo">405</span> // can perform REST calls against.<a name="line.405"></a>
-<span class="sourceLineNo">406</span> // We override the CallMethod.invoke() method to insert our logic.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> if ("PROXY".equals(httpMethod)) {<a name="line.407"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> private final Object resource;<a name="line.281"></a>
+<span class="sourceLineNo">282</span> private final RestConfig config;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> private final boolean<a name="line.283"></a>
+<span class="sourceLineNo">284</span> allowHeaderParams,<a name="line.284"></a>
+<span class="sourceLineNo">285</span> allowBodyParam,<a name="line.285"></a>
+<span class="sourceLineNo">286</span> renderResponseStackTraces,<a name="line.286"></a>
+<span class="sourceLineNo">287</span> useStackTraceHashes;<a name="line.287"></a>
+<span class="sourceLineNo">288</span> private final String<a name="line.288"></a>
+<span class="sourceLineNo">289</span> defaultCharset,<a name="line.289"></a>
+<span class="sourceLineNo">290</span> paramFormat,<a name="line.290"></a>
+<span class="sourceLineNo">291</span> clientVersionHeader,<a name="line.291"></a>
+<span class="sourceLineNo">292</span> fullPath,<a name="line.292"></a>
+<span class="sourceLineNo">293</span> pageTitle, pageText, pageLinks;<a name="line.293"></a>
+<span class="sourceLineNo">294</span> private final Set<String> allowMethodParams;<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span> private final ObjectMap properties;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> private final Class<?>[]<a name="line.297"></a>
+<span class="sourceLineNo">298</span> beanFilters,<a name="line.298"></a>
+<span class="sourceLineNo">299</span> pojoSwaps;<a name="line.299"></a>
+<span class="sourceLineNo">300</span> private final SerializerGroup serializers;<a name="line.300"></a>
+<span class="sourceLineNo">301</span> private final ParserGroup parsers;<a name="line.301"></a>
+<span class="sourceLineNo">302</span> private final UrlEncodingSerializer urlEncodingSerializer;<a name="line.302"></a>
+<span class="sourceLineNo">303</span> private final UrlEncodingParser urlEncodingParser;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> private final EncoderGroup encoders;<a name="line.304"></a>
+<span class="sourceLineNo">305</span> private final MediaType[]<a name="line.305"></a>
+<span class="sourceLineNo">306</span> supportedContentTypes,<a name="line.306"></a>
+<span class="sourceLineNo">307</span> supportedAcceptTypes;<a name="line.307"></a>
+<span class="sourceLineNo">308</span> private final Map<String,String> defaultRequestHeaders;<a name="line.308"></a>
+<span class="sourceLineNo">309</span> private final Map<String,Object> defaultResponseHeaders;<a name="line.309"></a>
+<span class="sourceLineNo">310</span> private final BeanContext beanContext;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> private final RestConverter[] converters;<a name="line.311"></a>
+<span class="sourceLineNo">312</span> private final RestGuard[] guards;<a name="line.312"></a>
+<span class="sourceLineNo">313</span> private final ResponseHandler[] responseHandlers;<a name="line.313"></a>
+<span class="sourceLineNo">314</span> private final MimetypesFileTypeMap mimetypesFileTypeMap;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> private final StreamResource styleSheet, favIcon;<a name="line.315"></a>
+<span class="sourceLineNo">316</span> private final Map<String,String> staticFilesMap;<a name="line.316"></a>
+<span class="sourceLineNo">317</span> private final String[] staticFilesPrefixes;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> private final MessageBundle msgs;<a name="line.318"></a>
+<span class="sourceLineNo">319</span> private final ConfigFile configFile;<a name="line.319"></a>
+<span class="sourceLineNo">320</span> private final VarResolver varResolver;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> private final Map<String,CallRouter> callRouters;<a name="line.321"></a>
+<span class="sourceLineNo">322</span> private final Map<String,CallMethod> callMethods;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> private final Map<String,RestContext> childResources;<a name="line.323"></a>
+<span class="sourceLineNo">324</span> private final RestLogger logger;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> private final RestCallHandler callHandler;<a name="line.325"></a>
+<span class="sourceLineNo">326</span> private final RestInfoProvider infoProvider;<a name="line.326"></a>
+<span class="sourceLineNo">327</span> private final RestException initException;<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span> // In-memory cache of images and stylesheets in the org.apache.juneau.rest.htdocs package.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> private final Map<String,StreamResource> staticFilesCache = new ConcurrentHashMap<String,StreamResource>();<a name="line.330"></a>
+<span class="sourceLineNo">331</span> private final Map<String,byte[]> resourceStreams = new ConcurrentHashMap<String,byte[]>();<a name="line.331"></a>
+<span class="sourceLineNo">332</span> private final Map<String,String> resourceStrings = new ConcurrentHashMap<String,String>();<a name="line.332"></a>
+<span class="sourceLineNo">333</span> private final ConcurrentHashMap<Integer,AtomicInteger> stackTraceHashes = new ConcurrentHashMap<Integer,AtomicInteger>();<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span> /**<a name="line.336"></a>
+<span class="sourceLineNo">337</span> * Constructor.<a name="line.337"></a>
+<span class="sourceLineNo">338</span> *<a name="line.338"></a>
+<span class="sourceLineNo">339</span> * @param resource The resource class (a class annotated with {@link RestResource @RestResource}).<a name="line.339"></a>
+<span class="sourceLineNo">340</span> * @param config The servlet configuration object.<a name="line.340"></a>
+<span class="sourceLineNo">341</span> * @throws Exception If any initialization problems were encountered.<a name="line.341"></a>
+<span class="sourceLineNo">342</span> */<a name="line.342"></a>
+<span class="sourceLineNo">343</span> @SuppressWarnings("unchecked")<a name="line.343"></a>
+<span class="sourceLineNo">344</span> public RestContext(Object resource, RestConfig config) throws Exception {<a name="line.344"></a>
+<span class="sourceLineNo">345</span> super(null);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> RestException _initException = null;<a name="line.346"></a>
+<span class="sourceLineNo">347</span> try {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> this.resource = resource;<a name="line.348"></a>
+<span class="sourceLineNo">349</span> this.config = config;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> Builder b = new Builder(resource, config);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> this.allowHeaderParams = b.allowHeaderParams;<a name="line.352"></a>
+<span class="sourceLineNo">353</span> this.allowBodyParam = b.allowBodyParam;<a name="line.353"></a>
+<span class="sourceLineNo">354</span> this.renderResponseStackTraces = b.renderResponseStackTraces;<a name="line.354"></a>
+<span class="sourceLineNo">355</span> this.useStackTraceHashes = b.useStackTraceHashes;<a name="line.355"></a>
+<span class="sourceLineNo">356</span> this.allowMethodParams = Collections.unmodifiableSet(b.allowMethodParams);<a name="line.356"></a>
+<span class="sourceLineNo">357</span> this.defaultCharset = b.defaultCharset;<a name="line.357"></a>
+<span class="sourceLineNo">358</span> this.paramFormat = b.paramFormat;<a name="line.358"></a>
+<span class="sourceLineNo">359</span> this.varResolver = b.varResolver;<a name="line.359"></a>
+<span class="sourceLineNo">360</span> this.configFile = b.configFile;<a name="line.360"></a>
+<span class="sourceLineNo">361</span> this.properties = b.properties;<a name="line.361"></a>
+<span class="sourceLineNo">362</span> this.beanFilters = b.beanFilters;<a name="line.362"></a>
+<span class="sourceLineNo">363</span> this.pojoSwaps = b.pojoSwaps;<a name="line.363"></a>
+<span class="sourceLineNo">364</span> this.serializers = b.serializers;<a name="line.364"></a>
+<span class="sourceLineNo">365</span> this.parsers = b.parsers;<a name="line.365"></a>
+<span class="sourceLineNo">366</span> this.urlEncodingSerializer = b.urlEncodingSerializer;<a name="line.366"></a>
+<span class="sourceLineNo">367</span> this.urlEncodingParser = b.urlEncodingParser;<a name="line.367"></a>
+<span class="sourceLineNo">368</span> this.encoders = b.encoders;<a name="line.368"></a>
+<span class="sourceLineNo">369</span> this.supportedContentTypes = ArrayUtils.toObjectArray(b.supportedContentTypes, MediaType.class);<a name="line.369"></a>
+<span class="sourceLineNo">370</span> this.supportedAcceptTypes = ArrayUtils.toObjectArray(b.supportedAcceptTypes, MediaType.class);<a name="line.370"></a>
+<span class="sourceLineNo">371</span> this.clientVersionHeader = b.clientVersionHeader;<a name="line.371"></a>
+<span class="sourceLineNo">372</span> this.defaultRequestHeaders = Collections.unmodifiableMap(b.defaultRequestHeaders);<a name="line.372"></a>
+<span class="sourceLineNo">373</span> this.defaultResponseHeaders = Collections.unmodifiableMap(b.defaultResponseHeaders);<a name="line.373"></a>
+<span class="sourceLineNo">374</span> this.beanContext = b.beanContext;<a name="line.374"></a>
+<span class="sourceLineNo">375</span> this.converters = b.converters.toArray(new RestConverter[b.converters.size()]);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> this.guards = b.guards.toArray(new RestGuard[b.guards.size()]);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> this.responseHandlers = ArrayUtils.toObjectArray(b.responseHandlers, ResponseHandler.class);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> this.mimetypesFileTypeMap = b.mimetypesFileTypeMap;<a name="line.378"></a>
+<span class="sourceLineNo">379</span> this.styleSheet = b.styleSheet;<a name="line.379"></a>
+<span class="sourceLineNo">380</span> this.favIcon = b.favIcon;<a name="line.380"></a>
+<span class="sourceLineNo">381</span> this.staticFilesMap = Collections.unmodifiableMap(b.staticFilesMap);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> this.staticFilesPrefixes = b.staticFilesPrefixes;<a name="line.382"></a>
+<span class="sourceLineNo">383</span> this.msgs = b.messageBundle;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> this.childResources = Collections.synchronizedMap(new LinkedHashMap<String,RestContext>()); // Not unmodifiable on purpose so that children can be replaced.<a name="line.384"></a>
+<span class="sourceLineNo">385</span> this.logger = b.logger;<a name="line.385"></a>
+<span class="sourceLineNo">386</span> this.fullPath = b.fullPath;<a name="line.386"></a>
+<span class="sourceLineNo">387</span> this.pageTitle = b.pageTitle;<a name="line.387"></a>
+<span class="sourceLineNo">388</span> this.pageText = b.pageText;<a name="line.388"></a>
+<span class="sourceLineNo">389</span> this.pageLinks = b.pageLinks;<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> //----------------------------------------------------------------------------------------------------<a name="line.391"></a>
+<span class="sourceLineNo">392</span> // Initialize the child resources.<a name="line.392"></a>
+<span class="sourceLineNo">393</span> // Done after initializing fields above since we pass this object to the child resources.<a name="line.393"></a>
+<span class="sourceLineNo">394</span> //----------------------------------------------------------------------------------------------------<a name="line.394"></a>
+<span class="sourceLineNo">395</span> List<String> methodsFound = new LinkedList<String>(); // Temporary to help debug transient duplicate method issue.<a name="line.395"></a>
+<span class="sourceLineNo">396</span> Map<String,CallRouter.Builder> routers = new LinkedHashMap<String,CallRouter.Builder>();<a name="line.396"></a>
+<span class="sourceLineNo">397</span> Map<String,CallMethod> _javaRestMethods = new LinkedHashMap<String,CallMethod>();<a name="line.397"></a>
+<span class="sourceLineNo">398</span> for (java.lang.reflect.Method method : resource.getClass().getMethods()) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> if (method.isAnnotationPresent(RestMethod.class)) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> RestMethod a = method.getAnnotation(RestMethod.class);<a name="line.400"></a>
+<span class="sourceLineNo">401</span> methodsFound.add(method.getName() + "," + a.name() + "," + a.path());<a name="line.401"></a>
+<span class="sourceLineNo">402</span> try {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> if (! Modifier.isPublic(method.getModifiers()))<a name="line.403"></a>
+<span class="sourceLineNo">404</span> throw new RestServletException("@RestMethod method {0}.{1} must be defined as public.", this.getClass().getName(), method.getName());<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span> CallMethod sm = new CallMethod(resource, method, this);<a name="line.406"></a>
+<span class="sourceLineNo">407</span> String httpMethod = sm.getHttpMethod();<a name="line.407"></a>
<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> final ClassMeta<?> interfaceClass = beanContext.getClassMeta(method.getGenericReturnType());<a name="line.409"></a>
-<span class="sourceLineNo">410</span> sm = new CallMethod(resource, method, this) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span> @Override<a name="line.412"></a>
-<span class="sourceLineNo">413</span> int invoke(String pathInfo, RestRequest req, RestResponse res) throws RestException {<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span> int rc = super.invoke(pathInfo, req, res);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> if (rc != SC_OK)<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return rc;<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span> final Object o = res.getOutput();<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> if ("GET".equals(req.getMethod())) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> res.setOutput(ClassUtils.getMethodInfo(interfaceClass.getProxyableMethods().values()));<a name="line.422"></a>
-<span class="sourceLineNo">423</span> return SC_OK;<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> } else if ("POST".equals(req.getMethod())) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> if (pathInfo.indexOf('/') != -1)<a name="line.426"></a>
-<span class="sourceLineNo">427</span> pathInfo = pathInfo.substring(pathInfo.lastIndexOf('/')+1);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> pathInfo = RestUtils.decode(pathInfo);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> java.lang.reflect.Method m = interfaceClass.getProxyableMethods().get(pathInfo);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> if (m != null) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> try {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> // Parse the args and invoke the method.<a name="line.432"></a>
-<span class="sourceLineNo">433</span> Parser p = req.getParser();<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Object input = p.isReaderParser() ? req.getReader() : req.getInputStream();<a name="line.434"></a>
-<span class="sourceLineNo">435</span> Object output = null;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> try {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> output = m.invoke(o, p.parseArgs(input, m.getGenericParameterTypes()));<a name="line.437"></a>
-<span class="sourceLineNo">438</span> } catch (InvocationTargetException e) {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> res.setHeader("Exception-Name", e.getCause().getClass().getName());<a name="line.439"></a>
-<span class="sourceLineNo">440</span> res.setHeader("Exception-Message", e.getCause().getMessage());<a name="line.440"></a>
-<span class="sourceLineNo">441</span> throw e;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> } catch (Exception e) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span> res.setHeader("Exception-Name", e.getClass().getName());<a name="line.443"></a>
-<span class="sourceLineNo">444</span> res.setHeader("Exception-Message", e.getCause().getMessage());<a name="line.444"></a>
-<span class="sourceLineNo">445</span> throw e;<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span> res.setOutput(output);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> return SC_OK;<a name="line.448"></a>
-<span class="sourceLineNo">449</span> } catch (Exception e) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span> }<a name="line.453"></a>
-<span class="sourceLineNo">454</span> return SC_NOT_FOUND;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span> };<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> _javaRestMethods.put(method.getName(), sm);<a name="line.458"></a>
-<span class="sourceLineNo">459</span> addToRouter(routers, "GET", sm);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> addToRouter(routers, "POST", sm);<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span> } else {<a name="line.462"></a>
+<span class="sourceLineNo">409</span> // PROXY is a special case where a method returns an interface that we<a name="line.409"></a>
+<span class="sourceLineNo">410</span> // can perform REST calls against.<a name="line.410"></a>
+<span class="sourceLineNo">411</span> // We override the CallMethod.invoke() method to insert our logic.<a name="line.411"></a>
+<span class="sourceLineNo">412</span> if ("PROXY".equals(httpMethod)) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span> final ClassMeta<?> interfaceClass = beanContext.getClassMeta(method.getGenericReturnType());<a name="line.414"></a>
+<span class="sourceLineNo">415</span> sm = new CallMethod(resource, method, this) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span> @Override<a name="line.417"></a>
+<span class="sourceLineNo">418</span> int invoke(String pathInfo, RestRequest req, RestResponse res) throws RestException {<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span> int rc = super.invoke(pathInfo, req, res);<a name="line.420"></a>
+<span class="sourceLineNo">421</span> if (rc != SC_OK)<a name="line.421"></a>
+<span class="sourceLineNo">422</span> return rc;<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span> final Object o = res.getOutput();<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span> if ("GET".equals(req.getMethod())) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> res.setOutput(ClassUtils.getMethodInfo(interfaceClass.getProxyableMethods().values()));<a name="line.427"></a>
+<span class="sourceLineNo">428</span> return SC_OK;<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span> } else if ("POST".equals(req.getMethod())) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> if (pathInfo.indexOf('/') != -1)<a name="line.431"></a>
+<span class="sourceLineNo">432</span> pathInfo = pathInfo.substring(pathInfo.lastIndexOf('/')+1);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> pathInfo = RestUtils.decode(pathInfo);<a name="line.433"></a>
+<span class="sourceLineNo">434</span> java.lang.reflect.Method m = interfaceClass.getProxyableMethods().get(pathInfo);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> if (m != null) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span> try {<a name="line.436"></a>
+<span class="sourceLineNo">437</span> // Parse the args and invoke the method.<a name="line.437"></a>
+<span class="sourceLineNo">438</span> Parser p = req.getParser();<a name="line.438"></a>
+<span class="sourceLineNo">439</span> Object input = p.isReaderParser() ? req.getReader() : req.getInputStream();<a name="line.439"></a>
+<span class="sourceLineNo">440</span> Object output = null;<a name="line.440"></a>
+<span class="sourceLineNo">441</span> try {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> output = m.invoke(o, p.parseArgs(input, m.getGenericParameterTypes()));<a name="line.442"></a>
+<span class="sourceLineNo">443</span> } catch (InvocationTargetException e) {<a name="line.443"></a>
+<span class="sourceLineNo">444</span> res.setHeader("Exception-Name", e.getCause().getClass().getName());<a name="line.444"></a>
+<span class="sourceLineNo">445</span> res.setHeader("Exception-Message", e.getCause().getMessage());<a name="line.445"></a>
+<span class="sourceLineNo">446</span> throw e;<a name="line.446"></a>
+<span class="sourceLineNo">447</span> } catch (Exception e) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> res.setHeader("Exception-Name", e.getClass().getName());<a name="line.448"></a>
+<span class="sourceLineNo">449</span> res.setHeader("Exception-Message", e.getMessage());<a name="line.449"></a>
+<span class="sourceLineNo">450</span> throw e;<a name="line.450"></a>
+<span class="sourceLineNo">451</span> }<a name="line.451"></a>
+<span class="sourceLineNo">452</span> res.setOutput(output);<a name="line.452"></a>
+<span class="sourceLineNo">453</span> return SC_OK;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> } catch (Exception e) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> }<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
+<span class="sourceLineNo">459</span> return SC_NOT_FOUND;<a name="line.459"></a>
+<span class="sourceLineNo">460</span> }<a name="line.460"></a>
+<span class="sourceLineNo">461</span> };<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
<span class="sourceLineNo">463</span> _javaRestMethods.put(method.getName(), sm);<a name="line.463"></a>
-<span class="sourceLineNo">464</span> addToRouter(routers, httpMethod, sm);<a name="line.464"></a>
-<span class="sourceLineNo">465</span> }<a name="line.465"></a>
-<span class="sourceLineNo">466</span> } catch (RestServletException e) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> throw new RestServletException("Problem occurred trying to serialize methods on class {0}, methods={1}", this.getClass().getName(), JsonSerializer.DEFAULT_LAX.serialize(methodsFound)).initCause(e);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> }<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span> }<a name="line.470"></a>
-<span class="sourceLineNo">471</span> this.callMethods = Collections.unmodifiableMap(_javaRestMethods);<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span> Map<String,CallRouter> _callRouters = new LinkedHashMap<String,CallRouter>();<a name="line.473"></a>
-<span class="sourceLineNo">474</span> for (CallRouter.Builder crb : routers.values())<a name="line.474"></a>
-<span class="sourceLineNo">475</span> _callRouters.put(crb.getHttpMethodName(), crb.build());<a name="line.475"></a>
-<span class="sourceLineNo">476</span> this.callRouters = Collections.unmodifiableMap(_callRouters);<a name="line.476"></a>
+<span class="sourceLineNo">464</span> addToRouter(routers, "GET", sm);<a name="line.464"></a>
+<span class="sourceLineNo">465</span> addToRouter(routers, "POST", sm);<a name="line.465"></a>
+<span class="sourceLineNo">466</span><a name="line.466"></a>
+<span class="sourceLineNo">467</span> } else {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> _javaRestMethods.put(method.getName(), sm);<a name="line.468"></a>
+<span class="sourceLineNo">469</span> addToRouter(routers, httpMethod, sm);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> }<a name="line.470"></a>
+<span class="sourceLineNo">471</span> } catch (RestServletException e) {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> throw new RestServletException("Problem occurred trying to serialize methods on class {0}, methods={1}", this.getClass().getName(), JsonSerializer.DEFAULT_LAX.serialize(methodsFound)).initCause(e);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
+<span class="sourceLineNo">474</span> }<a name="line.474"></a>
+<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">476</span> this.callMethods = Collections.unmodifiableMap(_javaRestMethods);<a name="line.476"></a>
<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span> // Initialize our child resources.<a name="line.478"></a>
-<span class="sourceLineNo">479</span> RestResourceResolver rrr = resolve(RestResourceResolver.class, config.resourceResolver);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> for (Object o : config.childResources) {<a name="line.480"></a>
-<span class="sourceLineNo">481</span> String path = null;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> Object r = null;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> if (o instanceof Pair) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> Pair<String,Object> p = (Pair<String,Object>)o;<a name="line.484"></a>
-<span class="sourceLineNo">485</span> path = p.first();<a name="line.485"></a>
-<span class="sourceLineNo">486</span> r = p.second();<a name="line.486"></a>
-<span class="sourceLineNo">487</span> } else if (o instanceof Class<?>) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> Class<?> c = (Class<?>)o;<a name="line.488"></a>
-<span class="sourceLineNo">489</span> r = c;<a name="line.489"></a>
-<span class="sourceLineNo">490</span> } else {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> r = o;<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span> RestConfig childConfig = null;<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span> if (o instanceof Class) {<a name="line.496"></a>
-<span class="sourceLineNo">497</span> Class<?> oc = (Class<?>)o;<a name="line.497"></a>
-<span class="sourceLineNo">498</span> childConfig = new RestConfig(config.inner, oc, this);<a name="line.498"></a>
-<span class="sourceLineNo">499</span> r = rrr.resolve(oc, childConfig);<a name="line.499"></a>
-<span class="sourceLineNo">500</span> } else {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> r = o;<a name="line.501"></a>
-<span class="sourceLineNo">502</span> childConfig = new RestConfig(config.inner, o.getClass(), this);<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> if (r instanceof RestServlet) {<a name="line.505"></a>
-<span class="sourceLineNo">506</span> RestServlet rs = (RestServlet)r;<a name="line.506"></a>
-<span class="sourceLineNo">507</span> rs.init(childConfig);<a name="line.507"></a>
-<span class="sourceLineNo">508</span> path = childConfig.path;<a name="line.508"></a>
-<span class="sourceLineNo">509</span> childResources.put(path, rs.getContext());<a name="line.509"></a>
-<span class="sourceLineNo">510</span> } else {<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> // Call the init(RestConfig) method.<a name="line.512"></a>
-<span class="sourceLineNo">513</span> java.lang.reflect.Method m2 = ClassUtils.findPublicMethod(r.getClass(), "init", Void.class, RestConfig.class);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> if (m2 != null)<a name="line.514"></a>
-<span class="sourceLineNo">515</span> m2.invoke(r, childConfig);<a name="line.515"></a>
+<span class="sourceLineNo">478</span> Map<String,CallRouter> _callRouters = new LinkedHashMap<String,CallRouter>();<a name="line.478"></a>
+<span class="sourceLineNo">479</span> for (CallRouter.Builder crb : routers.values())<a name="line.479"></a>
+<span class="sourceLineNo">480</span> _callRouters.put(crb.getHttpMethodName(), crb.build());<a name="line.480"></a>
+<span class="sourceLineNo">481</span> this.callRouters = Collections.unmodifiableMap(_callRouters);<a name="line.481"></a>
+<span class="sourceLineNo">482</span><a name="line.482"></a>
+<span class="sourceLineNo">483</span> // Initialize our child resources.<a name="line.483"></a>
+<span class="sourceLineNo">484</span> RestResourceResolver rrr = resolve(RestResourceResolver.class, config.resourceResolver);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> for (Object o : config.childResources) {<a name="line.485"></a>
+<span class="sourceLineNo">486</span> String path = null;<a name="line.486"></a>
+<span class="sourceLineNo">487</span> Object r = null;<a name="line.487"></a>
+<span class="sourceLineNo">488</span> if (o instanceof Pair) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span> Pair<String,Object> p = (Pair<String,Object>)o;<a name="line.489"></a>
+<span class="sourceLineNo">490</span> path = p.first();<a name="line.490"></a>
+<span class="sourceLineNo">491</span> r = p.second();<a name="line.491"></a>
+<span class="sourceLineNo">492</span> } else if (o instanceof Class<?>) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> Class<?> c = (Class<?>)o;<a name="line.493"></a>
+<span class="sourceLineNo">494</span> r = c;<a name="line.494"></a>
+<span class="sourceLineNo">495</span> } else {<a name="line.495"></a>
+<span class="sourceLineNo">496</span> r = o;<a name="line.496"></a>
+<span class="sourceLineNo">497</span> }<a name="line.497"></a>
+<span class="sourceLineNo">498</span><a name="line.498"></a>
+<span class="sourceLineNo">499</span> RestConfig childConfig = null;<a name="line.499"></a>
+<span class="sourceLineNo">500</span><a name="line.500"></a>
+<span class="sourceLineNo">501</span> if (o instanceof Class) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span> Class<?> oc = (Class<?>)o;<a name="line.502"></a>
+<span class="sourceLineNo">503</span> childConfig = new RestConfig(config.inner, oc, this);<a name="line.503"></a>
+<span class="sourceLineNo">504</span> r = rrr.resolve(oc, childConfig);<a name="line.504"></a>
+<span class="sourceLineNo">505</span> } else {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> r = o;<a name="line.506"></a>
+<span class="sourceLineNo">507</span> childConfig = new RestConfig(config.inner, o.getClass(), this);<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span><a name="line.509"></a>
+<span class="sourceLineNo">510</span> if (r instanceof RestServlet) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span> RestServlet rs = (RestServlet)r;<a name="line.511"></a>
+<span class="sourceLineNo">512</span> rs.init(childConfig);<a name="line.512"></a>
+<span class="sourceLineNo">513</span> path = childConfig.path;<a name="line.513"></a>
+<span class="sourceLineNo">514</span> childResources.put(path, rs.getContext());<a name="line.514"></a>
+<span class="sourceLineNo">515</span> } else {<a name="line.515"></a>
<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span> RestContext rc2 = new RestContext(r, childConfig);<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span> // Call the init(RestContext) method.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> m2 = ClassUtils.findPublicMethod(r.getClass(), "init", Void.class, RestContext.class);<a name="line.520"></a>
-<span class="sourceLineNo">521</span> if (m2 != null)<a name="line.521"></a>
-<span class="sourceLineNo">522</span> m2.invoke(r, rc2);<a name="line.522"></a>
+<span class="sourceLineNo">517</span> // Call the init(RestConfig) method.<a name="line.517"></a>
+<span class="sourceLineNo">518</span> java.lang.reflect.Method m2 = ClassUtils.findPublicMethod(r.getClass(), "init", Void.class, RestConfig.class);<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (m2 != null)<a name="line.519"></a>
+<span class="sourceLineNo">520</span> m2.invoke(r, childConfig);<a name="line.520"></a>
+<span class="sourceLineNo">521</span><a name="line.521"></a>
+<span class="sourceLineNo">522</span> RestContext rc2 = new RestContext(r, childConfig);<a name="line.522"></a>
<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span> path = childConfig.path;<a name="line.524"></a>
-<span class="sourceLineNo">525</span> childResources.put(path, rc2);<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span> }<a name="line.527"></a>
+<span class="sourceLineNo">524</span> // Call the init(RestContext) method.<a name="line.524"></a>
+<span class="sourceLineNo">525</span> m2 = ClassUtils.findPublicMethod(r.getClass(), "init", Void.class, RestContext.class);<a name="line.525"></a>
+<span class="sourceLineNo">526</span> if (m2 != null)<a name="line.526"></a>
+<span class="sourceLineNo">527</span> m2.invoke(r, rc2);<a name="line.527"></a>
<span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span> callHandler = config.callHandler == null ? new RestCallHandler(this) : resolve(RestCallHandler.class, config.callHandler, this);<a name="line.529"></a>
-<span class="sourceLineNo">530</span> infoProvider = config.infoProvider == null ? new RestInfoProvider(this) : resolve(RestInfoProvider.class, config.infoProvider, this);<a name="line.530"></a>
-<span class="sourceLineNo">531</span><a name="line.531"></a>
-<span class="sourceLineNo">532</span> } catch (RestException e) {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> _initException = e;<a name="line.533"></a>
-<span class="sourceLineNo">534</span> throw e;<a name="line.534"></a>
-<span class="sourceLineNo">535</span> } catch (Exception e) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span> _initException = new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.536"></a>
-<span class="sourceLineNo">537</span> throw e;<a name="line.537"></a>
-<span class="sourceLineNo">538</span> } finally {<a name="line.538"></a>
-<span class="sourceLineNo">539</span> initException = _initException;<a name="line.539"></a>
-<span class="sourceLineNo">540</span> }<a name="line.540"></a>
-<span class="sourceLineNo">541</span> }<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> private static void addToRouter(Map<String, CallRouter.Builder> routers, String httpMethodName, CallMethod cm) throws RestServletException {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> if (! routers.containsKey(httpMethodName))<a name="line.544"></a>
-<span class="sourceLineNo">545</span> routers.put(httpMethodName, new CallRouter.Builder(httpMethodName));<a name="line.545"></a>
-<span class="sourceLineNo">546</span> routers.get(httpMethodName).add(cm);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> private static class Builder {<a name="line.549"></a>
-<span class="sourceLineNo">550</span><a name="line.550"></a>
-<span class="sourceLineNo">551</span> boolean allowHeaderParams, allowBodyParam, renderResponseStackTraces, useStackTraceHashes;<a name="line.551"></a>
-<span class="sourceLineNo">552</span> VarResolver varResolver;<a name="line.552"></a>
-<span class="sourceLineNo">553</span> ConfigFile configFile;<a name="line.553"></a>
-<span class="sourceLineNo">554</span> ObjectMap properties;<a name="line.554"></a>
-<span class="sourceLineNo">555</span> Class<?>[] beanFilters;<a name="line.555"></a>
-<span class="sourceLineNo">556</span> Class<?>[] pojoSwaps;<a name="line.556"></a>
-<span class="sourceLineNo">557</span> SerializerGroup serializers;<a name="line.557"></a>
-<span class="sourceLineNo">558</span> ParserGroup parsers;<a name="line.558"></a>
-<span class="sourceLineNo">559</span> UrlEncodingSerializer urlEncodingSerializer;<a name="line.559"></a>
-<span class="sourceLineNo">560</span> UrlEncodingParser urlEncodingParser;<a name="line.560"></a>
-<span class="sourceLineNo">561</span> EncoderGroup encoders;<a name="line.561"></a>
-<span class="sourceLineNo">562</span> String clientVersionHeader = "", defaultCharset, paramFormat;<a name="line.562"></a>
-<span class="sourceLineNo">563</span> List<MediaType> supportedContentTypes, supportedAcceptTypes;<a name="line.563"></a>
-<span class="sourceLineNo">564</span> Map<String,String> defaultRequestHeaders = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);<a name="line.564"></a>
-<span class="sourceLineNo">565</span> Map<String,Object> defaultResponseHeaders;<a name="line.565"></a>
-<span class="sourceLineNo">566</span> BeanContext beanContext;<a name="line.566"></a>
-<span class="sourceLineNo">567</span> List<RestConverter> converters = new ArrayList<RestConverter>();<a name="line.567"></a>
-<span class="sourceLineNo">568</span> List<RestGuard> guards = new ArrayList<RestGuard>();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> List<ResponseHandler> responseHandlers = new ArrayList<ResponseHandler>();<a name="line.569"></a>
-<span class="sourceLineNo">570</span> MimetypesFileTypeMap mimetypesFileTypeMap;<a name="line.570"></a>
-<span class="sourceLineNo">571</span> StreamResource styleSheet, favIcon;<a name="line.571"></a>
-<span class="sourceLineNo">572</span> Map<String,String> staticFilesMap;<a name="line.572"></a>
-<span class="sourceLineNo">573</span> String[] staticFilesPrefixes;<a name="line.573"></a>
-<span class="sourceLineNo">574</span> MessageBundle messageBundle;<a name="line.574"></a>
-<span class="sourceLineNo">575</span> Set<String> allowMethodParams = new LinkedHashSet<String>();<a name="line.575"></a>
-<span class="sourceLineNo">576</span> RestLogger logger;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> String fullPath;<a name="line.577"></a>
-<span class="sourceLineNo">578</span><a name="line.578"></a>
-<span class="sourceLineNo">579</span> @SuppressWarnings("unchecked")<a name="line.579"></a>
-<span class="sourceLineNo">580</span> private Builder(Object resource, RestConfig sc) throws Exception {<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span> PropertyStore ps = sc.createPropertyStore();<a name="line.582"></a>
+<span class="sourceLineNo">529</span> path = childConfig.path;<a name="line.529"></a>
+<span class="sourceLineNo">530</span> childResources.put(path, rc2);<a name="line.530"></a>
+<span class="sourceLineNo">531</span> }<a name="line.531"></a>
+<span class="sourceLineNo">532</span> }<a name="line.532"></a>
+<span class="sourceLineNo">533</span><a name="line.533"></a>
+<span class="sourceLineNo">534</span> callHandler = config.callHandler == null ? new RestCallHandler(this) : resolve(RestCallHandler.class, config.callHandler, this);<a name="line.534"></a>
+<span class="sourceLineNo">535</span> infoProvider = config.infoProvider == null ? new RestInfoProvider(this) : resolve(RestInfoProvider.class, config.infoProvider, this);<a name="line.535"></a>
+<span class="sourceLineNo">536</span><a name="line.536"></a>
+<span class="sourceLineNo">537</span> } catch (RestException e) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span> _initException = e;<a name="line.538"></a>
+<span class="sourceLineNo">539</span> throw e;<a name="line.539"></a>
+<span class="sourceLineNo">540</span> } catch (Exception e) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span> _initException = new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.541"></a>
+<span class="sourceLineNo">542</span> throw e;<a name="line.542"></a>
+<span class="sourceLineNo">543</span> } finally {<a name="line.543"></a>
+<span class="sourceLineNo">544</span> initException = _initException;<a name="line.544"></a>
+<span class="sourceLineNo">545</span> }<a name="line.545"></a>
+<span class="sourceLineNo">546</span> }<a name="line.546"></a>
+<span class="sourceLineNo">547</span><a name="line.547"></a>
+<span class="sourceLineNo">548</span> private static void addToRouter(Map<String, CallRouter.Builder> routers, String httpMethodName, CallMethod cm) throws RestServletException {<a name="line.548"></a>
+<span class="sourceLineNo">549</span> if (! routers.containsKey(httpMethodName))<a name="line.549"></a>
+<span class="sourceLineNo">550</span> routers.put(httpMethodName, new CallRouter.Builder(httpMethodName));<a name="line.550"></a>
+<span class="sourceLineNo">551</span> routers.get(httpMethodName).add(cm);<a name="line.551"></a>
+<span class="sourceLineNo">552</span> }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span> private static class Builder {<a name="line.554"></a>
+<span class="sourceLineNo">555</span><a name="line.555"></a>
+<span class="sourceLineNo">556</span> boolean allowHeaderParams, allowBodyParam, renderResponseStackTraces, useStackTraceHashes;<a name="line.556"></a>
+<span class="sourceLineNo">557</span> VarResolver varResolver;<a name="line.557"></a>
+<span class="sourceLineNo">558</span> ConfigFile configFile;<a name="line.558"></a>
+<span class="sourceLineNo">559</span> ObjectMap properties;<a name="line.559"></a>
+<span class="sourceLineNo">560</span> Class<?>[] beanFilters;<a name="line.560"></a>
+<span class="sourceLineNo">561</span> Class<?>[] pojoSwaps;<a name="line.561"></a>
+<span class="sourceLineNo">562</span> SerializerGroup serializers;<a name="line.562"></a>
+<span class="sourceLineNo">563</span> ParserGroup parsers;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> UrlEncodingSerializer urlEncodingSerializer;<a name="line.564"></a>
+<span class="sourceLineNo">565</span> UrlEncodingParser urlEncodingParser;<a name="line.565"></a>
+<span class="sourceLineNo">566</span> EncoderGroup encoders;<a name="line.566"></a>
+<span class="sourceLineNo">567</span> String clientVersionHeader = "", defaultCharset, paramFormat, pageTitle, pageText, pageLinks;<a name="line.567"></a>
+<span class="sourceLineNo">568</span> List<MediaType> supportedContentTypes, supportedAcceptTypes;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> Map<String,String> defaultRequestHeaders = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);<a name="line.569"></a>
+<span class="sourceLineNo">570</span> Map<String,Object> defaultResponseHeaders;<a name="line.570"></a>
+<span class="sourceLineNo">571</span> BeanContext beanContext;<a name="line.571"></a>
+<span class="sourceLineNo">572</span> List<RestConverter> converters = new ArrayList<RestConverter>();<a name="line.572"></a>
+<span class="sourceLineNo">573</span> List<RestGuard> guards = new ArrayList<RestGuard>();<a name="line.573"></a>
+<span class="sourceLineNo">574</span> List<ResponseHandler> responseHandlers = new ArrayList<ResponseHandler>();<a name="line.574"></a>
+<span class="sourceLineNo">575</span> MimetypesFileTypeMap mimetypesFileTypeMap;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> StreamResource styleSheet, favIcon;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> Map<String,String> staticFilesMap;<a name="line.577"></a>
+<span class="sourceLineNo">578</span> String[] staticFilesPrefixes;<a name="line.578"></a>
+<span class="sourceLineNo">579</span> MessageBundle messageBundle;<a name="line.579"></a>
+<span class="sourceLineNo">580</span> Set<String> allowMethodParams = new LinkedHashSet<String>();<a name="line.580"></a>
+<span class="sourceLineNo">581</span> RestLogger logger;<a name="line.581"></a>
+<span class="sourceLineNo">582</span> String fullPath;<a name="line.582"></a>
<span class="sourceLineNo">583</span><a name="line.583"></a>
-<span class="sourceLineNo">584</span> LinkedHashMap<Class<?>,RestResource> restResourceAnnotationsChildFirst = ReflectionUtils.findAnnotationsMap(RestResource.class, resource.getClass());<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span> allowHeaderParams = ps.getProperty(REST_allowHeaderParams, boolean.class, true);<a name="line.586"></a>
-<span class="sourceLineNo">587</span> allowBodyParam = ps.getProperty(REST_allowBodyParam, boolean.class, true);<a name="line.587"></a>
-<span class="sourceLineNo">588</span> renderResponseStackTraces = ps.getProperty(REST_renderResponseStackTraces, boolean.class, false);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> useStackTraceHashes = ps.getProperty(REST_useStackTraceHashes, boolean.class, true);<a name="line.589"></a>
-<span class="sourceLineNo">590</span> defaultCharset = ps.getProperty(REST_defaultCharset, String.class, "utf-8");<a name="line.590"></a>
-<span class="sourceLineNo">591</span> paramFormat = ps.getProperty(REST_paramFormat, String.class, "");<a name="line.591"></a>
-<span class="sourceLineNo">592</span><a name="line.592"></a>
-<span class="sourceLineNo">593</span> for (String m : StringUtils.split(ps.getProperty(REST_allowMethodParam, String.class, ""), ','))<a name="line.593"></a>
-<span class="sourceLineNo">594</span> if (m.equals("true")) // For backwards compatibility when this was a boolean field.<a name="line.594"></a>
-<span class="sourceLineNo">595</span> allowMethodParams.add("*");<a name="line.595"></a>
-<span class="sourceLineNo">596</span> else<a name="line.596"></a>
-<span class="sourceLineNo">597</span> allowMethodParams.add(m.toUpperCase());<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span> varResolver = sc.varResolverBuilder<a name="line.599"></a>
-<span class="sourceLineNo">600</span> .vars(LocalizationVar.class, RequestVar.class, SerializedRequestAttrVar.class, ServletInitParamVar.class, UrlEncodeVar.class)<a name="line.600"></a>
-<span class="sourceLineNo">601</span> .build()<a name="line.601"></a>
-<span class="sourceLineNo">602</span> ;<a name="line.602"></a>
-<span class="sourceLineNo">603</span> configFile = sc.configFile.getResolving(this.varResolver);<a name="line.603"></a>
-<span class="sourceLineNo">604</span> properties = sc.properties;<a name="line.604"></a>
-<span class="sourceLineNo">605</span> Collections.reverse(sc.beanFilters);<a name="line.605"></a>
-<span class="sourceLineNo">606</span> Collections.reverse(sc.pojoSwaps);<a name="line.606"></a>
-<span class="sourceLineNo">607</span> beanFilters = ArrayUtils.toObjectArray(sc.beanFilters, Class.class);<a name="line.607"></a>
-<span class="sourceLineNo">608</span> pojoSwaps = ArrayUtils.toObjectArray(sc.pojoSwaps, Class.class);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> clientVersionHeader = sc.clientVersionHeader;<a name="line.609"></a>
-<span class="sourceLineNo">610</span><a name="line.610"></a>
-<span class="sourceLineNo">611</span> // Find resource resource bundle location.<a name="line.611"></a>
-<span class="sourceLineNo">612</span> for (Map.Entry<Class<?>,RestResource> e : restResourceAnnotationsChildFirst.entrySet()) {<a name="line.612"></a>
-<span class="sourceLineNo">613</span> Class<?> c = e.getKey();<a name="line.613"></a>
-<span class="sourceLineNo">614</span> RestResource r = e.getValue();<a name="line.614"></a>
-<span class="sourceLineNo">615</span> if (! r.messages().isEmpty()) {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> if (messageBundle == null)<a name="line.616"></a>
-<span class="sourceLineNo">617</span> messageBundle = new MessageBundle(c, r.messages());<a name="line.617"></a>
-<span class="sourceLineNo">618</span> else<a name="line.618"></a>
-<span class="sourceLineNo">619</span> messageBundle.addSearchPath(c, r.messages());<a name="line.619"></a>
-<span class="sourceLineNo">620</span> }<a name="line.620"></a>
-<span class="sourceLineNo">621</span> }<a name="line.621"></a>
-<span class="sourceLineNo">622</span><a name="line.622"></a>
-<span class="sourceLineNo">623</span> if (messageBundle == null)<a name="line.623"></a>
-<span class="sourceLineNo">624</span> messageBundle = new MessageBundle(resource.getClass(), "");<a name="line.624"></a>
-<span class="sourceLineNo">625</span><a name="line.625"></a>
-<span class="sourceLineNo">626</span> ps.addBeanFilters(beanFilters).addPojoSwaps(pojoSwaps).setProperties(properties);<a name="line.626"></a>
+<span class="sourceLineNo">584</span> @SuppressWarnings("unchecked")<a name="line.584"></a>
+<span class="sourceLineNo">585</span> private Builder(Object resource, RestConfig sc) throws Exception {<a name="line.585"></a>
+<span class="sourceLineNo">586</span><a name="line.586"></a>
+<span class="sourceLineNo">587</span> PropertyStore ps = sc.createPropertyStore();<a name="line.587"></a>
+<span class="sourceLineNo">588</span><a name="line.588"></a>
+<span class="sourceLineNo">589</span> LinkedHashMap<Class<?>,RestResource> restResourceAnnotationsChildFirst = ReflectionUtils.findAnnotationsMap(RestResource.class, resource.getClass());<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span> allowHeaderParams = ps.getProperty(REST_allowHeaderParams, boolean.class, true);<a name="line.591"></a>
+<span class="sourceLineNo">592</span> allowBodyParam = ps.getProperty(REST_allowBodyParam, boolean.class, true);<a name="line.592"></a>
+<span class="sourceLineNo">593</span> renderResponseStackTraces = ps.getProperty(REST_renderResponseStackTraces, boolean.class, false);<a name="line.593"></a>
+<span class="sourceLineNo">594</span> useStackTraceHashes = ps.getProperty(REST_useStackTraceHashes, boolean.class, true);<a name="line.594"></a>
+<span class="sourceLineNo">595</span> defaultCharset = ps.getProperty(REST_defaultCharset, String.class, "utf-8");<a name="line.595"></a>
+<span class="sourceLineNo">596</span> paramFormat = ps.getProperty(REST_paramFormat, String.class, "");<a name="line.596"></a>
+<span class="sourceLineNo">597</span><a name="line.597"></a>
+<span class="sourceLineNo">598</span> for (String m : StringUtils.split(ps.getProperty(REST_allowMethodParam, String.class, ""), ','))<a name="line.598"></a>
+<span class="sourceLineNo">599</span> if (m.equals("true")) // For backwards compatibility when this was a boolean field.<a name="line.599"></a>
+<span class="sourceLineNo">600</span> allowMethodParams.add("*");<a name="line.600"></a>
+<span class="sourceLineNo">601</span> else<a name="line.601"></a>
+<span class="sourceLineNo">602</span> allowMethodParams.add(m.toUpperCase());<a name="line.602"></a>
+<span class="sourceLineNo">603</span><a name="line.603"></a>
+<span class="sourceLineNo">604</span> varResolver = sc.varResolverBuilder<a name="line.604"></a>
+<span class="sourceLineNo">605</span> .vars(LocalizationVar.class, RequestVar.class, SerializedRequestAttrVar.class, ServletInitParamVar.class, UrlEncodeVar.class)<a name="line.605"></a>
+<span class="sourceLineNo">606</span> .build()<a name="line.606"></a>
+<span class="sourceLineNo">607</span> ;<a name="line.607"></a>
+<span class="sourceLineNo">608</span> configFile = sc.configFile.getResolving(this.varResolver);<a name="line.608"></a>
+<span class="sourceLineNo">609</span> properties = sc.properties;<a name="line.609"></a>
+<span class="sourceLineNo">610</span> Collections.reverse(sc.beanFilters);<a name="line.610"></a>
+<span class="sourceLineNo">611</span> Collections.reverse(sc.pojoSwaps);<a name="line.611"></a>
+<span class="sourceLineNo">612</span> beanFilters = ArrayUtils.toObjectArray(sc.beanFilters, Class.class);<a name="line.612"></a>
+<span class="sourceLineNo">613</span> pojoSwaps = ArrayUtils.toObjectArray(sc.pojoSwaps, Class.class);<a name="line.613"></a>
+<span class="sourceLineNo">614</span> clientVersionHeader = sc.clientVersionHeader;<a name="line.614"></a>
+<span class="sourceLineNo">615</span><a name="line.615"></a>
+<span class="sourceLineNo">616</span> // Find resource resource bundle location.<a name="line.616"></a>
+<span class="sourceLineNo">617</span> for (Map.Entry<Class<?>,RestResource> e : restResourceAnnotationsChildFirst.entrySet()) {<a name="line.617"></a>
+<span class="sourceLineNo">618</span> Class<?> c = e.getKey();<a name="line.618"></a>
+<span class="sourceLineNo">619</span> RestResource r = e.getValue();<a name="line.619"></a>
+<span class="sourceLineNo">620</span> if (! r.messages().isEmpty()) {<a name="line.620"></a>
+<span class="sourceLineNo">621</span> if (messageBundle == null)<a name="line.621"></a>
+<span class="sourceLineNo">622</span> messageBundle = new MessageBundle(c, r.messages());<a name="line.622"></a>
+<span class="sourceLineNo">623</span> else<a name="line.623"></a>
+<span class="sourceLineNo">624</span> messageBundle.addSearchPath(c, r.messages());<a name="line.624"></a>
+<span class="sourceLineNo">625</span> }<a name="line.625"></a>
+<span class="sourceLineNo">626</span> }<a name="line.626"></a>
<span class="sourceLineNo">627</span><a name="line.627"></a>
-<span class="sourceLineNo">628</span> serializers = sc.serializers.beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a name="line.628"></a>
-<span class="sourceLineNo">629</span> parsers = sc.parsers.beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a name="line.629"></a>
-<span class="sourceLineNo">630</span> urlEncodingSerializer = new UrlEncodingSerializer(ps);<a name="line.630"></a>
-<span class="sourceLineNo">631</span> urlEncodingParser = new UrlEncodingParser(ps);<a name="line.631"></a>
-<span class="sourceLineNo">632</span> encoders = sc.encoders.build();<a name="line.632"></a>
-<span class="sourceLineNo">633</span> supportedContentTypes = sc.supportedContentTypes != null ? sc.supportedContentTypes : serializers.getSupportedMediaTypes();<a name="line.633"></a>
-<span class="sourceLineNo">634</span> supportedAcceptTypes = sc.supportedAcceptTypes != null ? sc.supportedAcceptTypes : parsers.getSupportedMediaTypes();<a name="line.634"></a>
-<span class="sourceLineNo">635</span> defaultRequestHeaders.putAll(sc.defaultRequestHeaders);<a name="line.635"></a>
-<span class="sourceLineNo">636</span> defaultResponseHeaders = Collections.unmodifiableMap(new LinkedHashMap<String,Object>(sc.defaultResponseHeaders));<a name="line.636"></a>
-<span class="sourceLineNo">637</span> beanContext = ps.getBeanContext();<a name="line.637"></a>
-<span class="sourceLineNo">638</span><a name="line.638"></a>
-<span class="sourceLineNo">639</span> for (Object o : sc.converters)<a name="line.639"></a>
-<span class="sourceLineNo">640</span> converters.add(resolve(RestConverter.class, o));<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span> for (Object o : sc.guards)<a name="line.642"></a>
-<span class="sourceLineNo">643</span> guards.add(resolve(RestGuard.class, o));<a name="line.643"></a>
-<span class="sourceLineNo">644</span><a name="line.644"></a>
-<span class="sourceLineNo">645</span> for (Object o : sc.responseHandlers)<a name="line.645"></a>
-<span class="sourceLineNo">646</span> responseHandlers.add(resolve(ResponseHandler.class, o));<a name="line.646"></a>
-<span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span> mimetypesFileTypeMap = sc.mimeTypes;<a name="line.648"></a>
+<span class="sourceLineNo">628</span> if (messageBundle == null)<a name="line.628"></a>
+<span class="sourceLineNo">629</span> messageBundle = new MessageBundle(resource.getClass(), "");<a name="line.629"></a>
+<span class="sourceLineNo">630</span><a name="line.630"></a>
+<span class="sourceLineNo">631</span> ps.addBeanFilters(beanFilters).addPojoSwaps(pojoSwaps).setProperties(properties);<a name="line.631"></a>
+<span class="sourceLineNo">632</span><a name="line.632"></a>
+<span class="sourceLineNo">633</span> serializers = sc.serializers.beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a name="line.633"></a>
+<span class="sourceLineNo">634</span> parsers = sc.parsers.beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a name="line.634"></a>
+<span class="sourceLineNo">635</span> urlEncodingSerializer = new UrlEncodingSerializer(ps);<a name="line.635"></a>
+<span class="sourceLineNo">636</span> urlEncodingParser = new UrlEncodingParser(ps);<a name="line.636"></a>
+<span class="sourceLineNo">637</span> encoders = sc.encoders.build();<a name="line.637"></a>
+<span class="sourceLineNo">638</span> supportedContentTypes = sc.supportedContentTypes != null ? sc.supportedContentTypes : serializers.getSupportedMediaTypes();<a name="line.638"></a>
+<span class="sourceLineNo">639</span> supportedAcceptTypes = sc.supportedAcceptTypes != null ? sc.supportedAcceptTypes : parsers.getSupportedMediaTypes();<a name="line.639"></a>
+<span class="sourceLineNo">640</span> defaultRequestHeaders.putAll(sc.defaultRequestHeaders);<a name="line.640"></a>
+<span class="sourceLineNo">641</span> defaultResponseHeaders = Collections.unmodifiableMap(new LinkedHashMap<String,Object>(sc.defaultResponseHeaders));<a name="line.641"></a>
+<span class="sourceLineNo">642</span> beanContext = ps.getBeanContext();<a name="line.642"></a>
+<span class="sourceLineNo">643</span><a name="line.643"></a>
+<span class="sourceLineNo">644</span> for (Object o : sc.converters)<a name="line.644"></a>
+<span class="sourceLineNo">645</span> converters.add(resolve(RestConverter.class, o));<a name="line.645"></a>
+<span class="sourceLineNo">646</span><a name="line.646"></a>
+<span class="sourceLineNo">647</span> for (Object o : sc.guards)<a name="line.647"></a>
+<span class="sourceLineNo">648</span> guards.add(resolve(RestGuard.class, o));<a name="line.648"></a>
<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span> VarResolver vr = sc.getVarResolverBuilder().build();<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span> if (sc.styleSheets != null) {<a name="line.652"></a>
-<span class="sourceLineNo">653</span> List<InputStream> contents = new ArrayList<InputStream>();<a name="line.653"></a>
-<span class="sourceLineNo">654</span> for (Object o : sc.styleSheets) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> if (o instanceof Pair) {<a name="line.655"></a>
-<span class="sourceLineNo">656</span> Pair<Class<?>,String> p = (Pair<Class<?>,String>)o;<a name="line.656"></a>
-<span class="sourceLineNo">657</span> for (String path : StringUtils.split(vr.resolve(StringUtils.toString(p.second())), ','))<a name="line.657"></a>
-<span class="sourceLineNo">658</span> if (path.startsWith("file://"))<a name="line.658"></a>
-<span class="sourceLineNo">659</span> contents.add(new FileInputStream(path));<a name="line.659"></a>
-<span class="sourceLineNo">660</span> else<a name="line.660"></a>
-<span class="sourceLineNo">661</span> contents.add(ReflectionUtils.getResource(p.first(), path));<a name="line.661"></a>
-<span class="sourceLineNo">662</span> } else {<a name="line.662"></a>
-<span class="sourceLineNo">663</span> contents.add(IOUtils.toInputStream(o));<a name="line.663"></a>
-<span class="sourceLineNo">664</span> }<a name="line.664"></a>
-<span class="sourceLineNo">665</span> }<a name="line.665"></a>
-<span class="sourceLineNo">666</span> styleSheet = new StreamResource(MediaType.forString("text/css"), contents.toArray());<a name="line.666"></a>
-<span class="sourceLineNo">667</span> }<a name="line.667"></a>
-<span class="sourceLineNo">668</span><a name="line.668"></a>
-<span class="sourceLineNo">669</span> if (sc.favIcon != null) {<a name="line.669"></a>
-<span class="sourceLineNo">670</span> Object o = sc.favIcon;<a name="line.670"></a>
-<span class="sourceLineNo">671</span> InputStream is = null;<a name="line.671"></a>
-<span class="sourceLineNo">672</span> if (o instanceof Pair) {<a name="line.672"></a>
-<span class="sourceLineNo">673</span> Pair<Class<?>,String> p = (Pair<Class<?>,String>)o;<a name="line.673"></a>
-<span class="sourceLineNo">674</span> is = ReflectionUtils.getResource(p.first(), vr.resolve(p.second()));<a name="line.674"></a>
-<span class="sourceLineNo">675</span> } else {<a name="line.675"></a>
-<span class="sourceLineNo">676</span> is = IOUtils.toInputStream(o);<a name="line.676"></a>
-<span class="sourceLineNo">677</span> }<a name="line.677"></a>
-<span class="sourceLineNo">678</span> if (is != null)<a name="line.678"></a>
-<span class="sourceLineNo">679</span> favIcon = new StreamResource(MediaType.forString("image/x-icon"), is);<a name="line.679"></a>
-<span class="sourceLineNo">680</span> }<a name="line.680"></a>
-<span class="sourceLineNo">681</span><a name="line.681"></a>
-<span class="sourceLineNo">682</span> staticFilesMap = new LinkedHashMap<String,String>();<a name="line.682"></a>
-<span class="sourceLineNo">683</span> if (sc.staticFiles != null) {<a name="line.683"></a>
-<span class="sourceLineNo">684</span> for (Object o : sc.staticFiles) {<a name="line.684"></a>
-<span class="sourceLineNo">685</span> if (o instanceof Pair) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span> Pair<Class<?>,String> p = (Pair<Class<?>,String>)o;<a name="line.686"></a>
-<span class="sourceLineNo">687</span> // TODO - Currently doesn't take parent class location into account.<a name="line.687"></a>
-<span class="sourceLineNo">688</span> staticFilesMap.putAll(JsonParser.DEFAULT.parse(vr.resolve(p.second()), LinkedHashMap.class));<a name="line.688"></a>
-<span class="sourceLineNo">689</span> } else {<a name="line.689"></a>
-<span class="sourceLineNo">690</span> throw new RuntimeException("TODO");<a name="line.690"></a>
-<span class="sourceLineNo">691</span> }<a name="line.691"></a>
-<span class="sourceLineNo">692</span> }<a name="line.692"></a>
-<span class="sourceLineNo">693</span> }<a name="line.693"></a>
-<span class="sourceLineNo">694</span> staticFilesPrefixes = staticFilesMap.keySet().toArray(new String[0]);<a name="line.694"></a>
-<span class="sourceLineNo">695</span><a name="line.695"></a>
-<span class="sourceLineNo">696</span> logger = sc.logger == null ? new RestLogger.NoOp() : resolve(RestLogger.class, sc.logger);<a name="line.696"></a>
-<span class="sourceLineNo">697</span><a name="line.697"></a>
-<span class="sourceLineNo">698</span> fullPath = (sc.parentContext == null ? "" : (sc.parentContext.fullPath + '/')) + sc.path;<a name="line.698"></a>
-<span class="sourceLineNo">699</span> }<a name="line.699"></a>
-<span class="sourceLineNo">700</span> }<a name="line.700"></a>
-<span class="sourceLineNo">701</span><a name="line.701"></a>
-<span class="sourceLineNo">702</span> /**<a name="line.702"></a>
-<span class="sourceLineNo">703</span> * Returns the variable resolver for this servlet.<a name="line.703"></a>
-<span class="sourceLineNo">704</span> * <p><a name="line.704"></a>
-<span class="sourceLineNo">705</span> * Variable resolvers are used to replace variables in property values.<a name="line.705"></a>
-<span class="sourceLineNo">706</span> * </p><a name="line.706"></a>
-<span class="sourceLineNo">707</span> * <h6 class='figure'>Example:</h6><a name="line.707"></a>
-<span class="sourceLineNo">708</span> * <p class='bcode'><a name="line.708"></a>
-<span class="sourceLineNo">709</span> * <ja>@RestResource</ja>(<a name="line.709"></a>
-<span class="sourceLineNo">710</span> * messages=<js>"nls/Messages"</js>,<a name="line.710"></a>
-<span class="sourceLineNo">711</span> * properties={<a name="line.711"></a>
-<span class="sourceLineNo">712</span> * <ja>@Property</ja>(name=<js>"title"</js>,value=<js>"$L{title}"</js>), <jc>// Localized variable in Messages.properties</jc><a name="line.712"></a>
-<span class="sourceLineNo">713</span> *
<TRUNCATED>
[17/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Xml.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Xml.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Xml.html
index 675f202..9d7976b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Xml.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Xml.html
@@ -177,314 +177,315 @@
<span class="sourceLineNo">169</span> // Special case where we're parsing a loose collection of resources.<a name="line.169"></a>
<span class="sourceLineNo">170</span> if (s.isLooseCollections() && type.isCollectionOrArray()) {<a name="line.170"></a>
<span class="sourceLineNo">171</span> Collection c = null;<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if (type.isArray())<a name="line.172"></a>
+<span class="sourceLineNo">172</span> if (type.isArray() || type.isArgs())<a name="line.172"></a>
<span class="sourceLineNo">173</span> c = new ArrayList();<a name="line.173"></a>
<span class="sourceLineNo">174</span> else<a name="line.174"></a>
<span class="sourceLineNo">175</span> c = (type.canCreateNewInstance(session.getOuter()) ? (Collection<?>)type.newInstance(session.getOuter()) : new ObjectList(session));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (Resource resource : roots)<a name="line.176"></a>
-<span class="sourceLineNo">177</span> c.add(parseAnything(s, type.getElementType(), resource, session.getOuter(), null));<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> if (type.isArray())<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return (T)session.toArray(type, c);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> return (T)c;<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (roots.isEmpty())<a name="line.184"></a>
-<span class="sourceLineNo">185</span> return null;<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (roots.size() > 1)<a name="line.186"></a>
-<span class="sourceLineNo">187</span> throw new ParseException(session, "Too many root nodes found in model: {0}", roots.size());<a name="line.187"></a>
-<span class="sourceLineNo">188</span> Resource resource = roots.get(0);<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> return parseAnything(s, type, resource, session.getOuter(), null);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> /*<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * Finds the roots in the model using either the "root" property to identify it,<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * or by resorting to scanning the model for all nodes with no incoming predicates.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> */<a name="line.196"></a>
-<span class="sourceLineNo">197</span> private static List<Resource> getRoots(RdfParserSession session, Model m) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> List<Resource> l = new LinkedList<Resource>();<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> // First try to find the root using the "http://www.apache.org/juneau/root" property.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> Property root = m.createProperty(session.getJuneauNsUri(), RDF_juneauNs_ROOT);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> for (ResIterator i = m.listResourcesWithProperty(root); i.hasNext();)<a name="line.202"></a>
-<span class="sourceLineNo">203</span> l.add(i.next());<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span> if (! l.isEmpty())<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return l;<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> // Otherwise, we need to find all resources that aren't objects.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // We want to explicitly ignore statements where the subject<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // and object are the same node.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> Set<RDFNode> objects = new HashSet<RDFNode>();<a name="line.211"></a>
-<span class="sourceLineNo">212</span> for (StmtIterator i = m.listStatements(); i.hasNext();) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> Statement st = i.next();<a name="line.213"></a>
-<span class="sourceLineNo">214</span> RDFNode subject = st.getSubject();<a name="line.214"></a>
-<span class="sourceLineNo">215</span> RDFNode object = st.getObject();<a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (object.isResource() && ! object.equals(subject))<a name="line.216"></a>
-<span class="sourceLineNo">217</span> objects.add(object);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> for (ResIterator i = m.listSubjects(); i.hasNext();) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> Resource r = i.next();<a name="line.220"></a>
-<span class="sourceLineNo">221</span> if (! objects.contains(r))<a name="line.221"></a>
-<span class="sourceLineNo">222</span> l.add(r);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> return l;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> private <T> BeanMap<T> parseIntoBeanMap(RdfParserSession session, Resource r2, BeanMap<T> m) throws Exception {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> BeanMeta<T> bm = m.getMeta();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.230"></a>
-<span class="sourceLineNo">231</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> Statement st = i.next();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> Property p = st.getPredicate();<a name="line.234"></a>
-<span class="sourceLineNo">235</span> String key = session.decodeString(p.getLocalName());<a name="line.235"></a>
-<span class="sourceLineNo">236</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> session.setCurrentProperty(pMeta);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (pMeta != null) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> RDFNode o = st.getObject();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> if (cm.isCollectionOrArray() && isMultiValuedCollections(session, pMeta)) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> ClassMeta<?> et = cm.getElementType();<a name="line.242"></a>
-<span class="sourceLineNo">243</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> setName(et, value, key);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> pMeta.add(m, value);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> setName(cm, value, key);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> pMeta.set(m, value);<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> session.setCurrentProperty(null);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m;<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> private static boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (pMeta != null && pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> return session.getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.265"></a>
-<span class="sourceLineNo">266</span> private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> if (eType == null)<a name="line.268"></a>
-<span class="sourceLineNo">269</span> eType = (ClassMeta<T>)object();<a name="line.269"></a>
-<span class="sourceLineNo">270</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> session.setCurrentClass(sType);<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (! sType.canCreateNewInstance(outer)) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> if (n.isResource()) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> Statement st = n.asResource().getProperty(session.getTypeProperty());<a name="line.276"></a>
-<span class="sourceLineNo">277</span> if (st != null) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> String c = st.getLiteral().getString();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> ClassMeta tcm = session.getClassMeta(c, pMeta, eType);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (tcm != null)<a name="line.280"></a>
-<span class="sourceLineNo">281</span> sType = eType = tcm;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> Object o = null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> // Do nothing. Leave o == null.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> } else if (sType.isObject()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> if (n.isLiteral()) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> o = n.asLiteral().getValue();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> if (o instanceof String) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> o = session.decodeString(o);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> else if (n.isResource()) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> Resource r = n.asResource();<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (session.wasAlreadyProcessed(r))<a name="line.298"></a>
-<span class="sourceLineNo">299</span> o = r.getURI();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> else if (r.getProperty(session.getValueProperty()) != null) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer, null);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> } else if (isSeq(session, r)) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> o = new ObjectList(session);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.304"></a>
-<span class="sourceLineNo">305</span> } else if (isBag(session, r)) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> o = new ObjectList(session);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> } else if (r.canAs(RDFList.class)) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> o = new ObjectList(session);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> } else {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> // If it has a URI and no child properties, we interpret this as an<a name="line.312"></a>
-<span class="sourceLineNo">313</span> // external resource, and convert it to just a URL.<a name="line.313"></a>
-<span class="sourceLineNo">314</span> String uri = r.getURI();<a name="line.314"></a>
-<span class="sourceLineNo">315</span> if (uri != null && ! r.listProperties().hasNext()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> o = r.getURI();<a name="line.316"></a>
-<span class="sourceLineNo">317</span> } else {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> ObjectMap m2 = new ObjectMap(session);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> parseIntoMap(session, r, m2, null, null, pMeta);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> o = session.cast(m2, pMeta, eType);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span> } else {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } else if (sType.isBoolean()) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> o = session.convertToType(getValue(session, n, outer), boolean.class);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> } else if (sType.isCharSequence()) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> o = session.decodeString(getValue(session, n, outer));<a name="line.329"></a>
-<span class="sourceLineNo">330</span> } else if (sType.isChar()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> o = session.decodeString(getValue(session, n, outer)).charAt(0);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> } else if (sType.isNumber()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass());<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } else if (sType.isMap()) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> Resource r = n.asResource();<a name="line.335"></a>
-<span class="sourceLineNo">336</span> if (session.wasAlreadyProcessed(r))<a name="line.336"></a>
-<span class="sourceLineNo">337</span> return null;<a name="line.337"></a>
-<span class="sourceLineNo">338</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.338"></a>
-<span class="sourceLineNo">339</span> o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType(), pMeta);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> } else if (sType.isCollectionOrArray()) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> if (sType.isArray())<a name="line.341"></a>
-<span class="sourceLineNo">342</span> o = new ArrayList();<a name="line.342"></a>
-<span class="sourceLineNo">343</span> else<a name="line.343"></a>
-<span class="sourceLineNo">344</span> o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(session));<a name="line.344"></a>
-<span class="sourceLineNo">345</span> Resource r = n.asResource();<a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (session.wasAlreadyProcessed(r))<a name="line.346"></a>
-<span class="sourceLineNo">347</span> return null;<a name="line.347"></a>
-<span class="sourceLineNo">348</span> if (isSeq(session, r)) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> } else if (isBag(session, r)) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> } else if (r.canAs(RDFList.class)) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType(), pMeta);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> } else {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> throw new ParseException("Unrecognized node type ''{0}'' for collection", n);<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (sType.isArray())<a name="line.357"></a>
-<span class="sourceLineNo">358</span> o = session.toArray(sType, (Collection)o);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> Resource r = n.asResource();<a name="line.360"></a>
-<span class="sourceLineNo">361</span> if (session.wasAlreadyProcessed(r))<a name="line.361"></a>
-<span class="sourceLineNo">362</span> return null;<a name="line.362"></a>
-<span class="sourceLineNo">363</span> BeanMap<?> bm = session.newBeanMap(outer, sType.getInnerClass());<a name="line.363"></a>
-<span class="sourceLineNo">364</span> o = parseIntoBeanMap(session, r, bm).getBean();<a name="line.364"></a>
-<span class="sourceLineNo">365</span> } else if (sType.isUri() && n.isResource()) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));<a name="line.366"></a>
-<span class="sourceLineNo">367</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass()));<a name="line.370"></a>
-<span class="sourceLineNo">371</span> } else if (n.isResource()) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> Resource r = n.asResource();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> Map m = new ObjectMap(session);<a name="line.373"></a>
-<span class="sourceLineNo">374</span> parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.375"></a>
-<span class="sourceLineNo">376</span> o = session.cast((ObjectMap)m, pMeta, eType);<a name="line.376"></a>
-<span class="sourceLineNo">377</span> else<a name="line.377"></a>
-<span class="sourceLineNo">378</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.378"></a>
-<span class="sourceLineNo">379</span> } else {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> if (transform != null && o != null)<a name="line.383"></a>
-<span class="sourceLineNo">384</span> o = transform.unswap(session, o, eType);<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (outer != null)<a name="line.386"></a>
-<span class="sourceLineNo">387</span> setParent(eType, o, outer);<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> return (T)o;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> private static boolean isSeq(RdfParserSession session, RDFNode n) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (n.isResource()) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.394"></a>
-<span class="sourceLineNo">395</span> if (st != null)<a name="line.395"></a>
-<span class="sourceLineNo">396</span> return RDF_SEQ.equals(st.getResource().getURI());<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span> return false;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> private static boolean isBag(RdfParserSession session, RDFNode n) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> if (n.isResource()) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (st != null)<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return RDF_BAG.equals(st.getResource().getURI());<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return false;<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> private Object getValue(RdfParserSession session, RDFNode n, Object outer) throws Exception {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> if (n.isLiteral())<a name="line.411"></a>
-<span class="sourceLineNo">412</span> return n.asLiteral().getValue();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (n.isResource()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> Statement st = n.asResource().getProperty(session.getValueProperty());<a name="line.414"></a>
-<span class="sourceLineNo">415</span> if (st != null) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> n = st.getObject();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (n.isLiteral())<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return n.asLiteral().getValue();<a name="line.418"></a>
-<span class="sourceLineNo">419</span> return parseAnything(session, object(), st.getObject(), outer, null);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> throw new ParseException(session, "Unknown value type for node ''{0}''", n);<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> private <K,V> Map<K,V> parseIntoMap(RdfParserSession session, Resource r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> // Add URI as "uri" to generic maps.<a name="line.426"></a>
-<span class="sourceLineNo">427</span> if (r.getURI() != null) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> K uri = convertAttrToType(session, m, "uri", keyType);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> V value = convertAttrToType(session, m, r.getURI(), valueType);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> m.put(uri, value);<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for (StmtIterator i = r.listProperties(); i.hasNext();) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> Statement st = i.next();<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Property p = st.getPredicate();<a name="line.434"></a>
-<span class="sourceLineNo">435</span> String key = p.getLocalName();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (! (key.equals("root") && p.getURI().equals(session.getJuneauNsUri()))) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> key = session.decodeString(key);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> RDFNode o = st.getObject();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> K key2 = convertAttrToType(session, m, key, keyType);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> V value = parseAnything(session, valueType, o, m, pMeta);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> setName(valueType, value, key);<a name="line.441"></a>
-<span class="sourceLineNo">442</span> m.put(key2, value);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> return m;<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, Container c, Collection<E> l, ClassMeta<E> et, BeanPropertyMeta pMeta) throws Exception {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> for (NodeIterator ni = c.iterator(); ni.hasNext();) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> E e = parseAnything(session, et, ni.next(), l, pMeta);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> l.add(e);<a name="line.452"></a>
-<span class="sourceLineNo">453</span> }<a name="line.453"></a>
-<span class="sourceLineNo">454</span> return l;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, RDFList list, Collection<E> l, ClassMeta<E> et, BeanPropertyMeta pMeta) throws Exception {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> for (ExtendedIterator<RDFNode> ni = list.iterator(); ni.hasNext();) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span> E e = parseAnything(session, et, ni.next(), l, pMeta);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> l.add(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span> return l;<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> @Override /* Parser */<a name="line.465"></a>
-<span class="sourceLineNo">466</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> throw new UnsupportedOperationException("Parser '"+getClass().getName()+"' does not support this method.");<a name="line.467"></a>
-<span class="sourceLineNo">468</span> }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span> <a name="line.470"></a>
-<span class="sourceLineNo">471</span> //--------------------------------------------------------------------------------<a name="line.471"></a>
-<span class="sourceLineNo">472</span> // Entry point methods<a name="line.472"></a>
-<span class="sourceLineNo">473</span> //--------------------------------------------------------------------------------<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> @Override /* Parser */<a name="line.475"></a>
-<span class="sourceLineNo">476</span> public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span>}<a name="line.479"></a>
+<span class="sourceLineNo">176</span> <a name="line.176"></a>
+<span class="sourceLineNo">177</span> int argIndex = 0;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> for (Resource resource : roots)<a name="line.178"></a>
+<span class="sourceLineNo">179</span> c.add(parseAnything(s, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), resource, session.getOuter(), null));<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> if (type.isArray() || type.isArgs())<a name="line.181"></a>
+<span class="sourceLineNo">182</span> return (T)session.toArray(type, c);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> return (T)c;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (roots.isEmpty())<a name="line.186"></a>
+<span class="sourceLineNo">187</span> return null;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (roots.size() > 1)<a name="line.188"></a>
+<span class="sourceLineNo">189</span> throw new ParseException(session, "Too many root nodes found in model: {0}", roots.size());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> Resource resource = roots.get(0);<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> return parseAnything(s, type, resource, session.getOuter(), null);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<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> * Finds the roots in the model using either the "root" property to identify it,<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * or by resorting to scanning the model for all nodes with no incoming predicates.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> */<a name="line.198"></a>
+<span class="sourceLineNo">199</span> private static List<Resource> getRoots(RdfParserSession session, Model m) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> List<Resource> l = new LinkedList<Resource>();<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> // First try to find the root using the "http://www.apache.org/juneau/root" property.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> Property root = m.createProperty(session.getJuneauNsUri(), RDF_juneauNs_ROOT);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> for (ResIterator i = m.listResourcesWithProperty(root); i.hasNext();)<a name="line.204"></a>
+<span class="sourceLineNo">205</span> l.add(i.next());<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> if (! l.isEmpty())<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return l;<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> // Otherwise, we need to find all resources that aren't objects.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> // We want to explicitly ignore statements where the subject<a name="line.211"></a>
+<span class="sourceLineNo">212</span> // and object are the same node.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> Set<RDFNode> objects = new HashSet<RDFNode>();<a name="line.213"></a>
+<span class="sourceLineNo">214</span> for (StmtIterator i = m.listStatements(); i.hasNext();) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> Statement st = i.next();<a name="line.215"></a>
+<span class="sourceLineNo">216</span> RDFNode subject = st.getSubject();<a name="line.216"></a>
+<span class="sourceLineNo">217</span> RDFNode object = st.getObject();<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (object.isResource() && ! object.equals(subject))<a name="line.218"></a>
+<span class="sourceLineNo">219</span> objects.add(object);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> for (ResIterator i = m.listSubjects(); i.hasNext();) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> Resource r = i.next();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> if (! objects.contains(r))<a name="line.223"></a>
+<span class="sourceLineNo">224</span> l.add(r);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span> return l;<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> private <T> BeanMap<T> parseIntoBeanMap(RdfParserSession session, Resource r2, BeanMap<T> m) throws Exception {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> BeanMeta<T> bm = m.getMeta();<a name="line.230"></a>
+<span class="sourceLineNo">231</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.232"></a>
+<span class="sourceLineNo">233</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.233"></a>
+<span class="sourceLineNo">234</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> Statement st = i.next();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> Property p = st.getPredicate();<a name="line.236"></a>
+<span class="sourceLineNo">237</span> String key = session.decodeString(p.getLocalName());<a name="line.237"></a>
+<span class="sourceLineNo">238</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> session.setCurrentProperty(pMeta);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (pMeta != null) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> RDFNode o = st.getObject();<a name="line.241"></a>
+<span class="sourceLineNo">242</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> if (cm.isCollectionOrArray() && isMultiValuedCollections(session, pMeta)) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> ClassMeta<?> et = cm.getElementType();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> setName(et, value, key);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> pMeta.add(m, value);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> } else {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> setName(cm, value, key);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> pMeta.set(m, value);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> session.setCurrentProperty(null);<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return m;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> private static boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> if (pMeta != null && pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.262"></a>
+<span class="sourceLineNo">263</span> return pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> return session.getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.267"></a>
+<span class="sourceLineNo">268</span> private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> if (eType == null)<a name="line.270"></a>
+<span class="sourceLineNo">271</span> eType = (ClassMeta<T>)object();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.273"></a>
+<span class="sourceLineNo">274</span> session.setCurrentClass(sType);<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> if (! sType.canCreateNewInstance(outer)) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (n.isResource()) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> Statement st = n.asResource().getProperty(session.getTypeProperty());<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (st != null) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> String c = st.getLiteral().getString();<a name="line.280"></a>
+<span class="sourceLineNo">281</span> ClassMeta tcm = session.getClassMeta(c, pMeta, eType);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (tcm != null)<a name="line.282"></a>
+<span class="sourceLineNo">283</span> sType = eType = tcm;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> Object o = null;<a name="line.288"></a>
+<span class="sourceLineNo">289</span> if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // Do nothing. Leave o == null.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> } else if (sType.isObject()) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (n.isLiteral()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> o = n.asLiteral().getValue();<a name="line.293"></a>
+<span class="sourceLineNo">294</span> if (o instanceof String) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> o = session.decodeString(o);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> else if (n.isResource()) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> Resource r = n.asResource();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> if (session.wasAlreadyProcessed(r))<a name="line.300"></a>
+<span class="sourceLineNo">301</span> o = r.getURI();<a name="line.301"></a>
+<span class="sourceLineNo">302</span> else if (r.getProperty(session.getValueProperty()) != null) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer, null);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> } else if (isSeq(session, r)) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> o = new ObjectList(session);<a name="line.305"></a>
+<span class="sourceLineNo">306</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType, pMeta);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> } else if (isBag(session, r)) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> o = new ObjectList(session);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType, pMeta);<a name="line.309"></a>
+<span class="sourceLineNo">310</span> } else if (r.canAs(RDFList.class)) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> o = new ObjectList(session);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType, pMeta);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> } else {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> // If it has a URI and no child properties, we interpret this as an<a name="line.314"></a>
+<span class="sourceLineNo">315</span> // external resource, and convert it to just a URL.<a name="line.315"></a>
+<span class="sourceLineNo">316</span> String uri = r.getURI();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (uri != null && ! r.listProperties().hasNext()) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> o = r.getURI();<a name="line.318"></a>
+<span class="sourceLineNo">319</span> } else {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> ObjectMap m2 = new ObjectMap(session);<a name="line.320"></a>
+<span class="sourceLineNo">321</span> parseIntoMap(session, r, m2, null, null, pMeta);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> o = session.cast(m2, pMeta, eType);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span> } else {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span> } else if (sType.isBoolean()) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> o = session.convertToType(getValue(session, n, outer), boolean.class);<a name="line.329"></a>
+<span class="sourceLineNo">330</span> } else if (sType.isCharSequence()) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> o = session.decodeString(getValue(session, n, outer));<a name="line.331"></a>
+<span class="sourceLineNo">332</span> } else if (sType.isChar()) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> o = session.decodeString(getValue(session, n, outer)).charAt(0);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> } else if (sType.isNumber()) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass());<a name="line.335"></a>
+<span class="sourceLineNo">336</span> } else if (sType.isMap()) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> Resource r = n.asResource();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> if (session.wasAlreadyProcessed(r))<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return null;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.340"></a>
+<span class="sourceLineNo">341</span> o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType(), pMeta);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> } else if (sType.isCollectionOrArray() || sType.isArgs()) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> if (sType.isArray() || sType.isArgs())<a name="line.343"></a>
+<span class="sourceLineNo">344</span> o = new ArrayList();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> else<a name="line.345"></a>
+<span class="sourceLineNo">346</span> o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(session));<a name="line.346"></a>
+<span class="sourceLineNo">347</span> Resource r = n.asResource();<a name="line.347"></a>
+<span class="sourceLineNo">348</span> if (session.wasAlreadyProcessed(r))<a name="line.348"></a>
+<span class="sourceLineNo">349</span> return null;<a name="line.349"></a>
+<span class="sourceLineNo">350</span> if (isSeq(session, r)) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType, pMeta);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> } else if (isBag(session, r)) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType, pMeta);<a name="line.353"></a>
+<span class="sourceLineNo">354</span> } else if (r.canAs(RDFList.class)) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType, pMeta);<a name="line.355"></a>
+<span class="sourceLineNo">356</span> } else {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> throw new ParseException("Unrecognized node type ''{0}'' for collection", n);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> if (sType.isArray() || sType.isArgs())<a name="line.359"></a>
+<span class="sourceLineNo">360</span> o = session.toArray(sType, (Collection)o);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> Resource r = n.asResource();<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (session.wasAlreadyProcessed(r))<a name="line.363"></a>
+<span class="sourceLineNo">364</span> return null;<a name="line.364"></a>
+<span class="sourceLineNo">365</span> BeanMap<?> bm = session.newBeanMap(outer, sType.getInnerClass());<a name="line.365"></a>
+<span class="sourceLineNo">366</span> o = parseIntoBeanMap(session, r, bm).getBean();<a name="line.366"></a>
+<span class="sourceLineNo">367</span> } else if (sType.isUri() && n.isResource()) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));<a name="line.368"></a>
+<span class="sourceLineNo">369</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));<a name="line.370"></a>
+<span class="sourceLineNo">371</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass()));<a name="line.372"></a>
+<span class="sourceLineNo">373</span> } else if (n.isResource()) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> Resource r = n.asResource();<a name="line.374"></a>
+<span class="sourceLineNo">375</span> Map m = new ObjectMap(session);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.377"></a>
+<span class="sourceLineNo">378</span> o = session.cast((ObjectMap)m, pMeta, eType);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> else<a name="line.379"></a>
+<span class="sourceLineNo">380</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.380"></a>
+<span class="sourceLineNo">381</span> } else {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (transform != null && o != null)<a name="line.385"></a>
+<span class="sourceLineNo">386</span> o = transform.unswap(session, o, eType);<a name="line.386"></a>
+<span class="sourceLineNo">387</span><a name="line.387"></a>
+<span class="sourceLineNo">388</span> if (outer != null)<a name="line.388"></a>
+<span class="sourceLineNo">389</span> setParent(eType, o, outer);<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> return (T)o;<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> private static boolean isSeq(RdfParserSession session, RDFNode n) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (n.isResource()) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.396"></a>
+<span class="sourceLineNo">397</span> if (st != null)<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return RDF_SEQ.equals(st.getResource().getURI());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> return false;<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> private static boolean isBag(RdfParserSession session, RDFNode n) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> if (n.isResource()) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> Statement st = n.asResource().getProperty(session.getRdfTypeProperty());<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if (st != null)<a name="line.406"></a>
+<span class="sourceLineNo">407</span> return RDF_BAG.equals(st.getResource().getURI());<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span> return false;<a name="line.409"></a>
+<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span> private Object getValue(RdfParserSession session, RDFNode n, Object outer) throws Exception {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> if (n.isLiteral())<a name="line.413"></a>
+<span class="sourceLineNo">414</span> return n.asLiteral().getValue();<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (n.isResource()) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> Statement st = n.asResource().getProperty(session.getValueProperty());<a name="line.416"></a>
+<span class="sourceLineNo">417</span> if (st != null) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> n = st.getObject();<a name="line.418"></a>
+<span class="sourceLineNo">419</span> if (n.isLiteral())<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return n.asLiteral().getValue();<a name="line.420"></a>
+<span class="sourceLineNo">421</span> return parseAnything(session, object(), st.getObject(), outer, null);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span> }<a name="line.423"></a>
+<span class="sourceLineNo">424</span> throw new ParseException(session, "Unknown value type for node ''{0}''", n);<a name="line.424"></a>
+<span class="sourceLineNo">425</span> }<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> private <K,V> Map<K,V> parseIntoMap(RdfParserSession session, Resource r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> // Add URI as "uri" to generic maps.<a name="line.428"></a>
+<span class="sourceLineNo">429</span> if (r.getURI() != null) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> K uri = convertAttrToType(session, m, "uri", keyType);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> V value = convertAttrToType(session, m, r.getURI(), valueType);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> m.put(uri, value);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> for (StmtIterator i = r.listProperties(); i.hasNext();) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> Statement st = i.next();<a name="line.435"></a>
+<span class="sourceLineNo">436</span> Property p = st.getPredicate();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> String key = p.getLocalName();<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (! (key.equals("root") && p.getURI().equals(session.getJuneauNsUri()))) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> key = session.decodeString(key);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> RDFNode o = st.getObject();<a name="line.440"></a>
+<span class="sourceLineNo">441</span> K key2 = convertAttrToType(session, m, key, keyType);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> V value = parseAnything(session, valueType, o, m, pMeta);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> setName(valueType, value, key);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> m.put(key2, value);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> }<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span> return m;<a name="line.448"></a>
+<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> @SuppressWarnings("unchecked")<a name="line.451"></a>
+<span class="sourceLineNo">452</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, Container c, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> int argIndex = 0;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> for (NodeIterator ni = c.iterator(); ni.hasNext();) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> E e = (E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), ni.next(), l, pMeta);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> l.add(e);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return l;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span> @SuppressWarnings("unchecked")<a name="line.461"></a>
+<span class="sourceLineNo">462</span> private <E> Collection<E> parseIntoCollection(RdfParserSession session, RDFList list, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> int argIndex = 0;<a name="line.463"></a>
+<span class="sourceLineNo">464</span> for (ExtendedIterator<RDFNode> ni = list.iterator(); ni.hasNext();) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> E e = (E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), ni.next(), l, pMeta);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> l.add(e);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span> return l;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> }<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span> <a name="line.471"></a>
+<span class="sourceLineNo">472</span> //--------------------------------------------------------------------------------<a name="line.472"></a>
+<span class="sourceLineNo">473</span> // Entry point methods<a name="line.473"></a>
+<span class="sourceLineNo">474</span> //--------------------------------------------------------------------------------<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span> @Override /* Parser */<a name="line.476"></a>
+<span class="sourceLineNo">477</span> public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span> return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.478"></a>
+<span class="sourceLineNo">479</span> }<a name="line.479"></a>
+<span class="sourceLineNo">480</span>}<a name="line.480"></a>
[25/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializer.html
index c4ba251..4b7b896 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializer.html
@@ -120,7 +120,7 @@
<span class="sourceLineNo">112</span> String title = s.getTitle();<a name="line.112"></a>
<span class="sourceLineNo">113</span> if (title == null && isOptionsPage)<a name="line.113"></a>
<span class="sourceLineNo">114</span> title = "Options";<a name="line.114"></a>
-<span class="sourceLineNo">115</span> String description = s.getDescription();<a name="line.115"></a>
+<span class="sourceLineNo">115</span> String description = s.getText();<a name="line.115"></a>
<span class="sourceLineNo">116</span> if (title != null)<a name="line.116"></a>
<span class="sourceLineNo">117</span> w.oTag(1, "h3").attr("class", "title").append('>').text(title).eTag("h3").nl();<a name="line.117"></a>
<span class="sourceLineNo">118</span> if (description != null)<a name="line.118"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerContext.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerContext.html
index 2269437..4fda3a2 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerContext.html
@@ -43,229 +43,268 @@
<span class="sourceLineNo">035</span> * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {<a name="line.35"></a>
<span class="sourceLineNo">036</span> * </p><a name="line.36"></a>
<span class="sourceLineNo">037</span> * <p><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * The <code>$L{...}</code> variable represent localized strings pulled from the resource bundle identified by the <code>messages</code> annotation.<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * These variables are replaced at runtime based on the HTTP request locale.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * Several built-in runtime variable types are defined, and the API can be extended to include user-defined variables.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <h5 class='section'>Inherited configurable properties:</h5><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <ul class='javahierarchy'><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <li class='c'><a class="doclink" href="../BeanContext.html#ConfigProperties">BeanContext</a> - Properties associated with handling beans on serializers and parsers.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <ul><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <li class='c'><a class="doclink" href="../serializer/SerializerContext.html#ConfigProperties">SerializerContext</a> - Configurable properties common to all serializers.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <ul><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * <li class='c'><a class="doclink" href="../html/HtmlSerializerContext.html#ConfigProperties">HtmlSerializerContext</a> - Configurable properties on the HTML serializer.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * </ul><a name="line.49"></a>
-<span class="sourceLineNo">050</span> * </ul><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * </ul><a name="line.51"></a>
-<span class="sourceLineNo">052</span> */<a name="line.52"></a>
-<span class="sourceLineNo">053</span>public final class HtmlDocSerializerContext extends HtmlSerializerContext {<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <b>Configuration property:</b> Page title.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <p><a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <ul><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * <li><b>Name:</b> <js>"HtmlSerializer.title"</js><a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <li><b>Data type:</b> <code>String</code><a name="line.60"></a>
-<span class="sourceLineNo">061</span> * <li><b>Default:</b> <jk>null</jk><a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.62"></a>
-<span class="sourceLineNo">063</span> * </ul><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * <p><a name="line.64"></a>
-<span class="sourceLineNo">065</span> *<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * <h5 class='section'>Example:</h5><a name="line.66"></a>
-<span class="sourceLineNo">067</span> * <p><a name="line.67"></a>
-<span class="sourceLineNo">068</span> * The <code>AddressBookResource</code> sample class uses this property...<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * </p><a name="line.69"></a>
-<span class="sourceLineNo">070</span> * <p class='bcode'><a name="line.70"></a>
-<span class="sourceLineNo">071</span> * <ja>@RestResource</ja>(<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * messages=<js>"nls/AddressBookResource"</js>,<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * properties={<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, value=<js>"$L{title}"</js>)<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * }<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * )<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * </p><a name="line.78"></a>
+<span class="sourceLineNo">038</span> * Note that shortcut annotations are also provided for these particular settings:<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * <p class='bcode'><a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <ja>@RestResource</ja>(<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * messages=<js>"nls/AddressBookResource"</js>,<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * title=<js>"$L{title}"</js>, <jc>// or pageTitle</jc><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * description=<js>"$L{description}"</js>, <jc>// or pageText</jc><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * pageLinks=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js><a name="line.44"></a>
+<span class="sourceLineNo">045</span> * )<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * </p><a name="line.47"></a>
+<span class="sourceLineNo">048</span> *<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
+<span class="sourceLineNo">050</span> * The <code>$L{...}</code> variable represent localized strings pulled from the resource bundle identified by the <code>messages</code> annotation.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * These variables are replaced at runtime based on the HTTP request locale.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * Several built-in runtime variable types are defined, and the API can be extended to include user-defined variables.<a name="line.52"></a>
+<span class="sourceLineNo">053</span> *<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <h5 class='section'>Inherited configurable properties:</h5><a name="line.54"></a>
+<span class="sourceLineNo">055</span> * <ul class='javahierarchy'><a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <li class='c'><a class="doclink" href="../BeanContext.html#ConfigProperties">BeanContext</a> - Properties associated with handling beans on serializers and parsers.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <ul><a name="line.57"></a>
+<span class="sourceLineNo">058</span> * <li class='c'><a class="doclink" href="../serializer/SerializerContext.html#ConfigProperties">SerializerContext</a> - Configurable properties common to all serializers.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <ul><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * <li class='c'><a class="doclink" href="../html/HtmlSerializerContext.html#ConfigProperties">HtmlSerializerContext</a> - Configurable properties on the HTML serializer.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * </ul><a name="line.61"></a>
+<span class="sourceLineNo">062</span> * </ul><a name="line.62"></a>
+<span class="sourceLineNo">063</span> * </ul><a name="line.63"></a>
+<span class="sourceLineNo">064</span> */<a name="line.64"></a>
+<span class="sourceLineNo">065</span>public final class HtmlDocSerializerContext extends HtmlSerializerContext {<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> /**<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <b>Configuration property:</b> Page title.<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * <p><a name="line.69"></a>
+<span class="sourceLineNo">070</span> * <ul><a name="line.70"></a>
+<span class="sourceLineNo">071</span> * <li><b>Name:</b> <js>"HtmlSerializer.title"</js><a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <li><b>Data type:</b> <code>String</code><a name="line.72"></a>
+<span class="sourceLineNo">073</span> * <li><b>Default:</b> <jk>null</jk><a name="line.73"></a>
+<span class="sourceLineNo">074</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.74"></a>
+<span class="sourceLineNo">075</span> * </ul><a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <p><a name="line.76"></a>
+<span class="sourceLineNo">077</span> *<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <h5 class='section'>Example:</h5><a name="line.78"></a>
<span class="sourceLineNo">079</span> * <p><a name="line.79"></a>
-<span class="sourceLineNo">080</span> * ...with this property in <code>AddressBookResource.properties</code>...<a name="line.80"></a>
+<span class="sourceLineNo">080</span> * The <code>AddressBookResource</code> sample class uses this property...<a name="line.80"></a>
<span class="sourceLineNo">081</span> * </p><a name="line.81"></a>
<span class="sourceLineNo">082</span> * <p class='bcode'><a name="line.82"></a>
-<span class="sourceLineNo">083</span> * title = <js>AddressBook sample resource</js><a name="line.83"></a>
-<span class="sourceLineNo">084</span> * </p><a name="line.84"></a>
-<span class="sourceLineNo">085</span> * <p><a name="line.85"></a>
-<span class="sourceLineNo">086</span> * ...to produce this title on the HTML page...<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * </p><a name="line.87"></a>
-<span class="sourceLineNo">088</span> * <img class='bordered' src='doc-files/HTML_TITLE.png'><a name="line.88"></a>
-<span class="sourceLineNo">089</span> */<a name="line.89"></a>
-<span class="sourceLineNo">090</span> public static final String HTMLDOC_title = "HtmlSerializer.title";<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * <b>Configuration property:</b> Page description.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * <p><a name="line.94"></a>
-<span class="sourceLineNo">095</span> * <ul><a name="line.95"></a>
-<span class="sourceLineNo">096</span> * <li><b>Name:</b> <js>"HtmlSerializer.description"</js><a name="line.96"></a>
-<span class="sourceLineNo">097</span> * <li><b>Data type:</b> <code>String</code><a name="line.97"></a>
-<span class="sourceLineNo">098</span> * <li><b>Default:</b> <jk>null</jk><a name="line.98"></a>
-<span class="sourceLineNo">099</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.99"></a>
-<span class="sourceLineNo">100</span> * </ul><a name="line.100"></a>
+<span class="sourceLineNo">083</span> * <ja>@RestResource</ja>(<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * messages=<js>"nls/AddressBookResource"</js>,<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * properties={<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, value=<js>"$L{title}"</js>)<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * }<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * )<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * </p><a name="line.90"></a>
+<span class="sourceLineNo">091</span> * <p><a name="line.91"></a>
+<span class="sourceLineNo">092</span> * ...with this property in <code>AddressBookResource.properties</code>...<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * </p><a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <p class='bcode'><a name="line.94"></a>
+<span class="sourceLineNo">095</span> * title = <js>AddressBook sample resource</js><a name="line.95"></a>
+<span class="sourceLineNo">096</span> * </p><a name="line.96"></a>
+<span class="sourceLineNo">097</span> * <p><a name="line.97"></a>
+<span class="sourceLineNo">098</span> * ...to produce this title on the HTML page...<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * </p><a name="line.99"></a>
+<span class="sourceLineNo">100</span> * <img class='bordered' src='doc-files/HTML_TITLE.png'><a name="line.100"></a>
<span class="sourceLineNo">101</span> * <p><a name="line.101"></a>
-<span class="sourceLineNo">102</span> *<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * <h5 class='section'>Example:</h5><a name="line.103"></a>
-<span class="sourceLineNo">104</span> * <p><a name="line.104"></a>
-<span class="sourceLineNo">105</span> * The <code>AddressBookResource</code> sample class uses this property...<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * </p><a name="line.106"></a>
-<span class="sourceLineNo">107</span> * <p class='bcode'><a name="line.107"></a>
-<span class="sourceLineNo">108</span> * <ja>@RestResource</ja>(<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * messages=<js>"nls/AddressBookResource"</js>,<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * properties={<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"description"</js>, type=<jsf>NLS</jsf>)<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * )<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * </p><a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <p><a name="line.116"></a>
-<span class="sourceLineNo">117</span> * ...with this property in <code>AddressBookResource.properties</code>...<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * </p><a name="line.118"></a>
-<span class="sourceLineNo">119</span> * <p class='bcode'><a name="line.119"></a>
-<span class="sourceLineNo">120</span> * description = <js>Simple address book POJO sample resource</js><a name="line.120"></a>
-<span class="sourceLineNo">121</span> * </p><a name="line.121"></a>
+<span class="sourceLineNo">102</span> * Shortcuts on <ja>@RestResource</ja> are also provided for this setting:<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * <p class='bcode'><a name="line.103"></a>
+<span class="sourceLineNo">104</span> * <ja>@RestResource</ja>(<a name="line.104"></a>
+<span class="sourceLineNo">105</span> * messages=<js>"nls/AddressBookResource"</js>,<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * title=<js>"My title"</js>, <jc>// or pageTitle</jc><a name="line.106"></a>
+<span class="sourceLineNo">107</span> * )<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * </p><a name="line.109"></a>
+<span class="sourceLineNo">110</span> */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> public static final String HTMLDOC_title = "HtmlSerializer.title";<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> /**<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * <b>Configuration property:</b> Page description.<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <p><a name="line.115"></a>
+<span class="sourceLineNo">116</span> * <ul><a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <li><b>Name:</b> <js>"HtmlSerializer.description"</js><a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <li><b>Data type:</b> <code>String</code><a name="line.118"></a>
+<span class="sourceLineNo">119</span> * <li><b>Default:</b> <jk>null</jk><a name="line.119"></a>
+<span class="sourceLineNo">120</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.120"></a>
+<span class="sourceLineNo">121</span> * </ul><a name="line.121"></a>
<span class="sourceLineNo">122</span> * <p><a name="line.122"></a>
-<span class="sourceLineNo">123</span> * ...to produce this description on the HTML page...<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * </p><a name="line.124"></a>
-<span class="sourceLineNo">125</span> * <img class='bordered' src='doc-files/HTML_DESCRIPTION.png'><a name="line.125"></a>
-<span class="sourceLineNo">126</span> */<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public static final String HTMLDOC_description = "HtmlSerializer.description";<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * <b>Configuration property:</b> Page links.<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * <p><a name="line.131"></a>
-<span class="sourceLineNo">132</span> * <ul><a name="line.132"></a>
-<span class="sourceLineNo">133</span> * <li><b>Name:</b> <js>"HtmlDocSerializer.links.map"</js><a name="line.133"></a>
-<span class="sourceLineNo">134</span> * <li><b>Data type:</b> <code>Map&lt;String,String&gt;</code><a name="line.134"></a>
-<span class="sourceLineNo">135</span> * <li><b>Default:</b> empty map<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.136"></a>
-<span class="sourceLineNo">137</span> * </ul><a name="line.137"></a>
-<span class="sourceLineNo">138</span> * <p><a name="line.138"></a>
-<span class="sourceLineNo">139</span> * Adds a list of hyperlinks immediately under the title and description but above the content of the page.<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * <p><a name="line.140"></a>
-<span class="sourceLineNo">141</span> * This can be used to provide convenient hyperlinks when viewing the REST interface from a browser.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * <p><a name="line.142"></a>
-<span class="sourceLineNo">143</span> * The value is a JSON object string where the keys are anchor text and the values are URLs.<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * <p><a name="line.144"></a>
-<span class="sourceLineNo">145</span> * Relative URLs are considered relative to the servlet path.<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * For example, if the servlet path is <js>"http://localhost/myContext/myServlet"</js>, and the<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * URL is <js>"foo"</js>, the link becomes <js>"http://localhost/myContext/myServlet/foo"</js>.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * Absolute (<js>"/myOtherContext/foo"</js>) and fully-qualified (<js>"http://localhost2/foo"</js>) URLs<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * can also be used.<a name="line.149"></a>
-<span class="sourceLineNo">150</span> *<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * <h5 class='section'>Example:</h5><a name="line.151"></a>
-<span class="sourceLineNo">152</span> * <p><a name="line.152"></a>
-<span class="sourceLineNo">153</span> * The <code>AddressBookResource</code> sample class uses this property...<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * </p><a name="line.154"></a>
-<span class="sourceLineNo">155</span> * <p class='bcode'><a name="line.155"></a>
-<span class="sourceLineNo">156</span> * <ja>@RestResource</ja>(<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * messages=<js>"nls/AddressBookResource"</js>,<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * properties={<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>)<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * }<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * )<a name="line.161"></a>
-<span class="sourceLineNo">162</span> * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * </p><a name="line.163"></a>
-<span class="sourceLineNo">164</span> * <p><a name="line.164"></a>
-<span class="sourceLineNo">165</span> * ...to produce this list of links on the HTML page...<a name="line.165"></a>
-<span class="sourceLineNo">166</span> * </p><a name="line.166"></a>
-<span class="sourceLineNo">167</span> * <img class='bordered' src='doc-files/HTML_LINKS.png'><a name="line.167"></a>
-<span class="sourceLineNo">168</span> */<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public static final String HTMLDOC_links = "HtmlDocSerializer.links.map";<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> /**<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * <b>Configuration property:</b> Add to the {@link #HTMLDOC_links} property.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> */<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public static final String HTMLDOC_links_put = "HtmlDocSerializer.links.map.put";<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> /**<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * <b>Configuration property:</b> Stylesheet URL.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * <p><a name="line.178"></a>
-<span class="sourceLineNo">179</span> * <ul><a name="line.179"></a>
-<span class="sourceLineNo">180</span> * <li><b>Name:</b> <js>"HtmlDocSerializer.cssUrl"</js><a name="line.180"></a>
-<span class="sourceLineNo">181</span> * <li><b>Data type:</b> <code>String</code><a name="line.181"></a>
-<span class="sourceLineNo">182</span> * <li><b>Default:</b> <js>"style.css"</js><a name="line.182"></a>
-<span class="sourceLineNo">183</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.183"></a>
-<span class="sourceLineNo">184</span> * </ul><a name="line.184"></a>
-<span class="sourceLineNo">185</span> * <p><a name="line.185"></a>
-<span class="sourceLineNo">186</span> * Adds a link to the specified stylesheet URL.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * <p><a name="line.187"></a>
-<span class="sourceLineNo">188</span> * If not specified, defaults to the built-in stylesheet located at <js>"style.css"</js>.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Note that this stylesheet is controlled by the <code><ja>@RestResource</ja>.stylesheet()</code> annotation.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> */<a name="line.190"></a>
-<span class="sourceLineNo">191</span> public static final String HTMLDOC_cssUrl = "HtmlDocSerializer.cssUrl";<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> /**<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * <b>Configuration property:</b> CSS imports.<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <p><a name="line.195"></a>
-<span class="sourceLineNo">196</span> * <ul><a name="line.196"></a>
-<span class="sourceLineNo">197</span> * <li><b>Name:</b> <js>"HtmlDocSerializer.cssImports.list"</js><a name="line.197"></a>
-<span class="sourceLineNo">198</span> * <li><b>Data type:</b> <code>List&lt;String&gt;</code><a name="line.198"></a>
-<span class="sourceLineNo">199</span> * <li><b>Default:</b> empty list<a name="line.199"></a>
-<span class="sourceLineNo">200</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.200"></a>
-<span class="sourceLineNo">201</span> * </ul><a name="line.201"></a>
-<span class="sourceLineNo">202</span> * <p><a name="line.202"></a>
-<span class="sourceLineNo">203</span> * Imports the specified CSS page URLs into the page.<a name="line.203"></a>
-<span class="sourceLineNo">204</span> */<a name="line.204"></a>
-<span class="sourceLineNo">205</span> public static final String HTMLDOC_cssImports = "HtmlDocSerializer.cssImports.list";<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> /**<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * <b>Configuration property:</b> Add to the {@link #HTMLDOC_cssImports} property.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> */<a name="line.209"></a>
-<span class="sourceLineNo">210</span> public static final String HTMLDOC_cssImports_add = "HtmlDocSerializer.cssImports.list.add";<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span> /**<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * <b>Configuration property:</b> Prevent word wrap on page.<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * <p><a name="line.214"></a>
-<span class="sourceLineNo">215</span> * <ul><a name="line.215"></a>
-<span class="sourceLineNo">216</span> * <li><b>Name:</b> <js>"HtmlDocSerializer.nowrap"</js><a name="line.216"></a>
-<span class="sourceLineNo">217</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.217"></a>
-<span class="sourceLineNo">218</span> * <li><b>Default:</b> <jk>false</jk><a name="line.218"></a>
-<span class="sourceLineNo">219</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.219"></a>
-<span class="sourceLineNo">220</span> * </ul><a name="line.220"></a>
-<span class="sourceLineNo">221</span> * <p><a name="line.221"></a>
-<span class="sourceLineNo">222</span> * Adds <js>"* {white-space:nowrap}"</js> to the style header to prevent word wrapping.<a name="line.222"></a>
-<span class="sourceLineNo">223</span> */<a name="line.223"></a>
-<span class="sourceLineNo">224</span> public static final String HTMLDOC_nowrap = "HtmlDocSerializer.nowrap";<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> final String[] cssImports;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> final Map<String,String> links;<a name="line.227"></a>
-<span class="sourceLineNo">228</span> final String title, description, cssUrl;<a name="line.228"></a>
-<span class="sourceLineNo">229</span> final boolean nowrap;<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> /**<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * Constructor.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * <p><a name="line.233"></a>
-<span class="sourceLineNo">234</span> * Typically only called from {@link PropertyStore#getContext(Class)}.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> *<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * @param ps The property store that created this context.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> */<a name="line.237"></a>
-<span class="sourceLineNo">238</span> public HtmlDocSerializerContext(PropertyStore ps) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> super(ps);<a name="line.239"></a>
-<span class="sourceLineNo">240</span> cssImports = ps.getProperty(HTMLDOC_cssImports, String[].class, new String[0]);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> title = ps.getProperty(HTMLDOC_title, String.class, null);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> description = ps.getProperty(HTMLDOC_description, String.class, null);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> cssUrl = ps.getProperty(HTMLDOC_cssUrl, String.class, null);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> nowrap = ps.getProperty(HTMLDOC_nowrap, boolean.class, false);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> links = ps.getMap(HTMLDOC_links, String.class, String.class, Collections.<String,String>emptyMap());<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> @Override /* Context */<a name="line.248"></a>
-<span class="sourceLineNo">249</span> public ObjectMap asMap() {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> return super.asMap()<a name="line.250"></a>
-<span class="sourceLineNo">251</span> .append("HtmlDocSerializerContext", new ObjectMap()<a name="line.251"></a>
-<span class="sourceLineNo">252</span> .append("cssImports", cssImports)<a name="line.252"></a>
-<span class="sourceLineNo">253</span> .append("title", title)<a name="line.253"></a>
-<span class="sourceLineNo">254</span> .append("description", description)<a name="line.254"></a>
-<span class="sourceLineNo">255</span> .append("cssUrl", cssUrl)<a name="line.255"></a>
-<span class="sourceLineNo">256</span> .append("nowrap", nowrap)<a name="line.256"></a>
-<span class="sourceLineNo">257</span> .append("links", links)<a name="line.257"></a>
-<span class="sourceLineNo">258</span> );<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span>}<a name="line.260"></a>
+<span class="sourceLineNo">123</span> *<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * <h5 class='section'>Example:</h5><a name="line.124"></a>
+<span class="sourceLineNo">125</span> * <p><a name="line.125"></a>
+<span class="sourceLineNo">126</span> * The <code>AddressBookResource</code> sample class uses this property...<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * </p><a name="line.127"></a>
+<span class="sourceLineNo">128</span> * <p class='bcode'><a name="line.128"></a>
+<span class="sourceLineNo">129</span> * <ja>@RestResource</ja>(<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * messages=<js>"nls/AddressBookResource"</js>,<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * properties={<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"My description"</js>)<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * }<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * )<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * </p><a name="line.136"></a>
+<span class="sourceLineNo">137</span> * <p><a name="line.137"></a>
+<span class="sourceLineNo">138</span> * ...with this property in <code>AddressBookResource.properties</code>...<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * </p><a name="line.139"></a>
+<span class="sourceLineNo">140</span> * <p class='bcode'><a name="line.140"></a>
+<span class="sourceLineNo">141</span> * description = <js>Simple address book POJO sample resource</js><a name="line.141"></a>
+<span class="sourceLineNo">142</span> * </p><a name="line.142"></a>
+<span class="sourceLineNo">143</span> * <p><a name="line.143"></a>
+<span class="sourceLineNo">144</span> * ...to produce this description on the HTML page...<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * </p><a name="line.145"></a>
+<span class="sourceLineNo">146</span> * <img class='bordered' src='doc-files/HTML_DESCRIPTION.png'><a name="line.146"></a>
+<span class="sourceLineNo">147</span> * <p><a name="line.147"></a>
+<span class="sourceLineNo">148</span> * Shortcuts on <ja>@RestResource</ja> are also provided for this setting:<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * <p class='bcode'><a name="line.149"></a>
+<span class="sourceLineNo">150</span> * <ja>@RestResource</ja>(<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * messages=<js>"nls/AddressBookResource"</js>,<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * description=<js>"My description"</js>, <jc>// or pageText</jc><a name="line.152"></a>
+<span class="sourceLineNo">153</span> * )<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * </p><a name="line.155"></a>
+<span class="sourceLineNo">156</span> */<a name="line.156"></a>
+<span class="sourceLineNo">157</span> public static final String HTMLDOC_text = "HtmlSerializer.description";<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span> /**<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * <b>Configuration property:</b> Page links.<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * <p><a name="line.161"></a>
+<span class="sourceLineNo">162</span> * <ul><a name="line.162"></a>
+<span class="sourceLineNo">163</span> * <li><b>Name:</b> <js>"HtmlDocSerializer.links.map"</js><a name="line.163"></a>
+<span class="sourceLineNo">164</span> * <li><b>Data type:</b> <code>Map&lt;String,String&gt;</code><a name="line.164"></a>
+<span class="sourceLineNo">165</span> * <li><b>Default:</b> empty map<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.166"></a>
+<span class="sourceLineNo">167</span> * </ul><a name="line.167"></a>
+<span class="sourceLineNo">168</span> * <p><a name="line.168"></a>
+<span class="sourceLineNo">169</span> * Adds a list of hyperlinks immediately under the title and description but above the content of the page.<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * <p><a name="line.170"></a>
+<span class="sourceLineNo">171</span> * This can be used to provide convenient hyperlinks when viewing the REST interface from a browser.<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * <p><a name="line.172"></a>
+<span class="sourceLineNo">173</span> * The value is a JSON object string where the keys are anchor text and the values are URLs.<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * <p><a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Relative URLs are considered relative to the servlet path.<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * For example, if the servlet path is <js>"http://localhost/myContext/myServlet"</js>, and the<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * URL is <js>"foo"</js>, the link becomes <js>"http://localhost/myContext/myServlet/foo"</js>.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * Absolute (<js>"/myOtherContext/foo"</js>) and fully-qualified (<js>"http://localhost2/foo"</js>) URLs<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * can also be used.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> *<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * <h5 class='section'>Example:</h5><a name="line.181"></a>
+<span class="sourceLineNo">182</span> * <p><a name="line.182"></a>
+<span class="sourceLineNo">183</span> * The <code>AddressBookResource</code> sample class uses this property...<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * </p><a name="line.184"></a>
+<span class="sourceLineNo">185</span> * <p class='bcode'><a name="line.185"></a>
+<span class="sourceLineNo">186</span> * <ja>@RestResource</ja>(<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * messages=<js>"nls/AddressBookResource"</js>,<a name="line.187"></a>
+<span class="sourceLineNo">188</span> * properties={<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>)<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * )<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * </p><a name="line.193"></a>
+<span class="sourceLineNo">194</span> * <p><a name="line.194"></a>
+<span class="sourceLineNo">195</span> * ...to produce this list of links on the HTML page...<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * </p><a name="line.196"></a>
+<span class="sourceLineNo">197</span> * <img class='bordered' src='doc-files/HTML_LINKS.png'><a name="line.197"></a>
+<span class="sourceLineNo">198</span> * <p><a name="line.198"></a>
+<span class="sourceLineNo">199</span> * A shortcut on <ja>@RestResource</ja> is also provided for this setting:<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * <p class='bcode'><a name="line.200"></a>
+<span class="sourceLineNo">201</span> * <ja>@RestResource</ja>(<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * messages=<js>"nls/AddressBookResource"</js>,<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * pageLinks=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js><a name="line.203"></a>
+<span class="sourceLineNo">204</span> * )<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * </p><a name="line.206"></a>
+<span class="sourceLineNo">207</span> */<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public static final String HTMLDOC_links = "HtmlDocSerializer.links.map";<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> * <b>Configuration property:</b> Add to the {@link #HTMLDOC_links} property.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> */<a name="line.212"></a>
+<span class="sourceLineNo">213</span> public static final String HTMLDOC_links_put = "HtmlDocSerializer.links.map.put";<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span> /**<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * <b>Configuration property:</b> Stylesheet URL.<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * <p><a name="line.217"></a>
+<span class="sourceLineNo">218</span> * <ul><a name="line.218"></a>
+<span class="sourceLineNo">219</span> * <li><b>Name:</b> <js>"HtmlDocSerializer.cssUrl"</js><a name="line.219"></a>
+<span class="sourceLineNo">220</span> * <li><b>Data type:</b> <code>String</code><a name="line.220"></a>
+<span class="sourceLineNo">221</span> * <li><b>Default:</b> <js>"style.css"</js><a name="line.221"></a>
+<span class="sourceLineNo">222</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.222"></a>
+<span class="sourceLineNo">223</span> * </ul><a name="line.223"></a>
+<span class="sourceLineNo">224</span> * <p><a name="line.224"></a>
+<span class="sourceLineNo">225</span> * Adds a link to the specified stylesheet URL.<a name="line.225"></a>
+<span class="sourceLineNo">226</span> * <p><a name="line.226"></a>
+<span class="sourceLineNo">227</span> * If not specified, defaults to the built-in stylesheet located at <js>"style.css"</js>.<a name="line.227"></a>
+<span class="sourceLineNo">228</span> * Note that this stylesheet is controlled by the <code><ja>@RestResource</ja>.stylesheet()</code> annotation.<a name="line.228"></a>
+<span class="sourceLineNo">229</span> */<a name="line.229"></a>
+<span class="sourceLineNo">230</span> public static final String HTMLDOC_cssUrl = "HtmlDocSerializer.cssUrl";<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> /**<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * <b>Configuration property:</b> CSS imports.<a name="line.233"></a>
+<span class="sourceLineNo">234</span> * <p><a name="line.234"></a>
+<span class="sourceLineNo">235</span> * <ul><a name="line.235"></a>
+<span class="sourceLineNo">236</span> * <li><b>Name:</b> <js>"HtmlDocSerializer.cssImports.list"</js><a name="line.236"></a>
+<span class="sourceLineNo">237</span> * <li><b>Data type:</b> <code>List&lt;String&gt;</code><a name="line.237"></a>
+<span class="sourceLineNo">238</span> * <li><b>Default:</b> empty list<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.239"></a>
+<span class="sourceLineNo">240</span> * </ul><a name="line.240"></a>
+<span class="sourceLineNo">241</span> * <p><a name="line.241"></a>
+<span class="sourceLineNo">242</span> * Imports the specified CSS page URLs into the page.<a name="line.242"></a>
+<span class="sourceLineNo">243</span> */<a name="line.243"></a>
+<span class="sourceLineNo">244</span> public static final String HTMLDOC_cssImports = "HtmlDocSerializer.cssImports.list";<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> /**<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * <b>Configuration property:</b> Add to the {@link #HTMLDOC_cssImports} property.<a name="line.247"></a>
+<span class="sourceLineNo">248</span> */<a name="line.248"></a>
+<span class="sourceLineNo">249</span> public static final String HTMLDOC_cssImports_add = "HtmlDocSerializer.cssImports.list.add";<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span> /**<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * <b>Configuration property:</b> Prevent word wrap on page.<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * <p><a name="line.253"></a>
+<span class="sourceLineNo">254</span> * <ul><a name="line.254"></a>
+<span class="sourceLineNo">255</span> * <li><b>Name:</b> <js>"HtmlDocSerializer.nowrap"</js><a name="line.255"></a>
+<span class="sourceLineNo">256</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.256"></a>
+<span class="sourceLineNo">257</span> * <li><b>Default:</b> <jk>false</jk><a name="line.257"></a>
+<span class="sourceLineNo">258</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.258"></a>
+<span class="sourceLineNo">259</span> * </ul><a name="line.259"></a>
+<span class="sourceLineNo">260</span> * <p><a name="line.260"></a>
+<span class="sourceLineNo">261</span> * Adds <js>"* {white-space:nowrap}"</js> to the style header to prevent word wrapping.<a name="line.261"></a>
+<span class="sourceLineNo">262</span> */<a name="line.262"></a>
+<span class="sourceLineNo">263</span> public static final String HTMLDOC_nowrap = "HtmlDocSerializer.nowrap";<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span> final String[] cssImports;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> final Map<String,String> links;<a name="line.266"></a>
+<span class="sourceLineNo">267</span> final String title, text, cssUrl;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> final boolean nowrap;<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> /**<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * Constructor.<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * <p><a name="line.272"></a>
+<span class="sourceLineNo">273</span> * Typically only called from {@link PropertyStore#getContext(Class)}.<a name="line.273"></a>
+<span class="sourceLineNo">274</span> *<a name="line.274"></a>
+<span class="sourceLineNo">275</span> * @param ps The property store that created this context.<a name="line.275"></a>
+<span class="sourceLineNo">276</span> */<a name="line.276"></a>
+<span class="sourceLineNo">277</span> public HtmlDocSerializerContext(PropertyStore ps) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> super(ps);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> cssImports = ps.getProperty(HTMLDOC_cssImports, String[].class, new String[0]);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> title = ps.getProperty(HTMLDOC_title, String.class, null);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> text = ps.getProperty(HTMLDOC_text, String.class, null);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> cssUrl = ps.getProperty(HTMLDOC_cssUrl, String.class, null);<a name="line.282"></a>
+<span class="sourceLineNo">283</span> nowrap = ps.getProperty(HTMLDOC_nowrap, boolean.class, false);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> links = ps.getMap(HTMLDOC_links, String.class, String.class, Collections.<String,String>emptyMap());<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> @Override /* Context */<a name="line.287"></a>
+<span class="sourceLineNo">288</span> public ObjectMap asMap() {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> return super.asMap()<a name="line.289"></a>
+<span class="sourceLineNo">290</span> .append("HtmlDocSerializerContext", new ObjectMap()<a name="line.290"></a>
+<span class="sourceLineNo">291</span> .append("cssImports", cssImports)<a name="line.291"></a>
+<span class="sourceLineNo">292</span> .append("title", title)<a name="line.292"></a>
+<span class="sourceLineNo">293</span> .append("text", text)<a name="line.293"></a>
+<span class="sourceLineNo">294</span> .append("cssUrl", cssUrl)<a name="line.294"></a>
+<span class="sourceLineNo">295</span> .append("nowrap", nowrap)<a name="line.295"></a>
+<span class="sourceLineNo">296</span> .append("links", links)<a name="line.296"></a>
+<span class="sourceLineNo">297</span> );<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span>}<a name="line.299"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerSession.html
index 54bd1fa..8470367 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerSession.html
@@ -39,7 +39,7 @@
<span class="sourceLineNo">031</span> */<a name="line.31"></a>
<span class="sourceLineNo">032</span>public final class HtmlDocSerializerSession extends HtmlSerializerSession {<a name="line.32"></a>
<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span> private final String title, description, cssUrl;<a name="line.34"></a>
+<span class="sourceLineNo">034</span> private final String title, text, cssUrl;<a name="line.34"></a>
<span class="sourceLineNo">035</span> private final String[] cssImports;<a name="line.35"></a>
<span class="sourceLineNo">036</span> private final Map<String,String> links;<a name="line.36"></a>
<span class="sourceLineNo">037</span> private final boolean nowrap;<a name="line.37"></a>
@@ -64,14 +64,14 @@
<span class="sourceLineNo">056</span> super(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.56"></a>
<span class="sourceLineNo">057</span> if (op == null || op.isEmpty()) {<a name="line.57"></a>
<span class="sourceLineNo">058</span> title = ctx.title;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> description = ctx.description;<a name="line.59"></a>
+<span class="sourceLineNo">059</span> text = ctx.text;<a name="line.59"></a>
<span class="sourceLineNo">060</span> links = ctx.links;<a name="line.60"></a>
<span class="sourceLineNo">061</span> cssUrl = ctx.cssUrl;<a name="line.61"></a>
<span class="sourceLineNo">062</span> cssImports = ctx.cssImports;<a name="line.62"></a>
<span class="sourceLineNo">063</span> nowrap = ctx.nowrap;<a name="line.63"></a>
<span class="sourceLineNo">064</span> } else {<a name="line.64"></a>
<span class="sourceLineNo">065</span> title = op.getString(HTMLDOC_title, ctx.title);<a name="line.65"></a>
-<span class="sourceLineNo">066</span> description = op.getString(HTMLDOC_description, ctx.description);<a name="line.66"></a>
+<span class="sourceLineNo">066</span> text = op.getString(HTMLDOC_text, ctx.text);<a name="line.66"></a>
<span class="sourceLineNo">067</span> links = new LinkedHashMap(op.getMap(HTMLDOC_links, ctx.links));<a name="line.67"></a>
<span class="sourceLineNo">068</span> cssUrl = op.getString(HTMLDOC_cssUrl, ctx.cssUrl);<a name="line.68"></a>
<span class="sourceLineNo">069</span> cssImports = StringUtils.split(op.getString(HTMLDOC_cssImports, null), ',');<a name="line.69"></a>
@@ -89,12 +89,12 @@
<span class="sourceLineNo">081</span> }<a name="line.81"></a>
<span class="sourceLineNo">082</span><a name="line.82"></a>
<span class="sourceLineNo">083</span> /**<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * Returns the {@link HtmlDocSerializerContext#HTMLDOC_description} setting value in this context.<a name="line.84"></a>
+<span class="sourceLineNo">084</span> * Returns the {@link HtmlDocSerializerContext#HTMLDOC_text} setting value in this context.<a name="line.84"></a>
<span class="sourceLineNo">085</span> *<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * @return The {@link HtmlDocSerializerContext#HTMLDOC_description} setting value in this context.<a name="line.86"></a>
+<span class="sourceLineNo">086</span> * @return The {@link HtmlDocSerializerContext#HTMLDOC_text} setting value in this context.<a name="line.86"></a>
<span class="sourceLineNo">087</span> */<a name="line.87"></a>
-<span class="sourceLineNo">088</span> public final String getDescription() {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return description;<a name="line.89"></a>
+<span class="sourceLineNo">088</span> public final String getText() {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> return text;<a name="line.89"></a>
<span class="sourceLineNo">090</span> }<a name="line.90"></a>
<span class="sourceLineNo">091</span><a name="line.91"></a>
<span class="sourceLineNo">092</span> /**<a name="line.92"></a>
[09/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/RestConfig.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestConfig.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestConfig.html
index 4da3c7d..27de48d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestConfig.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestConfig.html
@@ -108,7 +108,7 @@
<span class="sourceLineNo">100</span> Object favIcon;<a name="line.100"></a>
<span class="sourceLineNo">101</span> List<Object> staticFiles;<a name="line.101"></a>
<span class="sourceLineNo">102</span> RestContext parentContext;<a name="line.102"></a>
-<span class="sourceLineNo">103</span> String path;<a name="line.103"></a>
+<span class="sourceLineNo">103</span> String path, pageTitle, pageText, pageLinks;<a name="line.103"></a>
<span class="sourceLineNo">104</span> String clientVersionHeader = "X-Client-Version";<a name="line.104"></a>
<span class="sourceLineNo">105</span><a name="line.105"></a>
<span class="sourceLineNo">106</span> Object resourceResolver = RestResourceResolver.class;<a name="line.106"></a>
@@ -127,1038 +127,1085 @@
<span class="sourceLineNo">119</span> this.parentContext = parentContext;<a name="line.119"></a>
<span class="sourceLineNo">120</span> try {<a name="line.120"></a>
<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span> properties = new ObjectMap();<a name="line.122"></a>
-<span class="sourceLineNo">123</span> configFile = ConfigMgr.DEFAULT.create();<a name="line.123"></a>
-<span class="sourceLineNo">124</span> varResolverBuilder = new VarResolverBuilder()<a name="line.124"></a>
-<span class="sourceLineNo">125</span> .vars(<a name="line.125"></a>
-<span class="sourceLineNo">126</span> SystemPropertiesVar.class,<a name="line.126"></a>
-<span class="sourceLineNo">127</span> EnvVariablesVar.class,<a name="line.127"></a>
-<span class="sourceLineNo">128</span> ConfigFileVar.class,<a name="line.128"></a>
-<span class="sourceLineNo">129</span> IfVar.class,<a name="line.129"></a>
-<span class="sourceLineNo">130</span> SwitchVar.class<a name="line.130"></a>
-<span class="sourceLineNo">131</span> );<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> VarResolver vr = varResolverBuilder.build();<a name="line.133"></a>
+<span class="sourceLineNo">122</span> ConfigFileBuilder cfb = new ConfigFileBuilder();<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span> properties = new ObjectMap();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> configFile = cfb.build();<a name="line.125"></a>
+<span class="sourceLineNo">126</span> varResolverBuilder = new VarResolverBuilder()<a name="line.126"></a>
+<span class="sourceLineNo">127</span> .vars(<a name="line.127"></a>
+<span class="sourceLineNo">128</span> SystemPropertiesVar.class,<a name="line.128"></a>
+<span class="sourceLineNo">129</span> EnvVariablesVar.class,<a name="line.129"></a>
+<span class="sourceLineNo">130</span> ConfigFileVar.class,<a name="line.130"></a>
+<span class="sourceLineNo">131</span> IfVar.class,<a name="line.131"></a>
+<span class="sourceLineNo">132</span> SwitchVar.class<a name="line.132"></a>
+<span class="sourceLineNo">133</span> );<a name="line.133"></a>
<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> Map<Class<?>,RestResource> restResourceAnnotationsParentFirst = ReflectionUtils.findAnnotationsMapParentFirst(RestResource.class, resourceClass);<a name="line.135"></a>
+<span class="sourceLineNo">135</span> VarResolver vr = varResolverBuilder.build();<a name="line.135"></a>
<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> // Find our config file. It's the last non-empty @RestResource.config().<a name="line.137"></a>
-<span class="sourceLineNo">138</span> String configPath = "";<a name="line.138"></a>
-<span class="sourceLineNo">139</span> for (RestResource r : restResourceAnnotationsParentFirst.values())<a name="line.139"></a>
-<span class="sourceLineNo">140</span> if (! r.config().isEmpty())<a name="line.140"></a>
-<span class="sourceLineNo">141</span> configPath = r.config();<a name="line.141"></a>
-<span class="sourceLineNo">142</span> String cf = vr.resolve(configPath);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> if (! cf.isEmpty())<a name="line.143"></a>
-<span class="sourceLineNo">144</span> configFile = ConfigMgr.DEFAULT.get(cf);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> configFile = configFile.getResolving(vr);<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> // Add our config file to the variable resolver.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> varResolverBuilder.contextObject(ConfigFileVar.SESSION_config, configFile);<a name="line.148"></a>
-<span class="sourceLineNo">149</span> vr = varResolverBuilder.build();<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> // Add our servlet URI to our properties.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> ServletContext ctx = config.getServletContext();<a name="line.152"></a>
-<span class="sourceLineNo">153</span> String ctxPath = ctx.getContextPath();<a name="line.153"></a>
-<span class="sourceLineNo">154</span> // Workaround for bug in Jetty that causes context path to always end in "null".<a name="line.154"></a>
-<span class="sourceLineNo">155</span> if (ctxPath.endsWith("null"))<a name="line.155"></a>
-<span class="sourceLineNo">156</span> ctxPath = ctxPath.substring(0, ctxPath.length()-4);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> properties.put(SERIALIZER_relativeUriBase, ctxPath);<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> // Add the servlet init parameters to our properties.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> for (Enumeration<String> ep = config.getInitParameterNames(); ep.hasMoreElements();) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> String p = ep.nextElement();<a name="line.161"></a>
-<span class="sourceLineNo">162</span> String initParam = config.getInitParameter(p);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> properties.put(vr.resolve(p), vr.resolve(initParam));<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">166</span> // Load stuff from parent-to-child order.<a name="line.166"></a>
-<span class="sourceLineNo">167</span> // This allows child settings to overwrite parent settings.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> for (Map.Entry<Class<?>,RestResource> e : restResourceAnnotationsParentFirst.entrySet()) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> Class<?> c = e.getKey();<a name="line.169"></a>
-<span class="sourceLineNo">170</span> RestResource r = e.getValue();<a name="line.170"></a>
-<span class="sourceLineNo">171</span> for (Property p : r.properties())<a name="line.171"></a>
-<span class="sourceLineNo">172</span> properties.append(vr.resolve(p.name()), vr.resolve(p.value()));<a name="line.172"></a>
-<span class="sourceLineNo">173</span> addSerializers(reverse(r.serializers())); // TODO - why reverse?<a name="line.173"></a>
-<span class="sourceLineNo">174</span> addParsers(reverse(r.parsers())); // TODO - why reverse?<a name="line.174"></a>
-<span class="sourceLineNo">175</span> addEncoders(reverse(r.encoders())); // TODO - why reverse?<a name="line.175"></a>
-<span class="sourceLineNo">176</span> addDefaultRequestHeaders(r.defaultRequestHeaders());<a name="line.176"></a>
-<span class="sourceLineNo">177</span> addDefaultResponseHeaders(r.defaultResponseHeaders());<a name="line.177"></a>
-<span class="sourceLineNo">178</span> addResponseHandlers(r.responseHandlers());<a name="line.178"></a>
-<span class="sourceLineNo">179</span> addConverters(r.converters());<a name="line.179"></a>
-<span class="sourceLineNo">180</span> addGuards(reverse(r.guards()));<a name="line.180"></a>
-<span class="sourceLineNo">181</span> addChildResources(r.children());<a name="line.181"></a>
-<span class="sourceLineNo">182</span> addBeanFilters(r.beanFilters());<a name="line.182"></a>
-<span class="sourceLineNo">183</span> addPojoSwaps(r.pojoSwaps());<a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (! r.stylesheet().isEmpty())<a name="line.184"></a>
-<span class="sourceLineNo">185</span> setStyleSheet(c, r.stylesheet());<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (! r.favicon().isEmpty())<a name="line.186"></a>
-<span class="sourceLineNo">187</span> setFavIcon(c, r.favicon());<a name="line.187"></a>
-<span class="sourceLineNo">188</span> if (! r.staticFiles().isEmpty())<a name="line.188"></a>
-<span class="sourceLineNo">189</span> addStaticFiles(c, r.staticFiles());<a name="line.189"></a>
-<span class="sourceLineNo">190</span> if (! r.path().isEmpty())<a name="line.190"></a>
-<span class="sourceLineNo">191</span> setPath(r.path());<a name="line.191"></a>
-<span class="sourceLineNo">192</span> if (! r.clientVersionHeader().isEmpty())<a name="line.192"></a>
-<span class="sourceLineNo">193</span> setClientVersionHeader(r.clientVersionHeader());<a name="line.193"></a>
-<span class="sourceLineNo">194</span> if (r.resourceResolver() != RestResourceResolver.class)<a name="line.194"></a>
-<span class="sourceLineNo">195</span> setResourceResolver(r.resourceResolver());<a name="line.195"></a>
-<span class="sourceLineNo">196</span> if (r.logger() != RestLogger.Normal.class)<a name="line.196"></a>
-<span class="sourceLineNo">197</span> setLogger(r.logger());<a name="line.197"></a>
-<span class="sourceLineNo">198</span> if (r.callHandler() != RestCallHandler.class)<a name="line.198"></a>
-<span class="sourceLineNo">199</span> setCallHandler(r.callHandler());<a name="line.199"></a>
-<span class="sourceLineNo">200</span> if (r.infoProvider() != RestInfoProvider.class)<a name="line.200"></a>
-<span class="sourceLineNo">201</span> setInfoProvider(r.infoProvider());<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> addResponseHandlers(<a name="line.204"></a>
-<span class="sourceLineNo">205</span> StreamableHandler.class,<a name="line.205"></a>
-<span class="sourceLineNo">206</span> WritableHandler.class,<a name="line.206"></a>
-<span class="sourceLineNo">207</span> ReaderHandler.class,<a name="line.207"></a>
-<span class="sourceLineNo">208</span> InputStreamHandler.class,<a name="line.208"></a>
-<span class="sourceLineNo">209</span> RedirectHandler.class,<a name="line.209"></a>
-<span class="sourceLineNo">210</span> DefaultHandler.class<a name="line.210"></a>
-<span class="sourceLineNo">211</span> );<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> addMimeTypes(<a name="line.213"></a>
-<span class="sourceLineNo">214</span> "text/css css CSS",<a name="line.214"></a>
-<span class="sourceLineNo">215</span> "text/html html htm HTML",<a name="line.215"></a>
-<span class="sourceLineNo">216</span> "text/plain txt text TXT",<a name="line.216"></a>
-<span class="sourceLineNo">217</span> "application/javascript js",<a name="line.217"></a>
-<span class="sourceLineNo">218</span> "image/png png",<a name="line.218"></a>
-<span class="sourceLineNo">219</span> "image/gif gif",<a name="line.219"></a>
-<span class="sourceLineNo">220</span> "application/xml xml XML",<a name="line.220"></a>
-<span class="sourceLineNo">221</span> "application/json json JSON"<a name="line.221"></a>
-<span class="sourceLineNo">222</span> );<a name="line.222"></a>
-<span class="sourceLineNo">223</span> } catch (Exception e) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> throw new ServletException(e);<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span> /**<a name="line.228"></a>
-<span class="sourceLineNo">229</span> * Adds the specified {@link Var} classes to this config.<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * <p><a name="line.230"></a>
-<span class="sourceLineNo">231</span> * These variables affect the variable resolver returned by {@link RestRequest#getVarResolverSession()} which is<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * used to resolve string variables of the form <js>"$X{...}"</js>.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * <p><a name="line.233"></a>
-<span class="sourceLineNo">234</span> * By default, this config includes the following variables:<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * <ul class='spaced-list'><a name="line.235"></a>
-<span class="sourceLineNo">236</span> * <li>{@link SystemPropertiesVar}<a name="line.236"></a>
-<span class="sourceLineNo">237</span> * <li>{@link EnvVariablesVar}<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * <li>{@link ConfigFileVar}<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * <li>{@link IfVar}<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * <li>{@link SwitchVar}<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * </ul><a name="line.241"></a>
-<span class="sourceLineNo">242</span> * <p><a name="line.242"></a>
-<span class="sourceLineNo">243</span> * Later during the construction of {@link RestContext}, we add the following variables:<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * <ul><a name="line.244"></a>
-<span class="sourceLineNo">245</span> * <li>{@link LocalizationVar}<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * <li>{@link RequestVar}<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * <li>{@link SerializedRequestAttrVar}<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * <li>{@link ServletInitParamVar}<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * <li>{@link UrlEncodeVar}<a name="line.249"></a>
-<span class="sourceLineNo">250</span> * </ul><a name="line.250"></a>
-<span class="sourceLineNo">251</span> *<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * @param vars The {@link Var} classes to add to this config.<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * @return This object (for method chaining).<a name="line.253"></a>
-<span class="sourceLineNo">254</span> */<a name="line.254"></a>
-<span class="sourceLineNo">255</span> public RestConfig addVars(Class<?>...vars) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> this.varResolverBuilder.vars(vars);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> return this;<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> /**<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * Adds a var context object to this config.<a name="line.261"></a>
-<span class="sourceLineNo">262</span> * <p><a name="line.262"></a>
-<span class="sourceLineNo">263</span> * Var context objects are read-only objects associated with the variable resolver for<a name="line.263"></a>
-<span class="sourceLineNo">264</span> * vars that require external information.<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * <p><a name="line.265"></a>
-<span class="sourceLineNo">266</span> * For example, the {@link ConfigFileVar} needs access to this resource's {@link ConfigFile} through the {@link ConfigFileVar#SESSION_config}<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * object that can be specified as either a session object (temporary) or context object (permanent).<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * In this case, we call the following code to add it to the context map:<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * <p class='bcode'><a name="line.269"></a>
-<span class="sourceLineNo">270</span> * config.addVarContextObject(<jsf>SESSION_config</jsf>, configFile);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * </p><a name="line.271"></a>
-<span class="sourceLineNo">272</span> *<a name="line.272"></a>
-<span class="sourceLineNo">273</span> * @param name The context object key (i.e. the name that the Var class looks for).<a name="line.273"></a>
-<span class="sourceLineNo">274</span> * @param object The context object.<a name="line.274"></a>
-<span class="sourceLineNo">275</span> * @return This object (for method chaining).<a name="line.275"></a>
-<span class="sourceLineNo">276</span> */<a name="line.276"></a>
-<span class="sourceLineNo">277</span> public RestConfig addVarContextObject(String name, Object object) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> this.varResolverBuilder.contextObject(name, object);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> return this;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> /**<a name="line.282"></a>
-<span class="sourceLineNo">283</span> * Overwrites the default config file with a custom config file.<a name="line.283"></a>
-<span class="sourceLineNo">284</span> * <p><a name="line.284"></a>
-<span class="sourceLineNo">285</span> * By default, the config file is determined using the {@link RestResource#config() @RestResource.config()} annotation.<a name="line.285"></a>
-<span class="sourceLineNo">286</span> * This method allows you to programmatically override it with your own custom config file.<a name="line.286"></a>
-<span class="sourceLineNo">287</span> *<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * @param configFile The new config file.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * @return This object (for method chaining).<a name="line.289"></a>
-<span class="sourceLineNo">290</span> */<a name="line.290"></a>
-<span class="sourceLineNo">291</span> public RestConfig setConfigFile(ConfigFile configFile) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> this.configFile = configFile;<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return this;<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> /**<a name="line.296"></a>
-<span class="sourceLineNo">297</span> * Sets a property on this resource.<a name="line.297"></a>
-<span class="sourceLineNo">298</span> * <p><a name="line.298"></a>
-<span class="sourceLineNo">299</span> * This is the programmatic equivalent to the {@link RestResource#properties()} annotation.<a name="line.299"></a>
-<span class="sourceLineNo">300</span> *<a name="line.300"></a>
-<span class="sourceLineNo">301</span> * @param key The property name.<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * @param value The property value.<a name="line.302"></a>
-<span class="sourceLineNo">303</span> * @return This object (for method chaining).<a name="line.303"></a>
-<span class="sourceLineNo">304</span> */<a name="line.304"></a>
-<span class="sourceLineNo">305</span> public RestConfig setProperty(String key, Object value) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> this.properties.put(key, value);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> return this;<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span> /**<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * Sets multiple properties on this resource.<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * <p><a name="line.312"></a>
-<span class="sourceLineNo">313</span> * This is the programmatic equivalent to the {@link RestResource#properties() @RestResource.properties()} annotation.<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * <p><a name="line.314"></a>
-<span class="sourceLineNo">315</span> * Values in the map are added to the existing properties and are overwritten if duplicates are found.<a name="line.315"></a>
-<span class="sourceLineNo">316</span> *<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * @param properties The new properties to add to this config.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * @return This object (for method chaining).<a name="line.318"></a>
-<span class="sourceLineNo">319</span> */<a name="line.319"></a>
-<span class="sourceLineNo">320</span> public RestConfig setProperties(Map<String,Object> properties) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span> this.properties.putAll(properties);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> return this;<a name="line.322"></a>
-<span class="sourceLineNo">323</span> }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span> /**<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * Adds class-level bean filters to this resource.<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * <p><a name="line.327"></a>
-<span class="sourceLineNo">328</span> * This is the programmatic equivalent to the {@link RestResource#beanFilters() @RestResource.beanFilters()} annotation.<a name="line.328"></a>
-<span class="sourceLineNo">329</span> * <p><a name="line.329"></a>
-<span class="sourceLineNo">330</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.330"></a>
-<span class="sourceLineNo">331</span> *<a name="line.331"></a>
-<span class="sourceLineNo">332</span> * @param beanFilters The bean filters to add to this config.<a name="line.332"></a>
-<span class="sourceLineNo">333</span> * @return This object (for method chaining).<a name="line.333"></a>
-<span class="sourceLineNo">334</span> */<a name="line.334"></a>
-<span class="sourceLineNo">335</span> public RestConfig addBeanFilters(Class<?>...beanFilters) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> this.beanFilters.addAll(Arrays.asList(beanFilters));<a name="line.336"></a>
-<span class="sourceLineNo">337</span> return this;<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> /**<a name="line.340"></a>
-<span class="sourceLineNo">341</span> * Adds class-level pojo swaps to this resource.<a name="line.341"></a>
-<span class="sourceLineNo">342</span> * <p><a name="line.342"></a>
-<span class="sourceLineNo">343</span> * This is the programmatic equivalent to the {@link RestResource#pojoSwaps() @RestResource.pojoSwaps()} annotation.<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * <p><a name="line.344"></a>
-<span class="sourceLineNo">345</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.345"></a>
-<span class="sourceLineNo">346</span> *<a name="line.346"></a>
-<span class="sourceLineNo">347</span> * @param pojoSwaps The pojo swaps to add to this config.<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * @return This object (for method chaining).<a name="line.348"></a>
-<span class="sourceLineNo">349</span> */<a name="line.349"></a>
-<span class="sourceLineNo">350</span> public RestConfig addPojoSwaps(Class<?>...pojoSwaps) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> this.pojoSwaps.addAll(Arrays.asList(pojoSwaps));<a name="line.351"></a>
-<span class="sourceLineNo">352</span> return this;<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> /**<a name="line.355"></a>
-<span class="sourceLineNo">356</span> * Adds class-level serializers to this resource.<a name="line.356"></a>
-<span class="sourceLineNo">357</span> * <p><a name="line.357"></a>
-<span class="sourceLineNo">358</span> * This is the programmatic equivalent to the {@link RestResource#serializers() @RestResource.serializers()} annotation.<a name="line.358"></a>
-<span class="sourceLineNo">359</span> * <p><a name="line.359"></a>
-<span class="sourceLineNo">360</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.360"></a>
-<span class="sourceLineNo">361</span> *<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * @param serializers The serializer classes to add to this config.<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * @return This object (for method chaining).<a name="line.363"></a>
-<span class="sourceLineNo">364</span> */<a name="line.364"></a>
-<span class="sourceLineNo">365</span> public RestConfig addSerializers(Class<?>...serializers) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> this.serializers.append(serializers);<a name="line.366"></a>
-<span class="sourceLineNo">367</span> return this;<a name="line.367"></a>
-<span class="sourceLineNo">368</span> }<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> /**<a name="line.370"></a>
-<span class="sourceLineNo">371</span> * Adds class-level serializers to this resource.<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * <p><a name="line.372"></a>
-<span class="sourceLineNo">373</span> * Same as {@link #addSerializers(Class...)} except allows you to pass in serializer instances.<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * The actual serializer ends up being the result of this operation using the bean filters, pojo swaps, and properties on this config:<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * <p class='bcode'><a name="line.375"></a>
-<span class="sourceLineNo">376</span> * serializer = serializer.builder().beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a name="line.376"></a>
-<span class="sourceLineNo">377</span> * </p><a name="line.377"></a>
-<span class="sourceLineNo">378</span> * <p><a name="line.378"></a>
-<span class="sourceLineNo">379</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.379"></a>
-<span class="sourceLineNo">380</span> *<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * @param serializers The serializers to add to this config.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * @return This object (for method chaining).<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> public RestConfig addSerializers(Serializer...serializers) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> this.serializers.append(serializers);<a name="line.385"></a>
-<span class="sourceLineNo">386</span> return this;<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> /**<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * Adds class-level parsers to this resource.<a name="line.390"></a>
-<span class="sourceLineNo">391</span> * <p><a name="line.391"></a>
-<span class="sourceLineNo">392</span> * This is the programmatic equivalent to the {@link RestResource#parsers() @RestResource.parsers()} annotation.<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * <p><a name="line.393"></a>
-<span class="sourceLineNo">394</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.394"></a>
-<span class="sourceLineNo">395</span> *<a name="line.395"></a>
-<span class="sourceLineNo">396</span> * @param parsers The parser classes to add to this config.<a name="line.396"></a>
-<span class="sourceLineNo">397</span> * @return This object (for method chaining).<a name="line.397"></a>
-<span class="sourceLineNo">398</span> */<a name="line.398"></a>
-<span class="sourceLineNo">399</span> public RestConfig addParsers(Class<?>...parsers) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> this.parsers.append(parsers);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> return this;<a name="line.401"></a>
-<span class="sourceLineNo">402</span> }<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span> /**<a name="line.404"></a>
-<span class="sourceLineNo">405</span> * Adds class-level parsers to this resource.<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * <p><a name="line.406"></a>
-<span class="sourceLineNo">407</span> * Same as {@link #addParsers(Class...)} except allows you to pass in parser instances.<a name="line.407"></a>
-<span class="sourceLineNo">408</span> * The actual parser ends up being the result of this operation using the bean filters, pojo swaps, and properties on this config:<a name="line.408"></a>
-<span class="sourceLineNo">409</span> * <p class='bcode'><a name="line.409"></a>
-<span class="sourceLineNo">410</span> * parser = parser.builder().beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a name="line.410"></a>
-<span class="sourceLineNo">411</span> * </p><a name="line.411"></a>
-<span class="sourceLineNo">412</span> * <p><a name="line.412"></a>
-<span class="sourceLineNo">413</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.413"></a>
-<span class="sourceLineNo">414</span> *<a name="line.414"></a>
-<span class="sourceLineNo">415</span> * @param parsers The parsers to add to this config.<a name="line.415"></a>
-<span class="sourceLineNo">416</span> * @return This object (for method chaining).<a name="line.416"></a>
-<span class="sourceLineNo">417</span> */<a name="line.417"></a>
-<span class="sourceLineNo">418</span> public RestConfig addParsers(Parser...parsers) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> this.parsers.append(parsers);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> return this;<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> /**<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * Adds class-level encoders to this resource.<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * <p><a name="line.425"></a>
-<span class="sourceLineNo">426</span> * This is the programmatic equivalent to the {@link RestResource#encoders() @RestResource.encoders()} annotation.<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * <p><a name="line.427"></a>
-<span class="sourceLineNo">428</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * <p><a name="line.429"></a>
-<span class="sourceLineNo">430</span> * By default, only the {@link IdentityEncoder} is included in this list.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> *<a name="line.431"></a>
-<span class="sourceLineNo">432</span> * @param encoders The parser classes to add to this config.<a name="line.432"></a>
-<span class="sourceLineNo">433</span> * @return This object (for method chaining).<a name="line.433"></a>
-<span class="sourceLineNo">434</span> */<a name="line.434"></a>
-<span class="sourceLineNo">435</span> public RestConfig addEncoders(Class<?>...encoders) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> this.encoders.append(encoders);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return this;<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> /**<a name="line.440"></a>
-<span class="sourceLineNo">441</span> * Adds class-level encoders to this resource.<a name="line.441"></a>
-<span class="sourceLineNo">442</span> * <p><a name="line.442"></a>
-<span class="sourceLineNo">443</span> * Same as {@link #addEncoders(Class...)} except allows you to pass in encoder instances.<a name="line.443"></a>
-<span class="sourceLineNo">444</span> *<a name="line.444"></a>
-<span class="sourceLineNo">445</span> * @param encoders The encoders to add to this config.<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * @return This object (for method chaining).<a name="line.446"></a>
-<span class="sourceLineNo">447</span> */<a name="line.447"></a>
-<span class="sourceLineNo">448</span> public RestConfig addEncoders(Encoder...encoders) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> this.encoders.append(encoders);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> return this;<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span> /**<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * Adds class-level converters to this resource.<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * <p><a name="line.455"></a>
-<span class="sourceLineNo">456</span> * This is the programmatic equivalent to the {@link RestResource#converters() @RestResource.converters()} annotation.<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * <p><a name="line.457"></a>
-<span class="sourceLineNo">458</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * <p><a name="line.459"></a>
-<span class="sourceLineNo">460</span> * By default, this config includes the following converters:<a name="line.460"></a>
-<span class="sourceLineNo">461</span> * <ul class='spaced-list'><a name="line.461"></a>
-<span class="sourceLineNo">462</span> * <li>{@link StreamableHandler}<a name="line.462"></a>
-<span class="sourceLineNo">463</span> * <li>{@link WritableHandler}<a name="line.463"></a>
-<span class="sourceLineNo">464</span> * <li>{@link ReaderHandler}<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * <li>{@link InputStreamHandler}<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * <li>{@link RedirectHandler}<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * <li>{@link DefaultHandler}<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * </ul><a name="line.468"></a>
-<span class="sourceLineNo">469</span> *<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * @param converters The converter classes to add to this config.<a name="line.470"></a>
-<span class="sourceLineNo">471</span> * @return This object (for method chaining).<a name="line.471"></a>
-<span class="sourceLineNo">472</span> */<a name="line.472"></a>
-<span class="sourceLineNo">473</span> public RestConfig addConverters(Class<?>...converters) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span> this.converters.addAll(Arrays.asList(converters));<a name="line.474"></a>
-<span class="sourceLineNo">475</span> return this;<a name="line.475"></a>
-<span class="sourceLineNo">476</span> }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span> /**<a name="line.478"></a>
-<span class="sourceLineNo">479</span> * Adds class-level encoders to this resource.<a name="line.479"></a>
-<span class="sourceLineNo">480</span> * <p><a name="line.480"></a>
-<span class="sourceLineNo">481</span> * Same as {@link #addConverters(Class...)} except allows you to pass in converter instances.<a name="line.481"></a>
-<span class="sourceLineNo">482</span> *<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * @param converters The converters to add to this config.<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * @return This object (for method chaining).<a name="line.484"></a>
-<span class="sourceLineNo">485</span> */<a name="line.485"></a>
-<span class="sourceLineNo">486</span> public RestConfig addConverters(RestConverter...converters) {<a name="line.486"></a>
-<span class="sourceLineNo">487</span> this.converters.addAll(Arrays.asList(converters));<a name="line.487"></a>
-<span class="sourceLineNo">488</span> return this;<a name="line.488"></a>
-<span class="sourceLineNo">489</span> }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span> /**<a name="line.491"></a>
-<span class="sourceLineNo">492</span> * Adds class-level guards to this resource.<a name="line.492"></a>
-<span class="sourceLineNo">493</span> * <p><a name="line.493"></a>
-<span class="sourceLineNo">494</span> * This is the programmatic equivalent to the {@link RestResource#guards() @RestResource.guards()} annotation.<a name="line.494"></a>
-<span class="sourceLineNo">495</span> * <p><a name="line.495"></a>
-<span class="sourceLineNo">496</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.496"></a>
-<span class="sourceLineNo">497</span> *<a name="line.497"></a>
-<span class="sourceLineNo">498</span> * @param guards The guard classes to add to this config.<a name="line.498"></a>
-<span class="sourceLineNo">499</span> * @return This object (for method chaining).<a name="line.499"></a>
-<span class="sourceLineNo">500</span> */<a name="line.500"></a>
-<span class="sourceLineNo">501</span> public RestConfig addGuards(Class<?>...guards) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> this.guards.addAll(Arrays.asList(guards));<a name="line.502"></a>
-<span class="sourceLineNo">503</span> return this;<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> /**<a name="line.506"></a>
-<span class="sourceLineNo">507</span> * Adds class-level guards to this resource.<a name="line.507"></a>
-<span class="sourceLineNo">508</span> * <p><a name="line.508"></a>
-<span class="sourceLineNo">509</span> * Same as {@link #addGuards(Class...)} except allows you to pass in guard instances.<a name="line.509"></a>
-<span class="sourceLineNo">510</span> *<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * @param guards The guards to add to this config.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> * @return This object (for method chaining).<a name="line.512"></a>
-<span class="sourceLineNo">513</span> */<a name="line.513"></a>
-<span class="sourceLineNo">514</span> public RestConfig addGuards(RestGuard...guards) {<a name="line.514"></a>
-<span class="sourceLineNo">515</span> this.guards.addAll(Arrays.asList(guards));<a name="line.515"></a>
-<span class="sourceLineNo">516</span> return this;<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span> /**<a name="line.519"></a>
-<span class="sourceLineNo">520</span> * Adds MIME-type definitions.<a name="line.520"></a>
-<span class="sourceLineNo">521</span> * <p><a name="line.521"></a>
-<span class="sourceLineNo">522</span> * These definitions are used in the following locations for setting the media type on responses:<a name="line.522"></a>
-<span class="sourceLineNo">523</span> * <ul><a name="line.523"></a>
-<span class="sourceLineNo">524</span> * <li>{@link RestRequest#getReaderResource(String)}<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * <li>Static files resolved through {@link RestResource#staticFiles()}<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * </ul><a name="line.526"></a>
-<span class="sourceLineNo">527</span> * <p><a name="line.527"></a>
-<span class="sourceLineNo">528</span> * Refer to {@link MimetypesFileTypeMap#addMimeTypes(String)} for an explanation of the format.<a name="line.528"></a>
+<span class="sourceLineNo">137</span> Map<Class<?>,RestResource> restResourceAnnotationsParentFirst = ReflectionUtils.findAnnotationsMapParentFirst(RestResource.class, resourceClass);<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> // Find our config file. It's the last non-empty @RestResource.config().<a name="line.139"></a>
+<span class="sourceLineNo">140</span> String configPath = "";<a name="line.140"></a>
+<span class="sourceLineNo">141</span> for (RestResource r : restResourceAnnotationsParentFirst.values())<a name="line.141"></a>
+<span class="sourceLineNo">142</span> if (! r.config().isEmpty())<a name="line.142"></a>
+<span class="sourceLineNo">143</span> configPath = r.config();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> String cf = vr.resolve(configPath);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> if (! cf.isEmpty())<a name="line.145"></a>
+<span class="sourceLineNo">146</span> configFile = cfb.build(cf);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> configFile = configFile.getResolving(vr);<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> // Add our config file to the variable resolver.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> varResolverBuilder.contextObject(ConfigFileVar.SESSION_config, configFile);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> vr = varResolverBuilder.build();<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span> // Add our servlet URI to our properties.<a name="line.153"></a>
+<span class="sourceLineNo">154</span> ServletContext ctx = config.getServletContext();<a name="line.154"></a>
+<span class="sourceLineNo">155</span> String ctxPath = ctx.getContextPath();<a name="line.155"></a>
+<span class="sourceLineNo">156</span> // Workaround for bug in Jetty that causes context path to always end in "null".<a name="line.156"></a>
+<span class="sourceLineNo">157</span> if (ctxPath.endsWith("null"))<a name="line.157"></a>
+<span class="sourceLineNo">158</span> ctxPath = ctxPath.substring(0, ctxPath.length()-4);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> properties.put(SERIALIZER_relativeUriBase, ctxPath);<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> // Add the servlet init parameters to our properties.<a name="line.161"></a>
+<span class="sourceLineNo">162</span> for (Enumeration<String> ep = config.getInitParameterNames(); ep.hasMoreElements();) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> String p = ep.nextElement();<a name="line.163"></a>
+<span class="sourceLineNo">164</span> String initParam = config.getInitParameter(p);<a name="line.164"></a>
+<span class="sourceLineNo">165</span> properties.put(vr.resolve(p), vr.resolve(initParam));<a name="line.165"></a>
+<span class="sourceLineNo">166</span> }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span> // Load stuff from parent-to-child order.<a name="line.168"></a>
+<span class="sourceLineNo">169</span> // This allows child settings to overwrite parent settings.<a name="line.169"></a>
+<span class="sourceLineNo">170</span> for (Map.Entry<Class<?>,RestResource> e : restResourceAnnotationsParentFirst.entrySet()) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> Class<?> c = e.getKey();<a name="line.171"></a>
+<span class="sourceLineNo">172</span> RestResource r = e.getValue();<a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (Property p : r.properties())<a name="line.173"></a>
+<span class="sourceLineNo">174</span> properties.append(vr.resolve(p.name()), vr.resolve(p.value()));<a name="line.174"></a>
+<span class="sourceLineNo">175</span> addSerializers(reverse(r.serializers())); // TODO - why reverse?<a name="line.175"></a>
+<span class="sourceLineNo">176</span> addParsers(reverse(r.parsers())); // TODO - why reverse?<a name="line.176"></a>
+<span class="sourceLineNo">177</span> addEncoders(reverse(r.encoders())); // TODO - why reverse?<a name="line.177"></a>
+<span class="sourceLineNo">178</span> addDefaultRequestHeaders(r.defaultRequestHeaders());<a name="line.178"></a>
+<span class="sourceLineNo">179</span> addDefaultResponseHeaders(r.defaultResponseHeaders());<a name="line.179"></a>
+<span class="sourceLineNo">180</span> addResponseHandlers(r.responseHandlers());<a name="line.180"></a>
+<span class="sourceLineNo">181</span> addConverters(r.converters());<a name="line.181"></a>
+<span class="sourceLineNo">182</span> addGuards(reverse(r.guards()));<a name="line.182"></a>
+<span class="sourceLineNo">183</span> addChildResources(r.children());<a name="line.183"></a>
+<span class="sourceLineNo">184</span> addBeanFilters(r.beanFilters());<a name="line.184"></a>
+<span class="sourceLineNo">185</span> addPojoSwaps(r.pojoSwaps());<a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (! r.stylesheet().isEmpty())<a name="line.186"></a>
+<span class="sourceLineNo">187</span> setStyleSheet(c, r.stylesheet());<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (! r.favicon().isEmpty())<a name="line.188"></a>
+<span class="sourceLineNo">189</span> setFavIcon(c, r.favicon());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> if (! r.staticFiles().isEmpty())<a name="line.190"></a>
+<span class="sourceLineNo">191</span> addStaticFiles(c, r.staticFiles());<a name="line.191"></a>
+<span class="sourceLineNo">192</span> if (! r.path().isEmpty())<a name="line.192"></a>
+<span class="sourceLineNo">193</span> setPath(r.path());<a name="line.193"></a>
+<span class="sourceLineNo">194</span> if (! r.clientVersionHeader().isEmpty())<a name="line.194"></a>
+<span class="sourceLineNo">195</span> setClientVersionHeader(r.clientVersionHeader());<a name="line.195"></a>
+<span class="sourceLineNo">196</span> if (! r.pageTitle().isEmpty())<a name="line.196"></a>
+<span class="sourceLineNo">197</span> setPageTitle(r.pageTitle());<a name="line.197"></a>
+<span class="sourceLineNo">198</span> if (! r.pageText().isEmpty())<a name="line.198"></a>
+<span class="sourceLineNo">199</span> setPageText(r.pageText());<a name="line.199"></a>
+<span class="sourceLineNo">200</span> if (! r.pageLinks().isEmpty())<a name="line.200"></a>
+<span class="sourceLineNo">201</span> setPageLinks(r.pageLinks());<a name="line.201"></a>
+<span class="sourceLineNo">202</span> if (r.resourceResolver() != RestResourceResolver.class)<a name="line.202"></a>
+<span class="sourceLineNo">203</span> setResourceResolver(r.resourceResolver());<a name="line.203"></a>
+<span class="sourceLineNo">204</span> if (r.logger() != RestLogger.Normal.class)<a name="line.204"></a>
+<span class="sourceLineNo">205</span> setLogger(r.logger());<a name="line.205"></a>
+<span class="sourceLineNo">206</span> if (r.callHandler() != RestCallHandler.class)<a name="line.206"></a>
+<span class="sourceLineNo">207</span> setCallHandler(r.callHandler());<a name="line.207"></a>
+<span class="sourceLineNo">208</span> if (r.infoProvider() != RestInfoProvider.class)<a name="line.208"></a>
+<span class="sourceLineNo">209</span> setInfoProvider(r.infoProvider());<a name="line.209"></a>
+<span class="sourceLineNo">210</span> }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span> addResponseHandlers(<a name="line.212"></a>
+<span class="sourceLineNo">213</span> StreamableHandler.class,<a name="line.213"></a>
+<span class="sourceLineNo">214</span> WritableHandler.class,<a name="line.214"></a>
+<span class="sourceLineNo">215</span> ReaderHandler.class,<a name="line.215"></a>
+<span class="sourceLineNo">216</span> InputStreamHandler.class,<a name="line.216"></a>
+<span class="sourceLineNo">217</span> RedirectHandler.class,<a name="line.217"></a>
+<span class="sourceLineNo">218</span> DefaultHandler.class<a name="line.218"></a>
+<span class="sourceLineNo">219</span> );<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span> addMimeTypes(<a name="line.221"></a>
+<span class="sourceLineNo">222</span> "text/css css CSS",<a name="line.222"></a>
+<span class="sourceLineNo">223</span> "text/html html htm HTML",<a name="line.223"></a>
+<span class="sourceLineNo">224</span> "text/plain txt text TXT",<a name="line.224"></a>
+<span class="sourceLineNo">225</span> "application/javascript js",<a name="line.225"></a>
+<span class="sourceLineNo">226</span> "image/png png",<a name="line.226"></a>
+<span class="sourceLineNo">227</span> "image/gif gif",<a name="line.227"></a>
+<span class="sourceLineNo">228</span> "application/xml xml XML",<a name="line.228"></a>
+<span class="sourceLineNo">229</span> "application/json json JSON"<a name="line.229"></a>
+<span class="sourceLineNo">230</span> );<a name="line.230"></a>
+<span class="sourceLineNo">231</span> } catch (Exception e) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> throw new ServletException(e);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span> /**<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * Adds the specified {@link Var} classes to this config.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * <p><a name="line.238"></a>
+<span class="sourceLineNo">239</span> * These variables affect the variable resolver returned by {@link RestRequest#getVarResolverSession()} which is<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * used to resolve string variables of the form <js>"$X{...}"</js>.<a name="line.240"></a>
+<span class="sourceLineNo">241</span> * <p><a name="line.241"></a>
+<span class="sourceLineNo">242</span> * By default, this config includes the following variables:<a name="line.242"></a>
+<span class="sourceLineNo">243</span> * <ul class='spaced-list'><a name="line.243"></a>
+<span class="sourceLineNo">244</span> * <li>{@link SystemPropertiesVar}<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * <li>{@link EnvVariablesVar}<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * <li>{@link ConfigFileVar}<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * <li>{@link IfVar}<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * <li>{@link SwitchVar}<a name="line.248"></a>
+<span class="sourceLineNo">249</span> * </ul><a name="line.249"></a>
+<span class="sourceLineNo">250</span> * <p><a name="line.250"></a>
+<span class="sourceLineNo">251</span> * Later during the construction of {@link RestContext}, we add the following variables:<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * <ul><a name="line.252"></a>
+<span class="sourceLineNo">253</span> * <li>{@link LocalizationVar}<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * <li>{@link RequestVar}<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * <li>{@link SerializedRequestAttrVar}<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * <li>{@link ServletInitParamVar}<a name="line.256"></a>
+<span class="sourceLineNo">257</span> * <li>{@link UrlEncodeVar}<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * </ul><a name="line.258"></a>
+<span class="sourceLineNo">259</span> *<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * @param vars The {@link Var} classes to add to this config.<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * @return This object (for method chaining).<a name="line.261"></a>
+<span class="sourceLineNo">262</span> */<a name="line.262"></a>
+<span class="sourceLineNo">263</span> public RestConfig addVars(Class<?>...vars) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> this.varResolverBuilder.vars(vars);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> return this;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> /**<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * Adds a var context object to this config.<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * <p><a name="line.270"></a>
+<span class="sourceLineNo">271</span> * Var context objects are read-only objects associated with the variable resolver for<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * vars that require external information.<a name="line.272"></a>
+<span class="sourceLineNo">273</span> * <p><a name="line.273"></a>
+<span class="sourceLineNo">274</span> * For example, the {@link ConfigFileVar} needs access to this resource's {@link ConfigFile} through the {@link ConfigFileVar#SESSION_config}<a name="line.274"></a>
+<span class="sourceLineNo">275</span> * object that can be specified as either a session object (temporary) or context object (permanent).<a name="line.275"></a>
+<span class="sourceLineNo">276</span> * In this case, we call the following code to add it to the context map:<a name="line.276"></a>
+<span class="sourceLineNo">277</span> * <p class='bcode'><a name="line.277"></a>
+<span class="sourceLineNo">278</span> * config.addVarContextObject(<jsf>SESSION_config</jsf>, configFile);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> * </p><a name="line.279"></a>
+<span class="sourceLineNo">280</span> *<a name="line.280"></a>
+<span class="sourceLineNo">281</span> * @param name The context object key (i.e. the name that the Var class looks for).<a name="line.281"></a>
+<span class="sourceLineNo">282</span> * @param object The context object.<a name="line.282"></a>
+<span class="sourceLineNo">283</span> * @return This object (for method chaining).<a name="line.283"></a>
+<span class="sourceLineNo">284</span> */<a name="line.284"></a>
+<span class="sourceLineNo">285</span> public RestConfig addVarContextObject(String name, Object object) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> this.varResolverBuilder.contextObject(name, object);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> return this;<a name="line.287"></a>
+<span class="sourceLineNo">288</span> }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> /**<a name="line.290"></a>
+<span class="sourceLineNo">291</span> * Overwrites the default config file with a custom config file.<a name="line.291"></a>
+<span class="sourceLineNo">292</span> * <p><a name="line.292"></a>
+<span class="sourceLineNo">293</span> * By default, the config file is determined using the {@link RestResource#config() @RestResource.config()} annotation.<a name="line.293"></a>
+<span class="sourceLineNo">294</span> * This method allows you to programmatically override it with your own custom config file.<a name="line.294"></a>
+<span class="sourceLineNo">295</span> *<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * @param configFile The new config file.<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * @return This object (for method chaining).<a name="line.297"></a>
+<span class="sourceLineNo">298</span> */<a name="line.298"></a>
+<span class="sourceLineNo">299</span> public RestConfig setConfigFile(ConfigFile configFile) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> this.configFile = configFile;<a name="line.300"></a>
+<span class="sourceLineNo">301</span> return this;<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> /**<a name="line.304"></a>
+<span class="sourceLineNo">305</span> * Sets a property on this resource.<a name="line.305"></a>
+<span class="sourceLineNo">306</span> * <p><a name="line.306"></a>
+<span class="sourceLineNo">307</span> * This is the programmatic equivalent to the {@link RestResource#properties()} annotation.<a name="line.307"></a>
+<span class="sourceLineNo">308</span> *<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * @param key The property name.<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * @param value The property value.<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * @return This object (for method chaining).<a name="line.311"></a>
+<span class="sourceLineNo">312</span> */<a name="line.312"></a>
+<span class="sourceLineNo">313</span> public RestConfig setProperty(String key, Object value) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> this.properties.put(key, value);<a name="line.314"></a>
+<span class="sourceLineNo">315</span> return this;<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span> /**<a name="line.318"></a>
+<span class="sourceLineNo">319</span> * Sets multiple properties on this resource.<a name="line.319"></a>
+<span class="sourceLineNo">320</span> * <p><a name="line.320"></a>
+<span class="sourceLineNo">321</span> * This is the programmatic equivalent to the {@link RestResource#properties() @RestResource.properties()} annotation.<a name="line.321"></a>
+<span class="sourceLineNo">322</span> * <p><a name="line.322"></a>
+<span class="sourceLineNo">323</span> * Values in the map are added to the existing properties and are overwritten if duplicates are found.<a name="line.323"></a>
+<span class="sourceLineNo">324</span> *<a name="line.324"></a>
+<span class="sourceLineNo">325</span> * @param properties The new properties to add to this config.<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * @return This object (for method chaining).<a name="line.326"></a>
+<span class="sourceLineNo">327</span> */<a name="line.327"></a>
+<span class="sourceLineNo">328</span> public RestConfig setProperties(Map<String,Object> properties) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> this.properties.putAll(properties);<a name="line.329"></a>
+<span class="sourceLineNo">330</span> return this;<a name="line.330"></a>
+<span class="sourceLineNo">331</span> }<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span> /**<a name="line.333"></a>
+<span class="sourceLineNo">334</span> * Adds class-level bean filters to this resource.<a name="line.334"></a>
+<span class="sourceLineNo">335</span> * <p><a name="line.335"></a>
+<span class="sourceLineNo">336</span> * This is the programmatic equivalent to the {@link RestResource#beanFilters() @RestResource.beanFilters()} annotation.<a name="line.336"></a>
+<span class="sourceLineNo">337</span> * <p><a name="line.337"></a>
+<span class="sourceLineNo">338</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.338"></a>
+<span class="sourceLineNo">339</span> *<a name="line.339"></a>
+<span class="sourceLineNo">340</span> * @param beanFilters The bean filters to add to this config.<a name="line.340"></a>
+<span class="sourceLineNo">341</span> * @return This object (for method chaining).<a name="line.341"></a>
+<span class="sourceLineNo">342</span> */<a name="line.342"></a>
+<span class="sourceLineNo">343</span> public RestConfig addBeanFilters(Class<?>...beanFilters) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> this.beanFilters.addAll(Arrays.asList(beanFilters));<a name="line.344"></a>
+<span class="sourceLineNo">345</span> return this;<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> /**<a name="line.348"></a>
+<span class="sourceLineNo">349</span> * Adds class-level pojo swaps to this resource.<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * <p><a name="line.350"></a>
+<span class="sourceLineNo">351</span> * This is the programmatic equivalent to the {@link RestResource#pojoSwaps() @RestResource.pojoSwaps()} annotation.<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * <p><a name="line.352"></a>
+<span class="sourceLineNo">353</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.353"></a>
+<span class="sourceLineNo">354</span> *<a name="line.354"></a>
+<span class="sourceLineNo">355</span> * @param pojoSwaps The pojo swaps to add to this config.<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * @return This object (for method chaining).<a name="line.356"></a>
+<span class="sourceLineNo">357</span> */<a name="line.357"></a>
+<span class="sourceLineNo">358</span> public RestConfig addPojoSwaps(Class<?>...pojoSwaps) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> this.pojoSwaps.addAll(Arrays.asList(pojoSwaps));<a name="line.359"></a>
+<span class="sourceLineNo">360</span> return this;<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span> /**<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * Adds class-level serializers to this resource.<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * <p><a name="line.365"></a>
+<span class="sourceLineNo">366</span> * This is the programmatic equivalent to the {@link RestResource#serializers() @RestResource.serializers()} annotation.<a name="line.366"></a>
+<span class="sourceLineNo">367</span> * <p><a name="line.367"></a>
+<span class="sourceLineNo">368</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.368"></a>
+<span class="sourceLineNo">369</span> *<a name="line.369"></a>
+<span class="sourceLineNo">370</span> * @param serializers The serializer classes to add to this config.<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * @return This object (for method chaining).<a name="line.371"></a>
+<span class="sourceLineNo">372</span> */<a name="line.372"></a>
+<span class="sourceLineNo">373</span> public RestConfig addSerializers(Class<?>...serializers) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> this.serializers.append(serializers);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> return this;<a name="line.375"></a>
+<span class="sourceLineNo">376</span> }<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span> /**<a name="line.378"></a>
+<span class="sourceLineNo">379</span> * Adds class-level serializers to this resource.<a name="line.379"></a>
+<span class="sourceLineNo">380</span> * <p><a name="line.380"></a>
+<span class="sourceLineNo">381</span> * Same as {@link #addSerializers(Class...)} except allows you to pass in serializer instances.<a name="line.381"></a>
+<span class="sourceLineNo">382</span> * The actual serializer ends up being the result of this operation using the bean filters, pojo swaps, and properties on this config:<a name="line.382"></a>
+<span class="sourceLineNo">383</span> * <p class='bcode'><a name="line.383"></a>
+<span class="sourceLineNo">384</span> * serializer = serializer.builder().beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * </p><a name="line.385"></a>
+<span class="sourceLineNo">386</span> * <p><a name="line.386"></a>
+<span class="sourceLineNo">387</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.387"></a>
+<span class="sourceLineNo">388</span> *<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * @param serializers The serializers to add to this config.<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * @return This object (for method chaining).<a name="line.390"></a>
+<span class="sourceLineNo">391</span> */<a name="line.391"></a>
+<span class="sourceLineNo">392</span> public RestConfig addSerializers(Serializer...serializers) {<a name="line.392"></a>
+<span class="sourceLineNo">393</span> this.serializers.append(serializers);<a name="line.393"></a>
+<span class="sourceLineNo">394</span> return this;<a name="line.394"></a>
+<span class="sourceLineNo">395</span> }<a name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span> /**<a name="line.397"></a>
+<span class="sourceLineNo">398</span> * Adds class-level parsers to this resource.<a name="line.398"></a>
+<span class="sourceLineNo">399</span> * <p><a name="line.399"></a>
+<span class="sourceLineNo">400</span> * This is the programmatic equivalent to the {@link RestResource#parsers() @RestResource.parsers()} annotation.<a name="line.400"></a>
+<span class="sourceLineNo">401</span> * <p><a name="line.401"></a>
+<span class="sourceLineNo">402</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.402"></a>
+<span class="sourceLineNo">403</span> *<a name="line.403"></a>
+<span class="sourceLineNo">404</span> * @param parsers The parser classes to add to this config.<a name="line.404"></a>
+<span class="sourceLineNo">405</span> * @return This object (for method chaining).<a name="line.405"></a>
+<span class="sourceLineNo">406</span> */<a name="line.406"></a>
+<span class="sourceLineNo">407</span> public RestConfig addParsers(Class<?>...parsers) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> this.parsers.append(parsers);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> return this;<a name="line.409"></a>
+<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span> /**<a name="line.412"></a>
+<span class="sourceLineNo">413</span> * Adds class-level parsers to this resource.<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * <p><a name="line.414"></a>
+<span class="sourceLineNo">415</span> * Same as {@link #addParsers(Class...)} except allows you to pass in parser instances.<a name="line.415"></a>
+<span class="sourceLineNo">416</span> * The actual parser ends up being the result of this operation using the bean filters, pojo swaps, and properties on this config:<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * <p class='bcode'><a name="line.417"></a>
+<span class="sourceLineNo">418</span> * parser = parser.builder().beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a name="line.418"></a>
+<span class="sourceLineNo">419</span> * </p><a name="line.419"></a>
+<span class="sourceLineNo">420</span> * <p><a name="line.420"></a>
+<span class="sourceLineNo">421</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> *<a name="line.422"></a>
+<span class="sourceLineNo">423</span> * @param parsers The parsers to add to this config.<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * @return This object (for method chaining).<a name="line.424"></a>
+<span class="sourceLineNo">425</span> */<a name="line.425"></a>
+<span class="sourceLineNo">426</span> public RestConfig addParsers(Parser...parsers) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> this.parsers.append(parsers);<a name="line.427"></a>
+<span class="sourceLineNo">428</span> return this;<a name="line.428"></a>
+<span class="sourceLineNo">429</span> }<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span> /**<a name="line.431"></a>
+<span class="sourceLineNo">432</span> * Adds class-level encoders to this resource.<a name="line.432"></a>
+<span class="sourceLineNo">433</span> * <p><a name="line.433"></a>
+<span class="sourceLineNo">434</span> * This is the programmatic equivalent to the {@link RestResource#encoders() @RestResource.encoders()} annotation.<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * <p><a name="line.435"></a>
+<span class="sourceLineNo">436</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.436"></a>
+<span class="sourceLineNo">437</span> * <p><a name="line.437"></a>
+<span class="sourceLineNo">438</span> * By default, only the {@link IdentityEncoder} is included in this list.<a name="line.438"></a>
+<span class="sourceLineNo">439</span> *<a name="line.439"></a>
+<span class="sourceLineNo">440</span> * @param encoders The parser classes to add to this config.<a name="line.440"></a>
+<span class="sourceLineNo">441</span> * @return This object (for method chaining).<a name="line.441"></a>
+<span class="sourceLineNo">442</span> */<a name="line.442"></a>
+<span class="sourceLineNo">443</span> public RestConfig addEncoders(Class<?>...encoders) {<a name="line.443"></a>
+<span class="sourceLineNo">444</span> this.encoders.append(encoders);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> return this;<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span> /**<a name="line.448"></a>
+<span class="sourceLineNo">449</span> * Adds class-level encoders to this resource.<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * <p><a name="line.450"></a>
+<span class="sourceLineNo">451</span> * Same as {@link #addEncoders(Class...)} except allows you to pass in encoder instances.<a name="line.451"></a>
+<span class="sourceLineNo">452</span> *<a name="line.452"></a>
+<span class="sourceLineNo">453</span> * @param encoders The encoders to add to this config.<a name="line.453"></a>
+<span class="sourceLineNo">454</span> * @return This object (for method chaining).<a name="line.454"></a>
+<span class="sourceLineNo">455</span> */<a name="line.455"></a>
+<span class="sourceLineNo">456</span> public RestConfig addEncoders(Encoder...encoders) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span> this.encoders.append(encoders);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return this;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span> /**<a name="line.461"></a>
+<span class="sourceLineNo">462</span> * Adds class-level converters to this resource.<a name="line.462"></a>
+<span class="sourceLineNo">463</span> * <p><a name="line.463"></a>
+<span class="sourceLineNo">464</span> * This is the programmatic equivalent to the {@link RestResource#converters() @RestResource.converters()} annotation.<a name="line.464"></a>
+<span class="sourceLineNo">465</span> * <p><a name="line.465"></a>
+<span class="sourceLineNo">466</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.466"></a>
+<span class="sourceLineNo">467</span> * <p><a name="line.467"></a>
+<span class="sourceLineNo">468</span> * By default, this config includes the following converters:<a name="line.468"></a>
+<span class="sourceLineNo">469</span> * <ul class='spaced-list'><a name="line.469"></a>
+<span class="sourceLineNo">470</span> * <li>{@link StreamableHandler}<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * <li>{@link WritableHandler}<a name="line.471"></a>
+<span class="sourceLineNo">472</span> * <li>{@link ReaderHandler}<a name="line.472"></a>
+<span class="sourceLineNo">473</span> * <li>{@link InputStreamHandler}<a name="line.473"></a>
+<span class="sourceLineNo">474</span> * <li>{@link RedirectHandler}<a name="line.474"></a>
+<span class="sourceLineNo">475</span> * <li>{@link DefaultHandler}<a name="line.475"></a>
+<span class="sourceLineNo">476</span> * </ul><a name="line.476"></a>
+<span class="sourceLineNo">477</span> *<a name="line.477"></a>
+<span class="sourceLineNo">478</span> * @param converters The converter classes to add to this config.<a name="line.478"></a>
+<span class="sourceLineNo">479</span> * @return This object (for method chaining).<a name="line.479"></a>
+<span class="sourceLineNo">480</span> */<a name="line.480"></a>
+<span class="sourceLineNo">481</span> public RestConfig addConverters(Class<?>...converters) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span> this.converters.addAll(Arrays.asList(converters));<a name="line.482"></a>
+<span class="sourceLineNo">483</span> return this;<a name="line.483"></a>
+<span class="sourceLineNo">484</span> }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span> /**<a name="line.486"></a>
+<span class="sourceLineNo">487</span> * Adds class-level encoders to this resource.<a name="line.487"></a>
+<span class="sourceLineNo">488</span> * <p><a name="line.488"></a>
+<span class="sourceLineNo">489</span> * Same as {@link #addConverters(Class...)} except allows you to pass in converter instances.<a name="line.489"></a>
+<span class="sourceLineNo">490</span> *<a name="line.490"></a>
+<span class="sourceLineNo">491</span> * @param converters The converters to add to this config.<a name="line.491"></a>
+<span class="sourceLineNo">492</span> * @return This object (for method chaining).<a name="line.492"></a>
+<span class="sourceLineNo">493</span> */<a name="line.493"></a>
+<span class="sourceLineNo">494</span> public RestConfig addConverters(RestConverter...converters) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span> this.converters.addAll(Arrays.asList(converters));<a name="line.495"></a>
+<span class="sourceLineNo">496</span> return this;<a name="line.496"></a>
+<span class="sourceLineNo">497</span> }<a name="line.497"></a>
+<span class="sourceLineNo">498</span><a name="line.498"></a>
+<span class="sourceLineNo">499</span> /**<a name="line.499"></a>
+<span class="sourceLineNo">500</span> * Adds class-level guards to this resource.<a name="line.500"></a>
+<span class="sourceLineNo">501</span> * <p><a name="line.501"></a>
+<span class="sourceLineNo">502</span> * This is the programmatic equivalent to the {@link RestResource#guards() @RestResource.guards()} annotation.<a name="line.502"></a>
+<span class="sourceLineNo">503</span> * <p><a name="line.503"></a>
+<span class="sourceLineNo">504</span> * Values are added AFTER those found in the annotation and therefore take precedence over those defined via the annotation.<a name="line.504"></a>
+<span class="sourceLineNo">505</span> *<a name="line.505"></a>
+<span class="sourceLineNo">506</span> * @param guards The guard classes to add to this config.<a name="line.506"></a>
+<span class="sourceLineNo">507</span> * @return This object (for method chaining).<a name="line.507"></a>
+<span class="sourceLineNo">508</span> */<a name="line.508"></a>
+<span class="sourceLineNo">509</span> public RestConfig addGuards(Class<?>...guards) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span> this.guards.addAll(Arrays.asList(guards));<a name="line.510"></a>
+<span class="sourceLineNo">511</span> return this;<a name="line.511"></a>
+<span class="sourceLineNo">512</span> }<a name="line.512"></a>
+<span class="sourceLineNo">513</span><a name="line.513"></a>
+<span class="sourceLineNo">514</span> /**<a name="line.514"></a>
+<span class="sourceLineNo">515</span> * Adds class-level guards to this resource.<a name="line.515"></a>
+<span class="sourceLineNo">516</span> * <p><a name="line.516"></a>
+<span class="sourceLineNo">517</span> * Same as {@link #addGuards(Class...)} except allows you to pass in guard instances.<a name="line.517"></a>
+<span class="sourceLineNo">518</span> *<a name="line.518"></a>
+<span class="sourceLineNo">519</span> * @param guards The guards to add to this config.<a name="line.519"></a>
+<span class="sourceLineNo">520</span> * @return This object (for method chaining).<a name="line.520"></a>
+<span class="sourceLineNo">521</span> */<a name="line.521"></a>
+<span class="sourceLineNo">522</span> public RestConfig addGuards(RestGuard...guards) {<a name="line.522"></a>
+<span class="sourceLineNo">523</span> this.guards.addAll(Arrays.asList(guards));<a name="line.523"></a>
+<span class="sourceLineNo">524</span> return this;<a name="line.524"></a>
+<span class="sourceLineNo">525</span> }<a name="line.525"></a>
+<span class="sourceLineNo">526</span><a name="line.526"></a>
+<span class="sourceLineNo">527</span> /**<a name="line.527"></a>
+<span class="sourceLineNo">528</span> * Adds MIME-type definitions.<a name="line.528"></a>
<span class="sourceLineNo">529</span> * <p><a name="line.529"></a>
-<span class="sourceLineNo">530</span> * By default, this config includes the following mime-type definitions:<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * <ul class='spaced-list'><a name="line.531"></a>
-<span class="sourceLineNo">532</span> * <li><js>"text/css css CSS"</js><a name="line.532"></a>
-<span class="sourceLineNo">533</span> * <li><js>"text/html html htm HTML"</js><a name="line.533"></a>
-<span class="sourceLineNo">534</span> * <li><js>"text/plain txt text TXT"</js><a name="line.534"></a>
-<span class="sourceLineNo">535</span> * <li><js>"application/javascript js"</js><a name="line.535"></a>
-<span class="sourceLineNo">536</span> * <li><js>"image/png png"</js><a name="line.536"></a>
-<span class="sourceLineNo">537</span> * <li><js>"image/gif gif"</js><a name="line.537"></a>
-<span class="sourceLineNo">538</span> * <li><js>"application/xml xml XML"</js><a name="line.538"></a>
-<span class="sourceLineNo">539</span> * <li><js>"application/json json JSON"</js><a name="line.539"></a>
-<span class="sourceLineNo">540</span> * </ul><a name="line.540"></a>
-<span class="sourceLineNo">541</span> *<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * @param mimeTypes The MIME-types to add to this config.<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * @return This object (for method chaining).<a name="line.543"></a>
-<span class="sourceLineNo">544</span> */<a name="line.544"></a>
-<span class="sourceLineNo">545</span> public RestConfig addMimeTypes(String...mimeTypes) {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> for (String mimeType : mimeTypes)<a name="line.546"></a>
-<span class="sourceLineNo">547</span> this.mimeTypes.addMimeTypes(mimeType);<a name="line.547"></a>
-<span class="sourceLineNo">548</span> return this;<a name="line.548"></a>
-<span class="sourceLineNo">549</span> }<a name="line.549"></a>
-<span class="sourceLineNo">550</span><a name="line.550"></a>
-<span class="sourceLineNo">551</span> /**<a name="line.551"></a>
-<span class="sourceLineNo">552</span> * Adds class-level default HTTP request headers to this resource.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * <p><a name="line.553"></a>
-<span class="sourceLineNo">554</span> * Default request headers are default values for when HTTP requests do not specify a header value.<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * For example, you can specify a default value for <code>Accept</code> if a request does not specify that header value.<a name="line.555"></a>
-<span class="sourceLineNo">556</span> * <p><a name="line.556"></a>
-<span class="sourceLineNo">557</span> * This is the programmatic equivalent to the {@link RestResource#defaultRequestHeaders() @RestResource.defaultRequestHeaders()} annotation.<a name="line.557"></a>
-<span class="sourceLineNo">558</span> *<a name="line.558"></a>
-<span class="sourceLineNo">559</span> * @param name The HTTP header name.<a name="line.559"></a>
-<span class="sourceLineNo">560</span> * @param value The HTTP header value.<a name="line.560"></a>
-<span class="sourceLineNo">561</span> * @return This object (for method chaining).<a name="line.561"></a>
-<span class="sourceLineNo">562</span> */<a name="line.562"></a>
-<span class="sourceLineNo">563</span> public RestConfig addDefaultRequestHeader(String name, Object value) {<a name="line.563"></a>
-<span class="sourceLineNo">564</span> this.defaultRequestHeaders.put(name, StringUtils.toString(value));<a name="line.564"></a>
-<span class="sourceLineNo">565</span> return this;<a name="line.565"></a>
-<span class="sourceLineNo">566</span> }<a name="line.566"></a>
-<span class="sourceLineNo">567</span><a name="line.567"></a>
-<span class="sourceLineNo">568</span> /**<a name="line.568"></a>
-<span class="sourceLineNo">569</span> * Adds class-level default HTTP request headers to this resource.<a name="line.569"></a>
-<span class="sourceLineNo">570</span> * <p><a name="line.570"></a>
-<span class="sourceLineNo">571</span> * Default request headers are default values for when HTTP requests do not specify a header value.<a name="line.571"></a>
-<span class="sourceLineNo">572</span> * For example, you can specify a default value for <code>Accept</code> if a request does not specify that header value.<a name="line.572"></a>
-<span class="sourceLineNo">573</span> * <p><a name="line.573"></a>
-<span class="sourceLineNo">574</span> * This is the programmatic equivalent to the {@link RestResource#defaultRequestHeaders() @RestResource.defaultRequestHeaders()} annotation.<a name="line.574"></a>
-<span class="sourceLineNo">575</span> *<a name="line.575"></a>
-<span class="sourceLineNo">576</span> * @param headers HTTP headers of the form <js>"Name: Value"</js>.<a name="line.576"></a>
-<span class="sourceLineNo">577</span> * @return This object (for method chaining).<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * @throws RestServletExcepti
<TRUNCATED>
[44/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/ini/ConfigMgr.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigMgr.html b/content/site/apidocs/org/apache/juneau/ini/ConfigMgr.html
deleted file mode 100644
index bd01157..0000000
--- a/content/site/apidocs/org/apache/juneau/ini/ConfigMgr.html
+++ /dev/null
@@ -1,555 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ConfigMgr (Apache Juneau (incubating) 6.1.1-incubating-SNAPSHOT)</title>
-<link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
- try {
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="ConfigMgr (Apache Juneau (incubating) 6.1.1-incubating-SNAPSHOT)";
- }
- }
- catch(err) {
- }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!-- -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!-- -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigMgr.html" target="_top">Frames</a></li>
-<li><a href="ConfigMgr.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_top");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li><a href="#field.summary">Field</a> | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li><a href="#field.detail">Field</a> | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!-- -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau.ini</div>
-<h2 title="Class ConfigMgr" class="title">Class ConfigMgr</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.ini.ConfigMgr</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/ini/ConfigMgr.html#line.37">ConfigMgr</a>
-extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
-<div class="block">Manager for retrieving shared instances of <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFiles</code></a>.
-
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
- ConfigFile cf = ConfigMgr.<jsf>DEFAULT</jsf>.get(<js>"MyConfig.cfg"</js>);
- String setting = cf.get(<js>"MySection/mysetting"</js>);
- </p></div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!-- -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigMgr.html#DEFAULT">DEFAULT</a></span></code>
-<div class="block">Default reusable configuration manager.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!-- -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigMgr.html#ConfigMgr-boolean-org.apache.juneau.ini.Encoder-org.apache.juneau.serializer.WriterSerializer-org.apache.juneau.parser.ReaderParser-java.nio.charset.Charset-java.lang.String:A-">ConfigMgr</a></span>(boolean readOnly,
- <a href="../../../../org/apache/juneau/ini/Encoder.html" title="interface in org.apache.juneau.ini">Encoder</a> encoder,
- <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a> serializer,
- <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="class in org.apache.juneau.parser">ReaderParser</a> parser,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html?is-external=true" title="class or interface in java.nio.charset">Charset</a> charset,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] searchPaths)</code>
-<div class="block">Create a custom configuration manager.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!-- -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigMgr.html#create--">create</a></span>()</code>
-<div class="block">Create a new empty config file not backed by any file.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigMgr.html#create-java.io.File-">create</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)</code>
-<div class="block">Create a new config file backed by the specified file.</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigMgr.html#create-java.io.Reader-">create</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> r)</code>
-<div class="block">Create a new config file not backed by a file.</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigMgr.html#deleteAll--">deleteAll</a></span>()</code>
-<div class="block">Delete all configuration files registered with this config manager.</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigMgr.html#get-java.lang.String-">get</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</code>
-<div class="block">Returns the config file with the specified absolute or relative path.</div>
-</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigMgr.html#get-java.lang.String-boolean-">get</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
- boolean create)</code>
-<div class="block">Returns the config file with the specified absolute or relative path.</div>
-</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigMgr.html#loadIfModified--">loadIfModified</a></span>()</code>
-<div class="block">Reloads any config files that were modified.</div>
-</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigMgr.html#main-java.lang.String:A-">main</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)</code>
-<div class="block">Implements command-line features for working with INI configuration files.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!-- -->
-</a>
-<h3>Methods inherited from class java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <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>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang
/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!-- -->
-</a>
-<h3>Field Detail</h3>
-<a name="DEFAULT">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>DEFAULT</h4>
-<pre>public static final <a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigMgr.html#line.50">DEFAULT</a></pre>
-<div class="block">Default reusable configuration manager.
- <ul class='spaced-list'>
- <li>Read-only: <jk>false</jk>.
- <li>Encoder: <a href="../../../../org/apache/juneau/ini/XorEncoder.html" title="class in org.apache.juneau.ini"><code>XorEncoder</code></a>.
- <li>Serializer: <a href="../../../../org/apache/juneau/json/JsonSerializer.html#DEFAULT"><code>JsonSerializer.DEFAULT</code></a>.
- <li>Parser: <a href="../../../../org/apache/juneau/json/JsonParser.html#DEFAULT"><code>JsonParser.DEFAULT</code></a>.
- <li>Charset: <a href="http://docs.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html?is-external=true#defaultCharset--" title="class or interface in java.nio.charset"><code>Charset.defaultCharset()</code></a>.
- <li>Search paths: [<js>"."</js>].
- </ul></div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!-- -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ConfigMgr-boolean-org.apache.juneau.ini.Encoder-org.apache.juneau.serializer.WriterSerializer-org.apache.juneau.parser.ReaderParser-java.nio.charset.Charset-java.lang.String:A-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ConfigMgr</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/ini/ConfigMgr.html#line.71">ConfigMgr</a>(boolean readOnly,
- <a href="../../../../org/apache/juneau/ini/Encoder.html" title="interface in org.apache.juneau.ini">Encoder</a> encoder,
- <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a> serializer,
- <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="class in org.apache.juneau.parser">ReaderParser</a> parser,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html?is-external=true" title="class or interface in java.nio.charset">Charset</a> charset,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] searchPaths)</pre>
-<div class="block">Create a custom configuration manager.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>readOnly</code> - Make <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFiles</code></a> read-only.</dd>
-<dd><code>encoder</code> - Optional. Specify the encoder to use for encoded config file entries (e.g. <js>"mySecret*={...}"</js>).</dd>
-<dd><code>serializer</code> - Optional. Specify the serializer to use for serializing POJOs when using <a href="../../../../org/apache/juneau/ini/ConfigFile.html#put-java.lang.String-java.lang.Object-"><code>ConfigFile.put(String, Object)</code></a>.</dd>
-<dd><code>parser</code> - Optional. Specify the parser to use for parsing POJOs when using <a href="../../../../org/apache/juneau/ini/ConfigFile.html#getObject-java.lang.Class-java.lang.String-"><code>ConfigFile.getObject(Class,String)</code></a>.</dd>
-<dd><code>charset</code> - Optional. Specify the config file character encoding. If <jk>null</jk>, uses <a href="http://docs.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html?is-external=true#defaultCharset--" title="class or interface in java.nio.charset"><code>Charset.defaultCharset()</code></a>.</dd>
-<dd><code>searchPaths</code> - Specify the search paths for config files. Can contain relative or absolute paths.</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!-- -->
-</a>
-<h3>Method Detail</h3>
-<a name="get-java.lang.String-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>get</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigMgr.html#line.92">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Returns the config file with the specified absolute or relative path.
- <p>
- Multiple calls to the same path return the same <code>ConfigFile</code> instance.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>path</code> - The absolute or relative path of the config file.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The config file.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If config file could not be parsed.</dd>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/FileNotFoundException.html?is-external=true" title="class or interface in java.io">FileNotFoundException</a></code> - If config file could not be found.</dd>
-</dl>
-</li>
-</ul>
-<a name="get-java.lang.String-boolean-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>get</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigMgr.html#line.110">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
- boolean create)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Returns the config file with the specified absolute or relative path.
- <p>
- Multiple calls to the same path return the same <code>ConfigFile</code> instance.
- <p>
- If file doesn't exist and <code>create</code> is <jk>true</jk>, the configuration file will be
- create in the location identified by the first entry in the search paths.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>path</code> - The absolute or relative path of the config file.</dd>
-<dd><code>create</code> - Create the config file if it doesn't exist.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The config file.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If config file could not be parsed.</dd>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/FileNotFoundException.html?is-external=true" title="class or interface in java.io">FileNotFoundException</a></code> - If config file could not be found or could not be created.</dd>
-</dl>
-</li>
-</ul>
-<a name="create--">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>create</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigMgr.html#line.129">create</a>()
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Create a new empty config file not backed by any file.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>A new config file.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="create-java.io.File-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>create</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigMgr.html#line.143">create</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Create a new config file backed by the specified file.
- Note that <a href="../../../../org/apache/juneau/ini/ConfigMgr.html#get-java.lang.String-"><code>get(String)</code></a> is the preferred method for getting access to config files
- since this method will create a new config file each time it is called.
- This method is provided primarily for testing purposes.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>f</code> - The file to create a config file from.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>A new config file.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="create-java.io.Reader-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>create</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigMgr.html#line.154">create</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> r)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Create a new config file not backed by a file.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>r</code> - The reader containing an INI-formatted file to initialize the config file from.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>A new config file.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="loadIfModified--">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>loadIfModified</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/ini/ConfigMgr.html#line.162">loadIfModified</a>()
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Reloads any config files that were modified.</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="deleteAll--">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>deleteAll</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/ini/ConfigMgr.html#line.170">deleteAll</a>()</pre>
-<div class="block">Delete all configuration files registered with this config manager.</div>
-</li>
-</ul>
-<a name="main-java.lang.String:A-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>main</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/juneau/ini/ConfigMgr.html#line.250">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)</pre>
-<div class="block">Implements command-line features for working with INI configuration files.
- <p>
- Invoke as a normal Java program...
- <p>
- <p class='bcode'>
- java org.apache.juneau.ini.ConfigMgr [args]
- </p>
- <p>
- Arguments can be any of the following...
- <ul class='spaced-list'>
- <li>No arguments<br>
- Prints usage message.<br>
- <li><code>createBatchEnvFile -configfile <configFile> -envfile <batchFile> [-verbose]</code><br>
- Creates a batch file that will set each config file entry as an environment variable.<br>
- Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)
- will be converted to underscores.<br>
- <li><code>createShellEnvFile -configFile <configFile> -envFile <configFile> [-verbose]</code>
- Creates a shell script that will set each config file entry as an environment variable.<br>
- Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)
- will be converted to underscores.<br>
- <li><code>setVals -configFile <configFile> -vals [var1=val1 [var2=val2...]] [-verbose]</code>
- Sets values in config files.<br>
- </ul>
- <p>
- For example, the following command will create the file <code>'MyConfig.bat'</code> from the contents of the file <code>'MyConfig.cfg'</code>.
- <p class='bcode'>
- java org.apache.juneau.ini.ConfigMgr createBatchEnvFile -configfile C:\foo\MyConfig.cfg -batchfile C:\foo\MyConfig.bat
- </p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>args</code> - Command-line arguments</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!-- -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!-- -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigMgr.html" target="_top">Frames</a></li>
-<li><a href="ConfigMgr.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_bottom");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li><a href="#field.summary">Field</a> | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li><a href="#field.detail">Field</a> | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/ini/ConfigUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigUtils.html b/content/site/apidocs/org/apache/juneau/ini/ConfigUtils.html
index 9ef7866..be87eeb 100644
--- a/content/site/apidocs/org/apache/juneau/ini/ConfigUtils.html
+++ b/content/site/apidocs/org/apache/juneau/ini/ConfigUtils.html
@@ -42,7 +42,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/ini/Encoder.html" title="interface in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -191,7 +191,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/ini/Encoder.html" title="interface in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/ini/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/package-frame.html b/content/site/apidocs/org/apache/juneau/ini/package-frame.html
index 520f458..ef9c543 100644
--- a/content/site/apidocs/org/apache/juneau/ini/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/ini/package-frame.html
@@ -18,10 +18,10 @@
<h2 title="Classes">Classes</h2>
<ul title="Classes">
<li><a href="ConfigFile.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFile</a></li>
+<li><a href="ConfigFileBuilder.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileBuilder</a></li>
<li><a href="ConfigFileImpl.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileImpl</a></li>
<li><a href="ConfigFileListener.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileListener</a></li>
<li><a href="ConfigFileWrapped.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileWrapped</a></li>
-<li><a href="ConfigMgr.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigMgr</a></li>
<li><a href="ConfigUtils.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigUtils</a></li>
<li><a href="EntryListener.html" title="class in org.apache.juneau.ini" target="classFrame">EntryListener</a></li>
<li><a href="Section.html" title="class in org.apache.juneau.ini" target="classFrame">Section</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/ini/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/package-summary.html b/content/site/apidocs/org/apache/juneau/ini/package-summary.html
index 60ff27c..ea9d4c6 100644
--- a/content/site/apidocs/org/apache/juneau/ini/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/ini/package-summary.html
@@ -109,30 +109,30 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></td>
+<td class="colLast">
+<div class="block">Builder for creating instances of <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFiles</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a></td>
<td class="colLast">
<div class="block">Implementation class for <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a>.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a></td>
<td class="colLast">
<div class="block">Listener that can be used to listen for change events in config files.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></td>
<td class="colLast">
<div class="block">Wraps an instance of <a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><code>ConfigFileImpl</code></a> in an interface that will
automatically replace <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a> variables.</div>
</td>
</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></td>
-<td class="colLast">
-<div class="block">Manager for retrieving shared instances of <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFiles</code></a>.</div>
-</td>
-</tr>
<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini">ConfigUtils</a></td>
<td class="colLast">
@@ -224,7 +224,7 @@
<h2 class='topic' onclick='toggle(this)'>1 - Overview</h2>
<div class='topic'>
<p>
- The <a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><code>ConfigMgr</code></a> and <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> classes
+ The <a href="../../../../org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini"><code>ConfigFileBuilder</code></a> and <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> classes
implement an API for working with INI-style configuration files such as the following:
</p>
<p class='bcode'>
@@ -247,7 +247,7 @@
</p>
<p>
- The <a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><code>ConfigMgr</code></a> class is used to instantiate instances of
+ The <a href="../../../../org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini"><code>ConfigFileBuilder</code></a> class is used to instantiate instances of
<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> which can then be used to retrieve config file values through either <js>"key"</js> or <js>"Section/key"</js> identifiers.
</p>
@@ -258,7 +258,7 @@
URL key4;
<jc>// Get our config file using the default config manager</jc>
- ConfigFile f = ConfigMgr.<jsf>DEFAULT</jsf>.getConfig(<js>"C:/temp/MyConfig.cfg"</js>);
+ ConfigFile f = <jk>new</jk> ConfigFileBuilder().build(<js>"C:/temp/MyConfig.cfg"</js>);
<jc>// Read values from default section</jc>
key1 = f.getInt(<js>"key1"</js>);
@@ -279,7 +279,7 @@
<p class='bcode'>
<jc>// Construct the sample INI file programmatically</jc>
- ConfigFile f = ConfigMgr.<jsf>DEFAULT</jsf>.getConfig(<js>"C:/temp/MyConfig.cfg"</js>, <jk>true</jk>)
+ ConfigFile f = <jk>new</jk> ConfigFileBuilder().build(<js>"C:/temp/MyConfig.cfg"</js>, <jk>true</jk>)
.addLines(<jk>null</jk>, <jc>// The default 'null' section</jc>
<js>"# Default section"</js>, <jc>// A regular comment</jc>
<js>"key1 = 1"</js>, <jc>// A numeric entry</jc>
@@ -302,7 +302,7 @@
Note how we're setting values as POJOs which will be automatically converted to strings when persisted to disk.
<p class='bcode'>
<jc>// Construct the sample INI file programmatically</jc>
- ConfigFile f = ConfigMgr.<jsf>DEFAULT</jsf>.getConfig(<js>"C:/temp/MyConfig.cfg"</js>, <jk>true</jk>)
+ ConfigFile f = <jk>new</jk> ConfigFileBuilder().build(<js>"C:/temp/MyConfig.cfg"</js>, <jk>true</jk>)
.addLines(<jk>null</jk>,
<js>"# Default section"</js>)
.addHeaderComments(<js>"Section1"</js>,
@@ -402,11 +402,6 @@
<ck>customMessage</ck> = <cv>Java home is $C{MyProperties/javaHome} and the environment path is $C{MyProperties/path}.</cv>
</p>
<p>
- Resolving config files (and any config files retrieved through the same <code>ConfigMgr</code> that point to the same physical file)
- share the same underlying config files in memory.
- This allows changes in one instance of the config file to be reflected in all.
- </p>
- <p>
Support for variables is extensible. You can add support for your own variables by implementing custom
<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolvers</code></a>.<br>
For example, the microservice <code>Resource</code> class provides access to config files that
@@ -457,8 +452,8 @@
<p>
The default encoder is <a href="../../../../org/apache/juneau/ini/XorEncoder.html" title="class in org.apache.juneau.ini"><code>XorEncoder</code></a> which is a simple XOR+Base64 encoder.<br>
If desired, custom encoder can be used by implementing the <a href="../../../../org/apache/juneau/ini/Encoder.html" title="interface in org.apache.juneau.ini"><code>Encoder</code></a>
- interface and creating your own <code>ConfigMgr</code> using the <a href="../../../../org/apache/juneau/ini/ConfigMgr.html#ConfigMgr-boolean-org.apache.juneau.ini.Encoder-org.apache.juneau.serializer.WriterSerializer-org.apache.juneau.parser.ReaderParser-java.nio.charset.Charset-java.lang.String:A-"><code>ConfigMgr.ConfigMgr(boolean,Encoder,WriterSerializer,ReaderParser,Charset,String[])</code></a>
- constructor.
+ interface and creating your own <code>ConfigFileBuilder</code> using the <a href="../../../../org/apache/juneau/ini/ConfigFileBuilder.html#encoder-org.apache.juneau.ini.Encoder-"><code>ConfigFileBuilder.encoder(Encoder)</code></a>
+ method.
</p>
</div>
@@ -483,7 +478,7 @@
<h6 class="topic">Example:</h6>
<p class='bcode'>
<jc>// Get our config file using the default config manager</jc>
- ConfigFile f = ConfigMgr.<jsf>DEFAULT</jsf>.getConfig(<js>"C:/temp/MyConfig.cfg"</js>);
+ ConfigFile f = <jk>new</jk> ConfigFileBuilder().build(<js>"C:/temp/MyConfig.cfg"</js>);
<jc>// Add a listener for an entry</jc>
f.addListener(
@@ -495,10 +490,6 @@
}
);
</p>
- <p>
- Note that since <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> instances for the same physical files are shared in <a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><code>ConfigMgr</code></a>, a change made
- in once instance of a config file will trigger all listeners defined on that physical file.
- </p>
</div>
<!-- ======================================================================================================== -->
@@ -506,12 +497,12 @@
<h2 class='topic' onclick='toggle(this)'>5 - Command Line API</h2>
<div class='topic'>
<p>
- The <a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><code>ConfigMgr</code></a> class contains a <a href="../../../../org/apache/juneau/ini/ConfigMgr.html#main-java.lang.String:A-"><code>ConfigMgr.main(String[])</code></a>
+ The <a href="../../../../org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini"><code>ConfigFileBuilder</code></a> class contains a <a href="../../../../org/apache/juneau/ini/ConfigFileBuilder.html#main-java.lang.String:A-"><code>ConfigFileBuilder.main(String[])</code></a>
method that can be used to work with config files through a command-line prompt.<br>
This is invoked as a normal Java command:
</p>
<p class='bcode'>
- java -jar juneau.jar org.apache.juneau.ini.ConfigMgr [args]
+ java -jar juneau.jar org.apache.juneau.ini.ConfigFileBuilder [args]
</p>
<p>
Arguments can be any of the following...
@@ -534,7 +525,7 @@
For example, the following command will create the file <code>'MyConfig.bat'</code> from the contents of the file <code>'MyConfig.cfg'</code>.
</p>
<p class='bcode'>
- java org.apache.juneau.ini.ConfigMgr createBatchEnvFile -configfile C:\foo\MyConfig.cfg -batchfile C:\foo\MyConfig.bat
+ java org.apache.juneau.ini.ConfigFileBuilder createBatchEnvFile -configfile C:\foo\MyConfig.cfg -batchfile C:\foo\MyConfig.bat
</p>
</div>
@@ -789,7 +780,7 @@
<jk>public</jk> ConfigFile setConfigContents(<ja>@Body</ja> Reader contents) <jk>throws</jk> Exception {
<jc>// Create a new in-memory config file based on the contents of the HTTP request.</jc>
- ConfigFile cf2 = ConfigMgr.<jsf>DEFAULT</jsf>.create().load(contents);
+ ConfigFile cf2 = new ConfigFileBuilder.build().load(contents);
<jc>// Merge the in-memory config file into the existing config file and save it.
// Then return the modified config file to be parsed as a POJO.</jc>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/ini/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/package-tree.html b/content/site/apidocs/org/apache/juneau/ini/package-tree.html
index 02ee142..bdf8ce9 100644
--- a/content/site/apidocs/org/apache/juneau/ini/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/ini/package-tree.html
@@ -86,13 +86,13 @@
<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileWrapped</span></a></li>
</ul>
</li>
+<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileBuilder</span></a></li>
<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileListener</span></a>
<ul>
<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/EntryListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">EntryListener</span></a></li>
<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/SectionListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">SectionListener</span></a></li>
</ul>
</li>
-<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigMgr</span></a></li>
<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigUtils</span></a></li>
<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Section</span></a> (implements java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V>)</li>
<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/XorEncoder.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">XorEncoder</span></a> (implements org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/Encoder.html" title="interface in org.apache.juneau.ini">Encoder</a>)</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/jena/RdfCommonContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfCommonContext.html b/content/site/apidocs/org/apache/juneau/jena/RdfCommonContext.html
index d03a5e4..1872540 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfCommonContext.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfCommonContext.html
@@ -341,7 +341,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_language</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.68">RDF_language</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.67">RDF_language</a></pre>
<div class="block"><b>Configuration property:</b> RDF language.
<p>
<ul>
@@ -379,7 +379,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_juneauNs</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.79">RDF_juneauNs</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.78">RDF_juneauNs</a></pre>
<div class="block"><b>Configuration property:</b> XML namespace for Juneau properties.
<p>
<ul>
@@ -399,7 +399,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_juneauBpNs</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.90">RDF_juneauBpNs</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.89">RDF_juneauBpNs</a></pre>
<div class="block"><b>Configuration property:</b> Default XML namespace for bean properties.
<p>
<ul>
@@ -419,7 +419,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_useXmlNamespaces</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.104">RDF_useXmlNamespaces</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.103">RDF_useXmlNamespaces</a></pre>
<div class="block"><b>Configuration property:</b> Reuse XML namespaces when RDF namespaces not specified.
<p>
<ul>
@@ -442,7 +442,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_arp_iriRules</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.124">RDF_arp_iriRules</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.123">RDF_arp_iriRules</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML property: <code>iri_rules</code>.
<p>
<ul>
@@ -471,7 +471,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_arp_errorMode</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.156">RDF_arp_errorMode</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.155">RDF_arp_errorMode</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML ARP property: <code>error-mode</code>.
<p>
<ul>
@@ -512,7 +512,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_arp_embedding</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.174">RDF_arp_embedding</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.173">RDF_arp_embedding</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML ARP property: <code>embedding</code>.
<p>
<ul>
@@ -539,7 +539,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_arp_err_</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.200">RDF_arp_err_</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.199">RDF_arp_err_</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML ARP property: <code>ERR_xxx</code>.
<p>
<ul>
@@ -574,7 +574,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_arp_warn_</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.212">RDF_arp_warn_</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.211">RDF_arp_warn_</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML ARP property: <code>WARN_xxx</code>.
<p>
<ul>
@@ -595,7 +595,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_arp_ign_</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.224">RDF_arp_ign_</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.223">RDF_arp_ign_</a></pre>
<div class="block">RDF/XML ARP property: <code>IGN_xxx</code>.
<p>
<ul>
@@ -616,7 +616,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_rdfxml_xmlBase</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.237">RDF_rdfxml_xmlBase</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.236">RDF_rdfxml_xmlBase</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML property: <code>xmlbase</code>.
<p>
<ul>
@@ -638,7 +638,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_rdfxml_longId</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.251">RDF_rdfxml_longId</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.250">RDF_rdfxml_longId</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML property: <code>longId</code>.
<p>
<ul>
@@ -661,7 +661,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_rdfxml_allowBadUris</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.264">RDF_rdfxml_allowBadUris</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.263">RDF_rdfxml_allowBadUris</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML property: <code>allowBadURIs</code>.
<p>
<ul>
@@ -683,7 +683,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_rdfxml_relativeUris</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.291">RDF_rdfxml_relativeUris</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.290">RDF_rdfxml_relativeUris</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML property: <code>relativeURIs</code>.
<p>
<ul>
@@ -719,7 +719,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_rdfxml_showXmlDeclaration</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.310">RDF_rdfxml_showXmlDeclaration</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.309">RDF_rdfxml_showXmlDeclaration</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML property: <code>showXmlDeclaration</code>.
<p>
<ul>
@@ -747,7 +747,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_rdfxml_showDoctypeDeclaration</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.324">RDF_rdfxml_showDoctypeDeclaration</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.323">RDF_rdfxml_showDoctypeDeclaration</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML property: <code>showDoctypeDeclaration</code>.
<p>
<ul>
@@ -770,7 +770,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_rdfxml_tab</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.337">RDF_rdfxml_tab</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.336">RDF_rdfxml_tab</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML property: <code>tab</code>.
<p>
<ul>
@@ -792,7 +792,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_rdfxml_attributeQuoteChar</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.350">RDF_rdfxml_attributeQuoteChar</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.349">RDF_rdfxml_attributeQuoteChar</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML property: <code>attributeQuoteChar</code>.
<p>
<ul>
@@ -814,7 +814,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_rdfxml_blockRules</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.363">RDF_rdfxml_blockRules</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.362">RDF_rdfxml_blockRules</a></pre>
<div class="block"><b>Configuration property:</b> RDF/XML property: <code>blockRules</code>.
<p>
<ul>
@@ -836,7 +836,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_n3_minGap</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.376">RDF_n3_minGap</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.375">RDF_n3_minGap</a></pre>
<div class="block"><b>Configuration property:</b> N3/Turtle property: <code>minGap</code>.
<p>
<ul>
@@ -858,7 +858,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_n3_objectLists</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.389">RDF_n3_objectLists</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.388">RDF_n3_objectLists</a></pre>
<div class="block"><b>Configuration property:</b> N3/Turtle property: <code>objectLists</code>.
<p>
<ul>
@@ -880,7 +880,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_n3_subjectColumn</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.402">RDF_n3_subjectColumn</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.401">RDF_n3_subjectColumn</a></pre>
<div class="block"><b>Configuration property:</b> N3/Turtle property: <code>subjectColumn</code>.
<p>
<ul>
@@ -902,7 +902,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_n3_propertyColumn</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.415">RDF_n3_propertyColumn</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.414">RDF_n3_propertyColumn</a></pre>
<div class="block"><b>Configuration property:</b> N3/Turtle property: <code>propertyColumn</code>.
<p>
<ul>
@@ -924,7 +924,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_n3_indentProperty</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.428">RDF_n3_indentProperty</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.427">RDF_n3_indentProperty</a></pre>
<div class="block"><b>Configuration property:</b> N3/Turtle property: <code>indentProperty</code>.
<p>
<ul>
@@ -946,7 +946,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_n3_widePropertyLen</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.442">RDF_n3_widePropertyLen</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.441">RDF_n3_widePropertyLen</a></pre>
<div class="block"><b>Configuration property:</b> N3/Turtle property: <code>widePropertyLen</code>.
<p>
<ul>
@@ -969,7 +969,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_n3_abbrevBaseUri</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.455">RDF_n3_abbrevBaseUri</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.454">RDF_n3_abbrevBaseUri</a></pre>
<div class="block"><b>Configuration property:</b> N3/Turtle property: <code>abbrevBaseURI</code>.
<p>
<ul>
@@ -991,7 +991,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_n3_usePropertySymbols</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.468">RDF_n3_usePropertySymbols</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.467">RDF_n3_usePropertySymbols</a></pre>
<div class="block"><b>Configuration property:</b> N3/Turtle property: <code>usePropertySymbols</code>.
<p>
<ul>
@@ -1013,7 +1013,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_n3_useTripleQuotedStrings</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.481">RDF_n3_useTripleQuotedStrings</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.480">RDF_n3_useTripleQuotedStrings</a></pre>
<div class="block"><b>Configuration property:</b> N3/Turtle property: <code>useTripleQuotedStrings</code>.
<p>
<ul>
@@ -1035,7 +1035,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_n3_useDoubles</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.494">RDF_n3_useDoubles</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.493">RDF_n3_useDoubles</a></pre>
<div class="block"><b>Configuration property:</b> N3/Turtle property: <code>useDoubles</code>.
<p>
<ul>
@@ -1057,7 +1057,7 @@
<ul class="blockList">
<li class="blockList">
<h4>RDF_collectionFormat</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.519">RDF_collectionFormat</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.518">RDF_collectionFormat</a></pre>
<div class="block"><b>Configuration property:</b> RDF format for representing collections and arrays.
<p>
<ul>
@@ -1091,7 +1091,7 @@
<ul class="blockListLast">
<li class="blockList">
<h4>RDF_looseCollections</h4>
-<pre>static final <a href="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/jena/RdfCommonContext.html#line.562">RDF_looseCollections</a></pre>
+<pre>static final <a href="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/jena/RdfCommonContext.html#line.561">RDF_looseCollections</a></pre>
<div class="block"><b>Configuration property:</b> Collections should be serialized and parsed as loose collections.
<p>
<ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/jena/RdfParser.N3.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfParser.N3.html b/content/site/apidocs/org/apache/juneau/jena/RdfParser.N3.html
index 1a46959..3eaef24 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfParser.N3.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfParser.N3.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.jena.<a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class in org.apache.juneau.jena">RdfParser</a></h3>
-<code><a href="../../../../org/apache/juneau/jena/RdfParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></code></li>
+<code><a href="../../../../org/apache/juneau/jena/RdfParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.parser.ReaderParser">
@@ -237,7 +237,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parse
r/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href=".
./../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/jena/RdfParser.NTriple.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfParser.NTriple.html b/content/site/apidocs/org/apache/juneau/jena/RdfParser.NTriple.html
index 4ac20b1..158b7c1 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfParser.NTriple.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfParser.NTriple.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.jena.<a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class in org.apache.juneau.jena">RdfParser</a></h3>
-<code><a href="../../../../org/apache/juneau/jena/RdfParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></code></li>
+<code><a href="../../../../org/apache/juneau/jena/RdfParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.parser.ReaderParser">
@@ -237,7 +237,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parse
r/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href=".
./../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
[35/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/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 3fdc1cc..6124112 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
@@ -96,7 +96,7 @@
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#TYPE" title="class or interface in java.lang.annotation">TYPE</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.45">RestResource</a></pre>
+public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.46">RestResource</a></pre>
<div class="block">Used to denote that a class is a REST resource and to associate metadata on it.
<p>
Usually used on a subclass of <a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a>, but can be used to annotate any class that you want to expose as a REST resource.
@@ -217,23 +217,35 @@ 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#links--">links</a></span></code>
-<div class="block">TODO</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/RestLogger.html" title="class in org.apache.juneau.rest">RestLogger</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#logger--">logger</a></span></code>
<div class="block">Specifies the logger class to use for logging.</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#messages--">messages</a></span></code>
<div class="block">Identifies the location of the resource bundle for this class.</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#pageLinks--">pageLinks</a></span></code>
+<div class="block">Specifies the page hyperlinks to use on the HTML view of all pages produced by this resource.</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#pageText--">pageText</a></span></code>
+<div class="block">Specifies the page text to use on the HTML view of all pages produced by this resource.</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#pageTitle--">pageTitle</a></span></code>
+<div class="block">Specifies the page title to use on the HTML view of all pages produced by this resource.</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/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>
@@ -335,7 +347,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>messages</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.63">messages</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.64">messages</a></pre>
<div class="block">Identifies the location of the resource bundle for this class.
<p>
This annotation is used to provide localized messages for the following methods:
@@ -365,7 +377,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>guards</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/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.77">guards</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/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.78">guards</a></pre>
<div class="block">Class-level guards.
<p>
Associates one or more <a href="../../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest"><code>RestGuards</code></a> with all REST methods defined
@@ -391,7 +403,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>converters</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/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.92">converters</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/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.93">converters</a></pre>
<div class="block">Class-level converters.
<p>
Associates one or more <a href="../../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest"><code>converters</code></a> with a resource class.
@@ -418,7 +430,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>beanFilters</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><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.110">beanFilters</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><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.111">beanFilters</a></pre>
<div class="block">Class-level bean filters.
<p>
Shortcut to add bean filters to the bean contexts of the objects returned by the following methods:
@@ -448,7 +460,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>pojoSwaps</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><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.127">pojoSwaps</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><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.128">pojoSwaps</a></pre>
<div class="block">Class-level POJO swaps.
<p>
Shortcut to add POJO swaps to the bean contexts of the objects returned by the following methods:
@@ -477,7 +489,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>properties</h4>
-<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation">Property</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.160">properties</a></pre>
+<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation">Property</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.161">properties</a></pre>
<div class="block">Class-level properties.
<p>
Shortcut for specifying class-level properties on this servlet to the objects returned by the following methods:
@@ -522,7 +534,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>serializers</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/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.169">serializers</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/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.170">serializers</a></pre>
<div class="block">Specifies a list of <a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer"><code>Serializer</code></a> classes to add to the list of serializers available for this servlet.
<p>
This annotation can only be used on <a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer"><code>Serializer</code></a> classes that have no-arg constructors.
@@ -543,7 +555,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>parsers</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/Parser.html" title="class in org.apache.juneau.parser">Parser</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.178">parsers</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/Parser.html" title="class in org.apache.juneau.parser">Parser</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.179">parsers</a></pre>
<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.
<p>
This annotation can only be used on <a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser"><code>Parser</code></a> classes that have no-arg constructors.
@@ -564,7 +576,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>responseHandlers</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/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.189">responseHandlers</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/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.190">responseHandlers</a></pre>
<div class="block">Specifies a list of <a href="../../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest"><code>ResponseHandler</code></a> classes that know how to convert POJOs returned
by REST methods or set via <a href="../../../../../org/apache/juneau/rest/RestResponse.html#setOutput-java.lang.Object-"><code>RestResponse.setOutput(Object)</code></a> into appropriate
HTTP responses.
@@ -587,7 +599,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>encoders</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/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.209">encoders</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/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.210">encoders</a></pre>
<div class="block">Specifies a list of <a href="../../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders"><code>Encoder</code></a> to associate with this servlet.
<p>
These can be used to enable various kinds of compression (e.g. <js>"gzip"</js>) on requests and responses.
@@ -619,7 +631,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>defaultRequestHeaders</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.234">defaultRequestHeaders</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.235">defaultRequestHeaders</a></pre>
<div class="block">Specifies default values for request headers.
<p>
Strings are of the format <js>"Header-Name: header-value"</js>.
@@ -656,7 +668,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>defaultResponseHeaders</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.258">defaultResponseHeaders</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.259">defaultResponseHeaders</a></pre>
<div class="block">Specifies default values for response headers.
<p>
Strings are of the format <js>"Header-Name: header-value"</js>.
@@ -692,7 +704,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>children</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><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.300">children</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><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.301">children</a></pre>
<div class="block">Defines children of this resource.
<p>
A REST child resource is simply another servlet that is initialized as part of the parent
@@ -746,7 +758,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>path</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.313">path</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.314">path</a></pre>
<div class="block">Identifies the URL subpath relative to the parent resource.
<p>
Typically, this annotation is only applicable to resources defined as children through the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#children--"><code>children()</code></a>
@@ -771,10 +783,10 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>title</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.330">title</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.331">title</a></pre>
<div class="block">Optional servlet title.
<p>
- It is used to populate the Swagger title field and to display on HTML pages.
+ It is used to populate the Swagger title field and as a default value for the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pageTitle--"><code>pageTitle()</code></a> value.
This value can be retrieved programmatically through the <a href="../../../../../org/apache/juneau/rest/RestRequest.html#getServletTitle--"><code>RestRequest.getServletTitle()</code></a> method.
<p>
The default value pulls the label from the <code>label</code> entry in the servlet resource bundle.
@@ -800,10 +812,10 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>description</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.347">description</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.348">description</a></pre>
<div class="block">Optional servlet description.
<p>
- It is used to populate the Swagger description field and to display on HTML pages.
+ It is used to populate the Swagger description field and as a default value for the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pageText--"><code>pageText()</code></a> value.
This value can be retrieved programmatically through the <a href="../../../../../org/apache/juneau/rest/RestRequest.html#getServletDescription--"><code>RestRequest.getServletDescription()</code></a> method.
<p>
The default value pulls the description from the <code>description</code> entry in the servlet resource bundle.
@@ -829,7 +841,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>termsOfService</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.363">termsOfService</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.364">termsOfService</a></pre>
<div class="block">Optional servlet terms-of-service for this API.
<p>
It is used to populate the Swagger terms-of-service field.
@@ -857,7 +869,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>contact</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.393">contact</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.394">contact</a></pre>
<div class="block">Optional contact information for the exposed API.
<p>
It is used to populate the Swagger contact field and to display on HTML pages.
@@ -899,7 +911,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>license</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.422">license</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.423">license</a></pre>
<div class="block">Optional license information for the exposed API.
<p>
It is used to populate the Swagger license field and to display on HTML pages.
@@ -940,7 +952,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>version</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.438">version</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.439">version</a></pre>
<div class="block">Provides the version of the application API (not to be confused with the specification version).
<p>
It is used to populate the Swagger version field and to display on HTML pages.
@@ -968,7 +980,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>tags</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.473">tags</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.474">tags</a></pre>
<div class="block">Optional tagging information for the exposed API.
<p>
It is used to populate the Swagger tags field and to display on HTML pages.
@@ -1015,7 +1027,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>externalDocs</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.502">externalDocs</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.503">externalDocs</a></pre>
<div class="block">Optional external documentation information for the exposed API.
<p>
It is used to populate the Swagger external documentation field and to display on HTML pages.
@@ -1056,7 +1068,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>config</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.513">config</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.514">config</a></pre>
<div class="block">Optional location of configuration file for this servlet.
<p>
The configuration file .
@@ -1079,7 +1091,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>stylesheet</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.563">stylesheet</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.564">stylesheet</a></pre>
<div class="block">The stylesheet to use for HTML views.
<p>
The name is a path to a stylesheet located in either the classpath or working directory.
@@ -1141,7 +1153,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>favicon</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.595">favicon</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.596">favicon</a></pre>
<div class="block">The favicon to use for HTML views.
<p>
The name is a path to an icon file located in either the classpath or working directory in a similar way
@@ -1185,7 +1197,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>staticFiles</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.629">staticFiles</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.630">staticFiles</a></pre>
<div class="block">Defines paths and locations of statically served files.
<p>
This is a JSON map of paths to packages/directories located on either the classpath or working directory.
@@ -1231,7 +1243,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>clientVersionHeader</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.641">clientVersionHeader</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.642">clientVersionHeader</a></pre>
<div class="block">Specifies the HTTP header name used to identify the client version.
<p>
The client version is used to support backwards compatibility for breaking REST interface
@@ -1255,7 +1267,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="class in org.apache.juneau.rest">RestResourceResolver</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.666">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="class in org.apache.juneau.rest">RestResourceResolver</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.667">resourceResolver</a></pre>
<div class="block">Specifies the resolver class to use for resolving child resources by class name.
<p>
The default implementation simply instantiates the class using one of the following constructors:
@@ -1292,7 +1304,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.676">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.677">logger</a></pre>
<div class="block">Specifies the logger class to use for logging.
<p>
The default logger performs basic error logging to the Java logger.
@@ -1314,7 +1326,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.686">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.687">callHandler</a></pre>
<div class="block">Specifies the REST call handler class.
<p>
This class handles the basic lifecycle of an HTTP REST call.
@@ -1336,7 +1348,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.695">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.696">infoProvider</a></pre>
<div class="block">Specifies the class used to retrieve title/description/swagger information about a resource.
<p>
Subclasses can be used to customize the documentation on a resource.
@@ -1351,14 +1363,134 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
</li>
</ul>
<ul class="blockList">
-<li class="blockList"><a name="links--">
+<li class="blockList"><a name="pageTitle--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>pageTitle</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.731">pageTitle</a></pre>
+<div class="block">Specifies the page title to use on the HTML view of all pages produced by this resource.
+ <p>
+ This annotation has no effect on any serializers other than <a href="../../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html"><code>HtmlDocSerializer</code></a> and is a shorthand method
+ for setting the <a href="../../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_title"><code>HtmlDocSerializerContext.HTMLDOC_title</code></a> property:
+ <p class='bcode'>
+ <ja>@RestResource</ja>(
+ properties={
+ <ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"My Resource Page"</js>)
+ }
+ )
+ <jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault {
+ </p>
+ <p>
+ If not specified, the page title is pulled from one of the following locations:
+ <ol>
+ <li><code>{servletClass}.{methodName}.pageTitle</code> resource bundle value.
+ <li><code>{servletClass}.pageTitle</code> resource bundle value.
+ <li><code><ja>@RestResource</ja>(title)</code> annotation.
+ <li><code>{servletClass}.title</code> resource bundle value.
+ <li><code>info/title</code> entry in swagger file.
+ <ol>
+ <p>
+ This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
+ <p>
+ The programmatic equivalent to this annotation are the <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setPageTitle-java.lang.String-"><code>RestConfig.setPageTitle(String)</code></a>/<a href="../../../../../org/apache/juneau/rest/RestResponse.html#setPageTitle-java.lang.Object-"><code>RestResponse.setPageTitle(Object)</code></a> methods.
+ <p class='info'>
+ In most cases, you'll simply want to use the <code>@RestResource(title)</code> annotation to specify the page title.
+ However, this annotation is provided in cases where you want the page title to be different that the one
+ shown in the swagger document.
+ </p>
+ <b>Note:</b> - In most cases, you can</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="pageText--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>pageText</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.767">pageText</a></pre>
+<div class="block">Specifies the page text to use on the HTML view of all pages produced by this resource.
+ <p>
+ The page text is portion of the page immediately under the title and above the links.
+ <p>
+ This annotation has no effect on any serializers other than <a href="../../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html"><code>HtmlDocSerializer</code></a> and is a shorthand method
+ for setting the <a href="../../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_text"><code>HtmlDocSerializerContext.HTMLDOC_text</code></a> property:
+ <p class='bcode'>
+ <ja>@RestResource</ja>(
+ properties={
+ <ja>@Property</ja>(name=<jsf>HTMLDOC_text</jsf>, value=<js>"This is my awesome resource page"</js>)
+ }
+ )
+ <jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault {
+ </p>
+ If not specified, the page title is pulled from one of the following locations:
+ <ol>
+ <li><code>{servletClass}.{methodName}.pageText</code> resource bundle value.
+ <li><code>{servletClass}.pageText</code> resource bundle value.
+ <li><code><ja>@RestMethod</ja>(summary)</code> annotation.
+ <li><code>{servletClass}.{methodName}.summary</code> resource bundle value.
+ <li><code>summary</code> entry in swagger file for method.
+ <li><code>{servletClass}.description</code> resource bundle value.
+ <li><code>info/description</code> entry in swagger file.
+ <ol>
+ <p>
+ This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
+ <p>
+ The programmatic equivalent to this annotation are the <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setPageText-java.lang.String-"><code>RestConfig.setPageText(String)</code></a>/<a href="../../../../../org/apache/juneau/rest/RestResponse.html#setPageText-java.lang.Object-"><code>RestResponse.setPageText(Object)</code></a> methods.
+ <p class='info'>
+ In most cases, you'll simply want to use the <code>@RestResource(description)</code> or <code>@RestMethod(summary)</code> annotations to specify the page text.
+ However, this annotation is provided in cases where you want the text to be different that the values shown in the swagger document.
+ </p></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="pageLinks--">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>links</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.700">links</a></pre>
-<div class="block">TODO</div>
+<h4>pageLinks</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.797">pageLinks</a></pre>
+<div class="block">Specifies the page hyperlinks to use on the HTML view of all pages produced by this resource.
+ <p>
+ The page links is positioned immediately under the title and text.
+ <p>
+ This annotation has no effect on any serializers other than <a href="../../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html"><code>HtmlDocSerializer</code></a> and is a shorthand method
+ for setting the <a href="../../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_text"><code>HtmlDocSerializerContext.HTMLDOC_text</code></a> property:
+ <p class='bcode'>
+ <ja>@RestResource</ja>(
+ properties={
+ <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>)
+ }
+ )
+ <jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault {
+ </p>
+ <p>
+ The format of this value is a lax-JSON string of key/value pairs where the keys are the link text and the values are relative (to the servlet) or
+ absolute URLs.
+ If not specified, the page title is pulled from one of the following locations:
+ <ol>
+ <li><code>{servletClass}.{methodName}.pageLinks</code> resource bundle value.
+ <li><code>{servletClass}.pageLinks</code> resource bundle value.
+ <ol>
+ <p>
+ This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
+ <p>
+ The programmatic equivalent to this annotation are the <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setPageLinks-java.lang.String-"><code>RestConfig.setPageLinks(String)</code></a>/<a href="../../../../../org/apache/juneau/rest/RestResponse.html#setPageLinks-java.lang.Object-"><code>RestResponse.setPageLinks(Object)</code></a> methods.</div>
<dl>
<dt>Default:</dt>
<dd>""</dd>
[41/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.html b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.html
index 3ed8ef1..d5a6b56 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.html
@@ -138,7 +138,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#path--">path</a>="/logs",<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#title--">title</a>="Log files",<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#description--">description</a>="Log files from this service",<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>="HtmlSerializer.uriAnchorText",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="PROPERTY_NAME"),<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>="true")},<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pojoSwaps--">pojoSwaps</a>={<a href="../../../../../org/apache/juneau/transforms/IteratorSwap.html" title="class in org.apache.juneau.transforms">IteratorSwap.class</a>,<a href="../../../../../org/apache/juneau/transforms/DateSwap.ISO8601DT.html" title="class in org.apache.juneau.transforms">DateSwap.ISO8601DT.class</a>})
-public class <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.53">LogsResource</a>
+public class <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.54">LogsResource</a>
extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a></pre>
<div class="block">REST resource for viewing and accessing log files.</div>
<dl>
@@ -216,7 +216,8 @@ extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" ti
</tr>
<tr id="i2" class="altColor">
<td class="colFirst"><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></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/resources/LogsResource.html#getFileOrDirectory-org.apache.juneau.rest.RestRequest-org.apache.juneau.ObjectMap-java.lang.String-">getFileOrDirectory</a></span>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/resources/LogsResource.html#getFileOrDirectory-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-org.apache.juneau.ObjectMap-java.lang.String-">getFileOrDirectory</a></span>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req,
+ <a href="../../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> res,
<a href="../../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> properties,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</code>
<div class="block">[GET /*] - Get file details or directory listing.</div>
@@ -311,7 +312,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" ti
<ul class="blockListLast">
<li class="blockList">
<h4>LogsResource</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.53">LogsResource</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.54">LogsResource</a>()</pre>
</li>
</ul>
</li>
@@ -328,7 +329,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" ti
<ul class="blockList">
<li class="blockList">
<h4>init</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.67">init</a>(<a href="../../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)
+<pre>public void <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.68">init</a>(<a href="../../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestConfig-">RestServlet</a></code></span></div>
<div class="block">Resource initialization method.
@@ -354,14 +355,15 @@ extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" ti
</dl>
</li>
</ul>
-<a name="getFileOrDirectory-org.apache.juneau.rest.RestRequest-org.apache.juneau.ObjectMap-java.lang.String-">
+<a name="getFileOrDirectory-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-org.apache.juneau.ObjectMap-java.lang.String-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>getFileOrDirectory</h4>
<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="GET",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#responses--">responses</a>={<a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">@Response</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Response.html#value--">value</a>=200),<a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">@Response</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Response.html#value--">value</a>=404)})
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.89">getFileOrDirectory</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req,
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.91">getFileOrDirectory</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req,
+ <a href="../../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> res,
<a href="../../../../../org/apache/juneau/rest/annotation/Properties.html" title="annotation in org.apache.juneau.rest.annotation">@Properties</a>
<a href="../../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> properties,
<a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
@@ -371,6 +373,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.h
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>req</code> - The HTTP request</dd>
+<dd><code>res</code> - The HTTP response</dd>
<dd><code>properties</code> - The writable properties for setting the descriptions.</dd>
<dd><code>path</code> - The log file path.</dd>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -387,7 +390,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.h
<li class="blockList">
<h4>viewFile</h4>
<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="VIEW",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#responses--">responses</a>={<a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">@Response</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Response.html#value--">value</a>=200),<a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">@Response</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Response.html#value--">value</a>=404)})
-public void <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.127">viewFile</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req,
+public void <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.130">viewFile</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req,
<a href="../../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> res,
<a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
@@ -431,7 +434,7 @@ public void <a href="../../../../../src-html/org/apache/juneau/microse
<li class="blockList">
<h4>viewParsedEntries</h4>
<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="PARSE",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#converters--">converters</a>=<a href="../../../../../org/apache/juneau/rest/converters/Queryable.html" title="class in org.apache.juneau.rest.converters">Queryable.class</a>,<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#responses--">responses</a>={<a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">@Response</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Response.html#value--">value</a>=200),<a href="../../../../../org/apache/juneau/rest/annotation/Res
ponse.html" title="annotation in org.apache.juneau.rest.annotation">@Response</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Response.html#value--">value</a>=404)})
-public <a href="../../../../../org/apache/juneau/microservice/resources/LogParser.html" title="class in org.apache.juneau.microservice.resources">LogParser</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.199">viewParsedEntries</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req,
+public <a href="../../../../../org/apache/juneau/microservice/resources/LogParser.html" title="class in org.apache.juneau.microservice.resources">LogParser</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.202">viewParsedEntries</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req,
<a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
<a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="start")
@@ -469,7 +472,7 @@ public <a href="../../../../../org/apache/juneau/microservice/resources/Log
<li class="blockList">
<h4>downloadFile</h4>
<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="DOWNLOAD",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#responses--">responses</a>={<a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">@Response</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Response.html#value--">value</a>=200),<a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">@Response</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Response.html#value--">value</a>=404)})
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.219">downloadFile</a>(<a href="../../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> res,
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.222">downloadFile</a>(<a href="../../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> res,
<a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -492,7 +495,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.h
<li class="blockList">
<h4>deleteFile</h4>
<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="DELETE",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#responses--">responses</a>={<a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">@Response</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Response.html#value--">value</a>=200),<a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">@Response</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Response.html#value--">value</a>=404)})
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.239">deleteFile</a>(<a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.242">deleteFile</a>(<a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">[DELETE /*] - Delete a file.</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParser.html b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParser.html
index f0ba018..29cdb95 100644
--- a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParser.html
+++ b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParser.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var methods = {"i0":10,"i1":10,"i2":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -229,13 +229,6 @@ extends <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" ti
<div class="block">Workhorse method.</div>
</td>
</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>protected <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></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/msgpack/MsgPackParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)</code>
-<div class="block">Implementation method.</div>
-</td>
-</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.parser.InputStreamParser">
@@ -249,7 +242,7 @@ extends <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" ti
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parse
r/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href=".
./../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
@@ -343,7 +336,7 @@ extends <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" ti
<ul class="blockList">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/msgpack/MsgPackParserSession.html" title="class in org.apache.juneau.msgpack">MsgPackParserSession</a> <a href="../../../../src-html/org/apache/juneau/msgpack/MsgPackParser.html#line.222">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
+<pre>public <a href="../../../../org/apache/juneau/msgpack/MsgPackParserSession.html" title="class in org.apache.juneau.msgpack">MsgPackParserSession</a> <a href="../../../../src-html/org/apache/juneau/msgpack/MsgPackParser.html#line.205">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> op,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> javaMethod,
<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> outer,
@@ -378,10 +371,10 @@ extends <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" ti
<a name="doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">
<!-- -->
</a>
-<ul class="blockList">
+<ul class="blockListLast">
<li class="blockList">
<h4>doParse</h4>
-<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/msgpack/MsgPackParser.html#line.227">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/msgpack/MsgPackParser.html#line.210">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> type)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">Parser</a></code></span></div>
@@ -404,32 +397,6 @@ extends <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" ti
</dl>
</li>
</ul>
-<a name="doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>doParseArgs</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[] <a href="../../../../src-html/org/apache/juneau/msgpack/MsgPackParser.html#line.235">doParseArgs</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">Parser</a></code></span></div>
-<div class="block">Implementation method.
- Default implementation throws an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/UnsupportedOperationException.html?is-external=true" title="class or interface in java.lang"><code>UnsupportedOperationException</code></a>.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></code> in class <code><a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The runtime session object returned by <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-"><code>Parser.createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</code></a>.
- If <jk>null</jk>, one will be created using <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-"><code>Parser.createSession(Object)</code></a>.</dd>
-<dd><code>argTypes</code> - Specifies the type of objects to create for each entry in the array.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>An array of parsed objects.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code> - If thrown from underlying stream, or if the input contains a syntax error or is malformed.</dd>
-</dl>
-</li>
-</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParserSession.html b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParserSession.html
index 7b52ac4..ee9ccb9 100644
--- a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParserSession.html
+++ b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParserSession.html
@@ -197,7 +197,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title=
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerSession.html b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerSession.html
index 92958d6..50d7fb2 100644
--- a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerSession.html
@@ -213,7 +213,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/parser/InputStreamParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/parser/InputStreamParser.html b/content/site/apidocs/org/apache/juneau/parser/InputStreamParser.html
index 48534b4..a85b178 100644
--- a/content/site/apidocs/org/apache/juneau/parser/InputStreamParser.html
+++ b/content/site/apidocs/org/apache/juneau/parser/InputStreamParser.html
@@ -205,7 +205,7 @@ extends <a href="../../../../org/apache/juneau/parser/Parser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.ap
ache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/
Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.
apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollect
ion-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.ju
neau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setPar
ent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/parser/Parser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/parser/Parser.html b/content/site/apidocs/org/apache/juneau/parser/Parser.html
index d4e6efa..3283637 100644
--- a/content/site/apidocs/org/apache/juneau/parser/Parser.html
+++ b/content/site/apidocs/org/apache/juneau/parser/Parser.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":6,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":6,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":6,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":6,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -302,13 +302,6 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
</td>
</tr>
<tr id="i6" class="altColor">
-<td class="colFirst"><code>protected <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></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)</code>
-<div class="block">Implementation method.</div>
-</td>
-</tr>
-<tr id="i7" class="rowColor">
<td class="colFirst"><code>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> c,
@@ -316,7 +309,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<div class="block">Implementation method.</div>
</td>
</tr>
-<tr id="i8" class="altColor">
+<tr id="i7" class="rowColor">
<td class="colFirst"><code>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
@@ -325,31 +318,31 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<div class="block">Implementation method.</div>
</td>
</tr>
-<tr id="i9" class="rowColor">
+<tr id="i8" class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<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/parser/Parser.html#getListeners--">getListeners</a></span>()</code>
<div class="block">Returns the current parser listeners associated with this parser.</div>
</td>
</tr>
-<tr id="i10" class="altColor">
+<tr id="i9" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a></span>()</code>
<div class="block">Returns the media types handled based on the value of the <a href="../../../../org/apache/juneau/annotation/Consumes.html" title="annotation in org.apache.juneau.annotation"><code>Consumes</code></a> annotation on the parser class.</div>
</td>
</tr>
-<tr id="i11" class="rowColor">
+<tr id="i10" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a></span>()</code>
<div class="block">Returns the first media type specified on this parser via the <a href="../../../../org/apache/juneau/annotation/Consumes.html" title="annotation in org.apache.juneau.annotation"><code>Consumes</code></a> annotation.</div>
</td>
</tr>
-<tr id="i12" class="altColor">
+<tr id="i11" class="rowColor">
<td class="colFirst"><code>abstract boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#isReaderParser--">isReaderParser</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this parser subclasses from <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="class in org.apache.juneau.parser"><code>ReaderParser</code></a>.</div>
</td>
</tr>
-<tr id="i13" class="rowColor">
+<tr id="i12" class="altColor">
<td class="colFirst"><code>protected <T> void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> propertyName,
@@ -359,21 +352,21 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<div class="block">Method that gets called when an unknown bean property name is encountered.</div>
</td>
</tr>
-<tr id="i14" class="altColor">
+<tr id="i13" class="rowColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<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><T> type)</code>
<div class="block">Same as <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-"><code>parse(Object, Type, Type...)</code></a> except optimized for a non-parameterized class.</div>
</td>
</tr>
-<tr id="i15" class="rowColor">
+<tr id="i14" class="altColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> type)</code>
<div class="block">Same as <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-"><code>parse(Object, Type, Type...)</code></a> except the type has already been converted into a <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> object.</div>
</td>
</tr>
-<tr id="i16" class="altColor">
+<tr id="i15" class="rowColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
@@ -381,22 +374,15 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<div class="block">Parses input into the specified object type.</div>
</td>
</tr>
-<tr id="i17" class="rowColor">
-<td class="colFirst"><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></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)</code>
-<div class="block">Parses the specified array input with each entry in the object defined by the <code>argTypes</code>
- argument.</div>
-</td>
-</tr>
-<tr id="i18" class="altColor">
+<tr id="i16" class="altColor">
<td class="colFirst"><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></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>[] argTypes)</code>
-<div class="block">Same as <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-"><code>parseArgs(Object, ClassMeta[])</code></a> except allows you to pass in <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> objects.</div>
+<div class="block">Parses the specified array input with each entry in the object defined by the <code>argTypes</code>
+ argument.</div>
</td>
</tr>
-<tr id="i19" class="rowColor">
+<tr id="i17" class="rowColor">
<td class="colFirst"><code><E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> c,
@@ -404,7 +390,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<div class="block">Parses the contents of the specified reader and loads the results into the specified collection.</div>
</td>
</tr>
-<tr id="i20" class="altColor">
+<tr id="i18" class="altColor">
<td class="colFirst"><code><K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
@@ -413,14 +399,14 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<div class="block">Parses the contents of the specified reader and loads the results into the specified map.</div>
</td>
</tr>
-<tr id="i21" class="rowColor">
+<tr id="i19" class="rowColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> type)</code>
<div class="block">Entry point for all parsing calls.</div>
</td>
</tr>
-<tr id="i22" class="altColor">
+<tr id="i20" class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a></span>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> cm,
<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> o,
@@ -429,7 +415,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
the specified object if it exists.</div>
</td>
</tr>
-<tr id="i23" class="rowColor">
+<tr id="i21" class="rowColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></span>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> cm,
<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> o,
@@ -871,14 +857,14 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
</dl>
</li>
</ul>
-<a name="parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">
+<a name="parseArgs-java.lang.Object-java.lang.reflect.Type:A-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>parseArgs</h4>
<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[] <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.485">parseArgs</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>[] argTypes)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Parses the specified array input with each entry in the object defined by the <code>argTypes</code>
argument.
@@ -901,57 +887,13 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
</dl>
</li>
</ul>
-<a name="parseArgs-java.lang.Object-java.lang.reflect.Type:A-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>parseArgs</h4>
-<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[] <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.508">parseArgs</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>[] argTypes)
- throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
-<div class="block">Same as <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-"><code>parseArgs(Object, ClassMeta[])</code></a> except allows you to pass in <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> objects.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>input</code> - The input. Subclasses can support different input types.</dd>
-<dd><code>argTypes</code> - Specifies the type of objects to create for each entry in the array.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>An array of parsed objects.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></code> - If the input contains a syntax error or is malformed, or is not valid for the specified type.</dd>
-</dl>
-</li>
-</ul>
-<a name="doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>doParseArgs</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[] <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.533">doParseArgs</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Implementation method.
- Default implementation throws an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/UnsupportedOperationException.html?is-external=true" title="class or interface in java.lang"><code>UnsupportedOperationException</code></a>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The runtime session object returned by <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-"><code>createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</code></a>.
- If <jk>null</jk>, one will be created using <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-"><code>createSession(Object)</code></a>.</dd>
-<dd><code>argTypes</code> - Specifies the type of objects to create for each entry in the array.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>An array of parsed objects.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code> - If thrown from underlying stream, or if the input contains a syntax error or is malformed.</dd>
-</dl>
-</li>
-</ul>
<a name="addListener-org.apache.juneau.parser.ParserListener-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>addListener</h4>
-<pre>public <a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.548">addListener</a>(<a href="../../../../org/apache/juneau/parser/ParserListener.html" title="class in org.apache.juneau.parser">ParserListener</a> listener)</pre>
+<pre>public <a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.511">addListener</a>(<a href="../../../../org/apache/juneau/parser/ParserListener.html" title="class in org.apache.juneau.parser">ParserListener</a> listener)</pre>
<div class="block">Adds a <a href="../../../../org/apache/juneau/parser/ParserListener.html" title="class in org.apache.juneau.parser"><code>ParserListener</code></a> to this parser to listen for parse events.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -967,7 +909,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getListeners</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/juneau/parser/ParserListener.html" title="class in org.apache.juneau.parser">ParserListener</a>> <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.558">getListeners</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/juneau/parser/ParserListener.html" title="class in org.apache.juneau.parser">ParserListener</a>> <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.521">getListeners</a>()</pre>
<div class="block">Returns the current parser listeners associated with this parser.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -981,7 +923,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>convertAttrToType</h4>
-<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.574">convertAttrToType</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.537">convertAttrToType</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<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> outer,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> s,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> type)
@@ -1008,7 +950,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>setParent</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.615">setParent</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> cm,
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.578">setParent</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> cm,
<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> o,
<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> parent)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -1030,7 +972,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>setName</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.630">setName</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> cm,
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.593">setName</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> cm,
<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> o,
<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> name)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -1052,7 +994,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>onUnknownProperty</h4>
-<pre>protected <T> void <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.650">onUnknownProperty</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <T> void <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.613">onUnknownProperty</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> propertyName,
<a href="../../../../org/apache/juneau/BeanMap.html" title="class in org.apache.juneau">BeanMap</a><T> beanMap,
int line,
@@ -1080,7 +1022,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getMediaTypes</h4>
-<pre>public <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>[] <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.668">getMediaTypes</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>[] <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.631">getMediaTypes</a>()</pre>
<div class="block">Returns the media types handled based on the value of the <a href="../../../../org/apache/juneau/annotation/Consumes.html" title="annotation in org.apache.juneau.annotation"><code>Consumes</code></a> annotation on the parser class.
<p>
This method can be overridden by subclasses to determine the media types programatically.</div>
@@ -1096,7 +1038,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
<ul class="blockListLast">
<li class="blockList">
<h4>getPrimaryMediaType</h4>
-<pre>public <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a> <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.677">getPrimaryMediaType</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a> <a href="../../../../src-html/org/apache/juneau/parser/Parser.html#line.640">getPrimaryMediaType</a>()</pre>
<div class="block">Returns the first media type specified on this parser via the <a href="../../../../org/apache/juneau/annotation/Consumes.html" title="annotation in org.apache.juneau.annotation"><code>Consumes</code></a> annotation.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
[49/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/BeanContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/BeanContext.html b/content/site/apidocs/org/apache/juneau/BeanContext.html
index 82d81e8..9e213b7 100644
--- a/content/site/apidocs/org/apache/juneau/BeanContext.html
+++ b/content/site/apidocs/org/apache/juneau/BeanContext.html
@@ -1858,7 +1858,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>getClassMetaForObject</h4>
-<pre>public final <T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1252">getClassMetaForObject</a>(T o)</pre>
+<pre>public final <T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1264">getClassMetaForObject</a>(T o)</pre>
<div class="block">Shortcut for calling <code>getClassMeta(o.getClass())</code>.</div>
<dl>
<dt><span class="paramLabel">Type Parameters:</span></dt>
@@ -1876,7 +1876,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>resolveClassMeta</h4>
-<pre>protected final <T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1271">resolveClassMeta</a>(<a href="../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">BeanProperty</a> p,
+<pre>protected final <T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1283">resolveClassMeta</a>(<a href="../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">BeanProperty</a> p,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> t,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[]> typeVarImpls)</pre>
<div class="block">Used for determining the class type on a method or field where a <code>@BeanProperty</code> annotation
@@ -1901,7 +1901,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>getBeanTypePropertyName</h4>
-<pre>protected final <a href="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/BeanContext.html#line.1374">getBeanTypePropertyName</a>()</pre>
+<pre>protected final <a href="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/BeanContext.html#line.1386">getBeanTypePropertyName</a>()</pre>
<div class="block">Returns the type property name as defined by <a href="../../../org/apache/juneau/BeanContext.html#BEAN_beanTypePropertyName"><code>BEAN_beanTypePropertyName</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1915,7 +1915,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>getBeanRegistry</h4>
-<pre>protected final <a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1383">getBeanRegistry</a>()</pre>
+<pre>protected final <a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1395">getBeanRegistry</a>()</pre>
<div class="block">Returns the bean registry defined in this bean context defined by <a href="../../../org/apache/juneau/BeanContext.html#BEAN_beanDictionary"><code>BEAN_beanDictionary</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1929,7 +1929,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>getImplClassConstructor</h4>
-<pre>protected final <T> <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1395">getImplClassConstructor</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> c,
+<pre>protected final <T> <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1407">getImplClassConstructor</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> c,
<a href="../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a> v)</pre>
<div class="block">Gets the no-arg constructor for the specified class.</div>
<dl>
@@ -1949,7 +1949,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>object</h4>
-<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1442">object</a>()</pre>
+<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1454">object</a>()</pre>
<div class="block">Returns a reusable <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> representation for the class <code>Object</code>.
<p>
This <code>ClassMeta</code> is often used to represent "any object type" when an object type
@@ -1969,7 +1969,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>string</h4>
-<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1456">string</a>()</pre>
+<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1468">string</a>()</pre>
<div class="block">Returns a reusable <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> representation for the class <code>String</code>.
<p>
This <code>ClassMeta</code> is often used to represent key types in maps.
@@ -1988,7 +1988,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>_class</h4>
-<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1470">_class</a>()</pre>
+<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1482">_class</a>()</pre>
<div class="block">Returns a reusable <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> representation for the class <code>Class</code>.
<p>
This <code>ClassMeta</code> is often used to represent key types in maps.
@@ -2007,7 +2007,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>hashCode</h4>
-<pre>public int <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1475">hashCode</a>()</pre>
+<pre>public int <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1487">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>
@@ -2020,7 +2020,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>equals</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1480">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1492">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</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#equals-java.lang.Object-" title="class or interface in java.lang">equals</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>
@@ -2033,7 +2033,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockListLast">
<li class="blockList">
<h4>asMap</h4>
-<pre>public <a href="../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1489">asMap</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1501">asMap</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../org/apache/juneau/Context.html#asMap--">Context</a></code></span></div>
<div class="block">Returns the properties defined on this bean context as a simple map for debugging purposes.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/BeanSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/BeanSession.html b/content/site/apidocs/org/apache/juneau/BeanSession.html
index e302aa8..0521495 100644
--- a/content/site/apidocs/org/apache/juneau/BeanSession.html
+++ b/content/site/apidocs/org/apache/juneau/BeanSession.html
@@ -216,36 +216,42 @@ extends <a href="../../../org/apache/juneau/Session.html" title="class in org.ap
</td>
</tr>
<tr id="i7" class="rowColor">
+<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[]></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>[] classes)</code>
+<div class="block">Given an array of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect"><code>Type</code></a> objects, returns a <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> representing those arguments.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
<td class="colFirst"><code><T> <a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a><T></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> c)</code>
<div class="block">Returns the <a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau"><code>BeanMeta</code></a> class for the specified class.</div>
</td>
</tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a></span>()</code>
<div class="block">Returns the bean registry defined in this bean context defined by <a href="../../../org/apache/juneau/BeanContext.html#BEAN_beanDictionary"><code>BeanContext.BEAN_beanDictionary</code></a>.</div>
</td>
</tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" 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/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a></span>()</code>
<div class="block">Returns the type property name as defined by <a href="../../../org/apache/juneau/BeanContext.html#BEAN_beanTypePropertyName"><code>BeanContext.BEAN_beanTypePropertyName</code></a>.</div>
</td>
</tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/ClassLoader.html?is-external=true" title="class or interface in java.lang">ClassLoader</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a></span>()</code>
<div class="block">Returns the classloader associated with this bean context.</div>
</td>
</tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
<td class="colFirst"><code><T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> c)</code>
<div class="block">Returns a <code>ClassMeta</code> wrapper around a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> object.</div>
</td>
</tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
<td class="colFirst"><code><T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)</code>
@@ -253,18 +259,12 @@ extends <a href="../../../org/apache/juneau/Session.html" title="class in org.ap
<code>ClassMeta</code> values that themselves could be collections or maps.</div>
</td>
</tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
<td class="colFirst"><code><T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a></span>(T o)</code>
<div class="block">Shortcut for calling <code>getClassMeta(o.getClass())</code>.</div>
</td>
</tr>
-<tr id="i14" class="altColor">
-<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>[] classes)</code>
-<div class="block">Given an array of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect"><code>Type</code></a> objects, returns an array of corresponding <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> objects.</div>
-</td>
-</tr>
<tr id="i15" class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a></span>()</code>
@@ -1043,20 +1043,20 @@ extends <a href="../../../org/apache/juneau/Session.html" title="class in org.ap
</dl>
</li>
</ul>
-<a name="getClassMetas-java.lang.reflect.Type:A-">
+<a name="getArgsClassMeta-java.lang.reflect.Type:A-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getClassMetas</h4>
-<pre>public final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] <a href="../../../src-html/org/apache/juneau/BeanSession.html#line.852">getClassMetas</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>[] classes)</pre>
-<div class="block">Given an array of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect"><code>Type</code></a> objects, returns an array of corresponding <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> objects.
- Constructs a new array on each call.</div>
+<h4>getArgsClassMeta</h4>
+<pre>public final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[]> <a href="../../../src-html/org/apache/juneau/BeanSession.html#line.852">getArgsClassMeta</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>[] classes)</pre>
+<div class="block">Given an array of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect"><code>Type</code></a> objects, returns a <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> representing those arguments.
+ Constructs a new meta on each call.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>classes</code> - The array of classes to get class metas for.</dd>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>An array of <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> objects corresponding to the classes. Never <jk>null</jk>.</dd>
+<dd>The args <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> object corresponding to the classes. Never <jk>null</jk>.</dd>
</dl>
</li>
</ul>
[37/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/rest/RestRequest.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestRequest.html b/content/site/apidocs/org/apache/juneau/rest/RestRequest.html
index 74b0d45..8c0aeb0 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestRequest.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestRequest.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":10,"i78":10,"i79":10,"i80":10,"i81":10,"i82":10,"i83":10,"i84":10,"i85":10,"i86":10,"i87":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":10,"i78":10,"i79":10,"i80":10,"i81":10,"i82":10,"i83":10,"i84":10,"i85":10,"i86":10,"i87":10,"i88":10,"i89":10,"i90":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -382,49 +382,67 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
</td>
</tr>
<tr id="i32" class="altColor">
+<td class="colFirst"><code>protected <a href="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/RestRequest.html#getPageLinks--">getPageLinks</a></span>()</code>
+<div class="block">Returns the localized page links for HTML views.</div>
+</td>
+</tr>
+<tr id="i33" class="rowColor">
+<td class="colFirst"><code>protected <a href="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/RestRequest.html#getPageText--">getPageText</a></span>()</code>
+<div class="block">Returns the localized page text for HTML views.</div>
+</td>
+</tr>
+<tr id="i34" class="altColor">
+<td class="colFirst"><code>protected <a href="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/RestRequest.html#getPageTitle--">getPageTitle</a></span>()</code>
+<div class="block">Returns the localized page title for HTML views.</div>
+</td>
+</tr>
+<tr id="i35" class="rowColor">
<td class="colFirst"><code><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/RestRequest.html#getParser--">getParser</a></span>()</code>
<div class="block">Returns the parser matching the request <code>Content-Type</code> header.</div>
</td>
</tr>
-<tr id="i33" class="rowColor">
+<tr id="i36" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/parser/ParserGroup.html" title="class in org.apache.juneau.parser">ParserGroup</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getParserGroup--">getParserGroup</a></span>()</code>
<div class="block">Returns the parsers associated with this request.</div>
</td>
</tr>
-<tr id="i34" class="altColor">
+<tr id="i37" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/parser/ParserMatch.html" title="class in org.apache.juneau.parser">ParserMatch</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getParserMatch--">getParserMatch</a></span>()</code>
<div class="block">Returns the parser and media type matching the request <code>Content-Type</code> header.</div>
</td>
</tr>
-<tr id="i35" class="rowColor">
+<tr id="i38" 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/RestRequest.html#getPathInfoParts--">getPathInfoParts</a></span>()</code>
<div class="block">Returns the value <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServletRequestWrapper.html?is-external=true#getPathInfo--" title="class or interface in javax.servlet.http"><code>HttpServletRequestWrapper.getPathInfo()</code></a> split on the <js>'/'</js> character.</div>
</td>
</tr>
-<tr id="i36" class="altColor">
+<tr id="i39" 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/RestRequest.html#getPathInfoUndecoded--">getPathInfoUndecoded</a></span>()</code>
<div class="block">Same as <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServletRequest.html?is-external=true#getPathInfo--" title="class or interface in javax.servlet.http"><code>HttpServletRequest.getPathInfo()</code></a> except returns the path undecoded.</div>
</td>
</tr>
-<tr id="i37" class="rowColor">
+<tr id="i40" 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/RestRequest.html#getPathParameter-java.lang.String-">getPathParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</code>
<div class="block">Returns a path parameter value.</div>
</td>
</tr>
-<tr id="i38" class="altColor">
+<tr id="i41" class="rowColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getPathParameter-java.lang.String-java.lang.Class-">getPathParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<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><T> type)</code>
<div class="block">Returns the specified path parameter converted to a POJO.</div>
</td>
</tr>
-<tr id="i39" class="rowColor">
+<tr id="i42" class="altColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getPathParameter-java.lang.String-java.lang.reflect.Type-java.lang.reflect.Type...-">getPathParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
@@ -432,38 +450,38 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<div class="block">Returns the specified path parameter converted to a POJO.</div>
</td>
</tr>
-<tr id="i40" class="altColor">
+<tr id="i43" 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/RestRequest.html#getPathRemainder--">getPathRemainder</a></span>()</code>
<div class="block">Returns the decoded remainder of the URL following any path pattern matches.</div>
</td>
</tr>
-<tr id="i41" class="rowColor">
+<tr id="i44" 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/RestRequest.html#getPathRemainderUndecoded--">getPathRemainderUndecoded</a></span>()</code>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getPathRemainder--"><code>getPathRemainder()</code></a> but doesn't decode characters.</div>
</td>
</tr>
-<tr id="i42" class="altColor">
+<tr id="i45" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getProperties--">getProperties</a></span>()</code>
<div class="block">Retrieve the properties active for this request.</div>
</td>
</tr>
-<tr id="i43" class="rowColor">
+<tr id="i46" 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/RestRequest.html#getQueryParameter-java.lang.String-">getQueryParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</code>
<div class="block">Returns a query parameter value.</div>
</td>
</tr>
-<tr id="i44" class="altColor">
+<tr id="i47" class="rowColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameter-java.lang.String-java.lang.Class-">getQueryParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<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><T> type)</code>
<div class="block">Returns the specified query parameter value converted to a POJO.</div>
</td>
</tr>
-<tr id="i45" class="rowColor">
+<tr id="i48" class="altColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameter-java.lang.String-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">getQueryParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> def,
@@ -472,14 +490,14 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameter-java.lang.String-java.lang.Class-"><code>getQueryParameter(String, Class)</code></a> except returns a default value if not found.</div>
</td>
</tr>
-<tr id="i46" class="altColor">
+<tr id="i49" 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/RestRequest.html#getQueryParameter-java.lang.String-java.lang.String-">getQueryParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> def)</code>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameter-java.lang.String-"><code>getQueryParameter(String)</code></a> but returns the specified default value if the query parameter was not specified.</div>
</td>
</tr>
-<tr id="i47" class="rowColor">
+<tr id="i50" class="altColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameter-java.lang.String-T-java.lang.Class-">getQueryParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
T def,
@@ -487,7 +505,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameter-java.lang.String-java.lang.Class-"><code>getQueryParameter(String, Class)</code></a> except returns a default value if not found.</div>
</td>
</tr>
-<tr id="i48" class="altColor">
+<tr id="i51" class="rowColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameter-java.lang.String-java.lang.reflect.Type-java.lang.reflect.Type...-">getQueryParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
@@ -495,25 +513,25 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<div class="block">Returns the specified query parameter value converted to a POJO.</div>
</td>
</tr>
-<tr id="i49" class="rowColor">
+<tr id="i52" class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameterMap--">getQueryParameterMap</a></span>()</code>
<div class="block">Equivalent to <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletRequestWrapper.html?is-external=true#getParameterMap--" title="class or interface in javax.servlet"><code>ServletRequestWrapper.getParameterMap()</code></a>, but only looks for query parameters in the URL, not form posts.</div>
</td>
</tr>
-<tr id="i50" class="altColor">
+<tr id="i53" class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameterNames--">getQueryParameterNames</a></span>()</code>
<div class="block">Equivalent to <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletRequestWrapper.html?is-external=true#getParameterNames--" title="class or interface in javax.servlet"><code>ServletRequestWrapper.getParameterNames()</code></a>, but only looks for query parameters in the URL, not form posts.</div>
</td>
</tr>
-<tr id="i51" class="rowColor">
+<tr id="i54" 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/RestRequest.html#getQueryParameters-java.lang.String-">getQueryParameters</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</code>
<div class="block">Returns the list of all query parameters with the specified name.</div>
</td>
</tr>
-<tr id="i52" class="altColor">
+<tr id="i55" class="rowColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameters-java.lang.String-java.lang.Class-">getQueryParameters</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<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><T> c)</code>
@@ -521,7 +539,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
(e.g.</div>
</td>
</tr>
-<tr id="i53" class="rowColor">
+<tr id="i56" class="altColor">
<td class="colFirst"><code><T> T</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameters-java.lang.String-java.lang.reflect.Type-java.lang.reflect.Type...-">getQueryParameters</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
@@ -530,25 +548,25 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
(e.g.</div>
</td>
</tr>
-<tr id="i54" class="altColor">
+<tr id="i57" class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/BufferedReader.html?is-external=true" title="class or interface in java.io">BufferedReader</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getReader--">getReader</a></span>()</code>
<div class="block">Returns the HTTP body content as a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a>.</div>
</td>
</tr>
-<tr id="i55" class="rowColor">
+<tr id="i58" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="class in org.apache.juneau.parser">ReaderParser</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getReaderParser--">getReaderParser</a></span>()</code>
<div class="block">Returns the reader parser matching the request <code>Content-Type</code> header.</div>
</td>
</tr>
-<tr id="i56" class="altColor">
+<tr id="i59" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getReaderResource-java.lang.String-">getReaderResource</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</code>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getReaderResource-java.lang.String-boolean-"><code>getReaderResource(String, boolean)</code></a> with <code>resolveVars == <jk>false</jk></code></div>
</td>
</tr>
-<tr id="i57" class="rowColor">
+<tr id="i60" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getReaderResource-java.lang.String-boolean-">getReaderResource</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
boolean resolveVars)</code>
@@ -556,7 +574,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
constructed using <a href="../../../../org/apache/juneau/rest/RestConfig.html#addMimeTypes-java.lang.String...-"><code>RestConfig.addMimeTypes(String...)</code></a> to determine the media type.</div>
</td>
</tr>
-<tr id="i58" class="altColor">
+<tr id="i61" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getReaderResource-java.lang.String-boolean-org.apache.juneau.MediaType-">getReaderResource</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
boolean resolveVars,
@@ -564,179 +582,179 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<div class="block">Returns an instance of a <a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest"><code>ReaderResource</code></a> that represents the contents of a resource text file from the classpath.</div>
</td>
</tr>
-<tr id="i59" class="rowColor">
+<tr id="i62" 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/RestRequest.html#getRelativeServletURI--">getRelativeServletURI</a></span>()</code>
<div class="block">Gets the path-absolute relative URI of the servlet (e.g.</div>
</td>
</tr>
-<tr id="i60" class="altColor">
+<tr id="i63" 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/RestRequest.html#getRequestParentURI--">getRequestParentURI</a></span>()</code>
<div class="block">Returns the URI of the parent resource.</div>
</td>
</tr>
-<tr id="i61" class="rowColor">
+<tr id="i64" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getResourceBundle--">getResourceBundle</a></span>()</code>
<div class="block">Returns the resource bundle for the request locale.</div>
</td>
</tr>
-<tr id="i62" class="altColor">
+<tr id="i65" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getSerializerGroup--">getSerializerGroup</a></span>()</code>
<div class="block">Returns the serializers associated with this request.</div>
</td>
</tr>
-<tr id="i63" class="rowColor">
+<tr id="i66" 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/RestRequest.html#getServletDescription--">getServletDescription</a></span>()</code>
<div class="block">Returns the localized servlet description.</div>
</td>
</tr>
-<tr id="i64" class="altColor">
+<tr id="i67" 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/RestRequest.html#getServletParentURI--">getServletParentURI</a></span>()</code>
<div class="block">Returns the URI of the parent of this servlet.</div>
</td>
</tr>
-<tr id="i65" class="rowColor">
+<tr id="i68" 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/RestRequest.html#getServletTitle--">getServletTitle</a></span>()</code>
<div class="block">Returns the localized servlet title.</div>
</td>
</tr>
-<tr id="i66" class="altColor">
+<tr id="i69" 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/RestRequest.html#getServletURI--">getServletURI</a></span>()</code>
<div class="block">Gets the URI of the servlet (e.g.</div>
</td>
</tr>
-<tr id="i67" class="rowColor">
+<tr id="i70" class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuffer.html?is-external=true" title="class or interface in java.lang">StringBuffer</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getServletURIBuilder--">getServletURIBuilder</a></span>()</code>
<div class="block">Returns a <code>StringBuffer</code> prefilled with the string <code><js>"/[contextPath]/[servletPath]"</js></code>.</div>
</td>
</tr>
-<tr id="i68" class="altColor">
+<tr id="i71" class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getSupportedMediaTypes--">getSupportedMediaTypes</a></span>()</code>
<div class="block">Returns the media types that are valid for <code>Content-Type</code> headers on the request.</div>
</td>
</tr>
-<tr id="i69" class="rowColor">
+<tr id="i72" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getSwagger--">getSwagger</a></span>()</code>
<div class="block">Returns the localized swagger associated with the servlet.</div>
</td>
</tr>
-<tr id="i70" class="altColor">
+<tr id="i73" class="rowColor">
<td class="colFirst"><code>protected <a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getSwaggerFromFile--">getSwaggerFromFile</a></span>()</code>
<div class="block">Returns the localized Swagger from the file system.</div>
</td>
</tr>
-<tr id="i71" class="rowColor">
+<tr id="i74" class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/TimeZone.html?is-external=true" title="class or interface in java.util">TimeZone</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getTimeZone--">getTimeZone</a></span>()</code>
<div class="block">Returns the <code>Time-Zone</code> header value on the request if there is one.</div>
</td>
</tr>
-<tr id="i72" class="altColor">
+<tr id="i75" 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/RestRequest.html#getTrimmedRequestURI--">getTrimmedRequestURI</a></span>()</code>
<div class="block">Same as <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServletRequestWrapper.html?is-external=true#getRequestURI--" title="class or interface in javax.servlet.http"><code>HttpServletRequestWrapper.getRequestURI()</code></a> but trims trailing slashes from the result.</div>
</td>
</tr>
-<tr id="i73" class="rowColor">
+<tr id="i76" class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuffer.html?is-external=true" title="class or interface in java.lang">StringBuffer</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getTrimmedRequestURL--">getTrimmedRequestURL</a></span>()</code>
<div class="block">Same as <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServletRequestWrapper.html?is-external=true#getRequestURL--" title="class or interface in javax.servlet.http"><code>HttpServletRequestWrapper.getRequestURL()</code></a> but trims trailing slashes from the result.</div>
</td>
</tr>
-<tr id="i74" class="altColor">
+<tr id="i77" class="rowColor">
<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getUnbufferedReader--">getUnbufferedReader</a></span>()</code>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getReader--"><code>getReader()</code></a>, but doesn't encapsulate the result in a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/BufferedReader.html?is-external=true" title="class or interface in java.io"><code>BufferedReader</code></a>;</div>
</td>
</tr>
-<tr id="i75" class="rowColor">
+<tr id="i78" class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net">URL</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getURL-java.lang.String-">getURL</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</code>
<div class="block">Returns a resolved URL.</div>
</td>
</tr>
-<tr id="i76" class="altColor">
+<tr id="i79" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getVarResolverSession--">getVarResolverSession</a></span>()</code>
<div class="block">Returns the variable resolver session for this request using session objects created by <a href="../../../../org/apache/juneau/rest/RestCallHandler.html#getSessionObjects-org.apache.juneau.rest.RestRequest-"><code>RestCallHandler.getSessionObjects(RestRequest)</code></a>.</div>
</td>
</tr>
-<tr id="i77" class="rowColor">
+<tr id="i80" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#hasAnyQueryParameters-java.lang.String...-">hasAnyQueryParameters</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... params)</code>
<div class="block">Returns <jk>true</jk> if the request contains any of the specified query parameters.</div>
</td>
</tr>
-<tr id="i78" class="altColor">
+<tr id="i81" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#hasFormDataParameter-java.lang.String-">hasFormDataParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</code>
<div class="block">Returns <jk>true</jk> if the form data parameters on this request contains the specified entry.</div>
</td>
</tr>
-<tr id="i79" class="rowColor">
+<tr id="i82" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#hasQueryParameter-java.lang.String-">hasQueryParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</code>
<div class="block">Returns <jk>true</jk> if the query parameters on this request contains the specified entry.</div>
</td>
</tr>
-<tr id="i80" class="altColor">
+<tr id="i83" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#isPlainText--">isPlainText</a></span>()</code>
<div class="block">Returns <jk>true</jk> if <code>&plainText=true</code> was specified as a URL parameter.</div>
</td>
</tr>
-<tr id="i81" class="rowColor">
+<tr id="i84" 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/RestRequest.html#resolveVars-java.lang.String-">resolveVars</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> input)</code>
<div class="block">Shortcut for calling <code>getVarResolverSession().resolve(input)</code>.</div>
</td>
</tr>
-<tr id="i82" class="altColor">
+<tr id="i85" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#setCharacterEncoding-java.lang.String-">setCharacterEncoding</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> charset)</code>
<div class="block">Sets the charset to expect on the request body.</div>
</td>
</tr>
-<tr id="i83" class="rowColor">
+<tr id="i86" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#setFormDataParameter-java.lang.String-java.lang.Object-">setFormDataParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets a request form data parameter value.</div>
</td>
</tr>
-<tr id="i84" class="altColor">
+<tr id="i87" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#setHeader-java.lang.String-java.lang.Object-">setHeader</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets a request header value.</div>
</td>
</tr>
-<tr id="i85" class="rowColor">
+<tr id="i88" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#setPathParameter-java.lang.String-java.lang.String-">setPathParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> value)</code>
<div class="block">Sets a path parameter value.</div>
</td>
</tr>
-<tr id="i86" class="altColor">
+<tr id="i89" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#setQueryParameter-java.lang.String-java.lang.Object-">setQueryParameter</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets a request query parameter value.</div>
</td>
</tr>
-<tr id="i87" class="rowColor">
+<tr id="i90" 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/RestRequest.html#toString--">toString</a></span>()</code> </td>
</tr>
@@ -789,7 +807,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getDescription</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/RestRequest.html#line.170">getDescription</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.174">getDescription</a>()</pre>
<div class="block">Returns a string of the form <js>"HTTP method-name full-url"</js></div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -803,7 +821,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getProperties</h4>
-<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.195">getProperties</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.199">getProperties</a>()</pre>
<div class="block">Retrieve the properties active for this request.
<p>
These properties can be modified by the request.</div>
@@ -819,7 +837,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHeader</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.210">setHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.214">setHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets a request header value.</div>
<dl>
@@ -835,7 +853,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getHeader</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/RestRequest.html#line.223">getHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<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/RestRequest.html#line.227">getHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Returns the specified header value, or <jk>null</jk> if the header doesn't exist.
<p>
If <code>allowHeaderParams</code> init parameter is <jk>true</jk>, then first looks for <code>&HeaderName=x</code> in the URL query string.</div>
@@ -853,7 +871,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getHeader</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/RestRequest.html#line.236">getHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="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/RestRequest.html#line.240">getHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> def)</pre>
<div class="block">Returns the specified header value, or a default value if the header doesn't exist.
<p>
@@ -873,7 +891,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getHeader</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.274">getHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.278">getHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> type)</pre>
<div class="block">Returns the specified header value converted to a POJO.
<p>
@@ -907,7 +925,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getHeader</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.288">getHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.292">getHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
T def,
<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><T> type)</pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getHeader-java.lang.String-java.lang.Class-"><code>getHeader(String, Class)</code></a> but returns a default value if not found.</div>
@@ -929,7 +947,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getHeader</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.316">getHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.320">getHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)</pre>
<div class="block">Returns the specified header value converted to a POJO.
@@ -963,7 +981,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getHeaders</h4>
-<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.328">getHeaders</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.332">getHeaders</a>()</pre>
<div class="block">Returns all the request headers as an <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><code>ObjectMap</code></a>.
<p>
Altering entries in this map does not alter headers in the underlying request.</div>
@@ -979,7 +997,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getHeaders</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</a><<a href="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/RestRequest.html#line.340">getHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</a><<a href="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/RestRequest.html#line.344">getHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServletRequest.html?is-external=true#getHeaders-java.lang.String-" title="class or interface in javax.servlet.http">getHeaders</a></code> in interface <code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServletRequest.html?is-external=true" title="class or interface in javax.servlet.http">HttpServletRequest</a></code></dd>
@@ -994,7 +1012,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getMediaType</h4>
-<pre>public <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.359">getMediaType</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.363">getMediaType</a>()</pre>
<div class="block">Returns the <code>Content-Type</code> header value on the request, stripped
of any parameters such as <js>";charset=X"</js>.
<p>
@@ -1015,7 +1033,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getTimeZone</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TimeZone.html?is-external=true" title="class or interface in java.util">TimeZone</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.376">getTimeZone</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TimeZone.html?is-external=true" title="class or interface in java.util">TimeZone</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.380">getTimeZone</a>()</pre>
<div class="block">Returns the <code>Time-Zone</code> header value on the request if there is one.
<p>
Example: <js>"GMT"</js>.</div>
@@ -1031,7 +1049,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getSupportedMediaTypes</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.388">getSupportedMediaTypes</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.392">getSupportedMediaTypes</a>()</pre>
<div class="block">Returns the media types that are valid for <code>Content-Type</code> headers on the request.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1045,7 +1063,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setCharacterEncoding</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.396">setCharacterEncoding</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> charset)</pre>
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.400">setCharacterEncoding</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> charset)</pre>
<div class="block">Sets the charset to expect on the request body.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -1061,7 +1079,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getCharacterEncoding</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/RestRequest.html#line.404">getCharacterEncoding</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.408">getCharacterEncoding</a>()</pre>
<div class="block">Returns the charset specified on the <code>Content-Type</code> header, or <js>"UTF-8"</js> if not specified.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -1077,7 +1095,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getLocale</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.424">getLocale</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.428">getLocale</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletRequest.html?is-external=true#getLocale--" title="class or interface in javax.servlet">getLocale</a></code> in interface <code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletRequest.html?is-external=true" title="class or interface in javax.servlet">ServletRequest</a></code></dd>
@@ -1092,7 +1110,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getLocales</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.435">getLocales</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.439">getLocales</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletRequest.html?is-external=true#getLocales--" title="class or interface in javax.servlet">getLocales</a></code> in interface <code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletRequest.html?is-external=true" title="class or interface in javax.servlet">ServletRequest</a></code></dd>
@@ -1107,7 +1125,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setQueryParameter</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.460">setQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.464">setQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets a request query parameter value.</div>
<dl>
@@ -1123,7 +1141,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getQueryParameter</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/RestRequest.html#line.476">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<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/RestRequest.html#line.480">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Returns a query parameter value.
<p>
Same as <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletRequestWrapper.html?is-external=true#getParameter-java.lang.String-" title="class or interface in javax.servlet"><code>ServletRequestWrapper.getParameter(String)</code></a> except only looks in the URL string, not parameters from URL-Encoded FORM posts.
@@ -1143,7 +1161,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getQueryParameter</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/RestRequest.html#line.502">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="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/RestRequest.html#line.506">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> def)</pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameter-java.lang.String-"><code>getQueryParameter(String)</code></a> but returns the specified default value if the query parameter was not specified.</div>
<dl>
@@ -1161,7 +1179,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getQueryParameter</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.536">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.540">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Returns the specified query parameter value converted to a POJO.
@@ -1206,7 +1224,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getQueryParameter</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.550">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.554">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
T def,
<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><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -1231,7 +1249,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getQueryParameter</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.586">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.590">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -1278,7 +1296,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getQueryParameter</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.604">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.608">getQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> def,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
@@ -1308,7 +1326,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getQueryParameters</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.620">getQueryParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.624">getQueryParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> c)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getQueryParameter-java.lang.String-java.lang.Class-"><code>getQueryParameter(String, Class)</code></a> except for use on multi-part parameters
@@ -1334,7 +1352,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getQueryParameters</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.640">getQueryParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.644">getQueryParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -1365,7 +1383,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getQueryParameters</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/RestRequest.html#line.654">getQueryParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<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/RestRequest.html#line.658">getQueryParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Returns the list of all query parameters with the specified name.
<p>
Same as <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletRequestWrapper.html?is-external=true#getParameterValues-java.lang.String-" title="class or interface in javax.servlet"><code>ServletRequestWrapper.getParameterValues(String)</code></a> except only looks in the URL string, not parameters from URL-Encoded FORM posts.
@@ -1385,7 +1403,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>hasQueryParameter</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.669">hasQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.673">hasQueryParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Returns <jk>true</jk> if the query parameters on this request contains the specified entry.
<p>
Note that this returns <jk>true</jk> even if the value is set to null (e.g. <js>"?key"</js>).
@@ -1406,7 +1424,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>hasAnyQueryParameters</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.679">hasAnyQueryParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... params)</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.683">hasAnyQueryParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... params)</pre>
<div class="block">Returns <jk>true</jk> if the request contains any of the specified query parameters.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1422,7 +1440,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getQueryParameterMap</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.695">getQueryParameterMap</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.699">getQueryParameterMap</a>()</pre>
<div class="block">Equivalent to <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletRequestWrapper.html?is-external=true#getParameterMap--" title="class or interface in javax.servlet"><code>ServletRequestWrapper.getParameterMap()</code></a>, but only looks for query parameters in the URL, not form posts.
<p>
This method can be used to retrieve query parameters without triggering the underlying servlet API to load and parse the request body.
@@ -1440,7 +1458,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getQueryParameterNames</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.708">getQueryParameterNames</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.712">getQueryParameterNames</a>()</pre>
<div class="block">Equivalent to <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletRequestWrapper.html?is-external=true#getParameterNames--" title="class or interface in javax.servlet"><code>ServletRequestWrapper.getParameterNames()</code></a>, but only looks for query parameters in the URL, not form posts.
<p>
This method can be used to retrieve query parameters without triggering the underlying servlet API to load and parse the request body.
@@ -1458,7 +1476,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setFormDataParameter</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.766">setFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.770">setFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets a request form data parameter value.</div>
<dl>
@@ -1474,7 +1492,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getFormDataParameter</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/RestRequest.html#line.793">getFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<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/RestRequest.html#line.797">getFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Returns a form data parameter value.
<p>
Parameter lookup is case-insensitive (consistent with WAS, but differs from Tomcat).
@@ -1505,7 +1523,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getFormDataParameter</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/RestRequest.html#line.810">getFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="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/RestRequest.html#line.814">getFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> def)</pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getFormDataParameter-java.lang.String-"><code>getFormDataParameter(String)</code></a> except returns a default value if <jk>null</jk> or empty.</div>
<dl>
@@ -1523,7 +1541,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getFormDataParameter</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.850">getFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.854">getFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Returns the specified form data parameter value converted to a POJO using the
@@ -1572,7 +1590,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getFormDataParameter</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.864">getFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.868">getFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
T def,
<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><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -1597,7 +1615,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getFormDataParameters</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.879">getFormDataParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.883">getFormDataParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getFormDataParameter-java.lang.String-java.lang.Class-"><code>getFormDataParameter(String, Class)</code></a> except for use on multi-part parameters
@@ -1621,7 +1639,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getFormDataParameter</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.917">getFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.921">getFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -1669,7 +1687,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getFormDataParameters</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.936">getFormDataParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.940">getFormDataParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -1698,7 +1716,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>hasFormDataParameter</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.948">hasFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.952">hasFormDataParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Returns <jk>true</jk> if the form data parameters on this request contains the specified entry.
<p>
Note that this returns <jk>true</jk> even if the value is set to null (e.g. <js>"?key"</js>).</div
<TRUNCATED>
[34/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/rest/client/RestCall.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/client/RestCall.html b/content/site/apidocs/org/apache/juneau/rest/client/RestCall.html
index c08b5a7..fc313b8 100644
--- a/content/site/apidocs/org/apache/juneau/rest/client/RestCall.html
+++ b/content/site/apidocs/org/apache/juneau/rest/client/RestCall.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":42,"i14":10,"i15":10,"i16":10,"i17":42,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":42,"i14":10,"i15":10,"i16":10,"i17":42,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":10,"i78":10,"i79":10,"i80":10,"i81":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public final class <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.57">RestCall</a>
+<pre>public final class <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.58">RestCall</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">Represents a connection to a remote REST resource.
<p>
@@ -148,8 +148,9 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</tr>
<tr class="altColor">
<td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#RestCall-org.apache.juneau.rest.client.RestClient-org.apache.http.client.methods.HttpRequestBase-">RestCall</a></span>(<a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a> client,
- org.apache.http.client.methods.HttpRequestBase request)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#RestCall-org.apache.juneau.rest.client.RestClient-org.apache.http.client.methods.HttpRequestBase-java.net.URI-">RestCall</a></span>(<a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a> client,
+ org.apache.http.client.methods.HttpRequestBase request,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</code>
<div class="block">Constructs a REST call with the specified method name.</div>
</td>
</tr>
@@ -415,91 +416,104 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</tr>
<tr id="i40" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#host-java.lang.String-">host</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host)</code>
+<div class="block">Sets the URI host.</div>
+</td>
+</tr>
+<tr id="i41" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#ifMatch-java.lang.Object-">ifMatch</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>If-Match</code> request header.</div>
</td>
</tr>
-<tr id="i41" class="rowColor">
+<tr id="i42" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#ifModifiedSince-java.lang.Object-">ifModifiedSince</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>If-Modified-Since</code> request header.</div>
</td>
</tr>
-<tr id="i42" class="altColor">
+<tr id="i43" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#ifNoneMatch-java.lang.Object-">ifNoneMatch</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>If-None-Match</code> request header.</div>
</td>
</tr>
-<tr id="i43" class="rowColor">
+<tr id="i44" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#ifRange-java.lang.Object-">ifRange</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>If-Range</code> request header.</div>
</td>
</tr>
-<tr id="i44" class="altColor">
+<tr id="i45" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#ifUnmodifiedSince-java.lang.Object-">ifUnmodifiedSince</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>If-Unmodified-Since</code> request header.</div>
</td>
</tr>
-<tr id="i45" class="rowColor">
+<tr id="i46" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#ignoreErrors--">ignoreErrors</a></span>()</code>
<div class="block">Prevent <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client"><code>RestCallExceptions</code></a> from being thrown when HTTP status 400+ is encountered.</div>
</td>
</tr>
-<tr id="i46" class="altColor">
+<tr id="i47" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#input-java.lang.Object-">input</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input)</code>
<div class="block">Sets the input for this REST call.</div>
</td>
</tr>
-<tr id="i47" class="rowColor">
+<tr id="i48" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#interceptor-org.apache.juneau.rest.client.RestCallInterceptor-">interceptor</a></span>(<a href="../../../../../org/apache/juneau/rest/client/RestCallInterceptor.html" title="class in org.apache.juneau.rest.client">RestCallInterceptor</a> interceptor)</code>
<div class="block">Add an interceptor for this call only.</div>
</td>
</tr>
-<tr id="i48" class="altColor">
+<tr id="i49" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#logTo-java.util.logging.Level-java.util.logging.Logger-">logTo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/logging/Level.html?is-external=true" title="class or interface in java.util.logging">Level</a> level,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/logging/Logger.html?is-external=true" title="class or interface in java.util.logging">Logger</a> log)</code>
<div class="block">Adds a <a href="../../../../../org/apache/juneau/rest/client/RestCallLogger.html" title="class in org.apache.juneau.rest.client"><code>RestCallLogger</code></a> to the list of interceptors on this class.</div>
</td>
</tr>
-<tr id="i49" class="rowColor">
+<tr id="i50" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#maxForwards-java.lang.Object-">maxForwards</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>Max-Forwards</code> request header.</div>
</td>
</tr>
-<tr id="i50" class="altColor">
+<tr id="i51" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#origin-java.lang.Object-">origin</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>Origin</code> request header.</div>
</td>
</tr>
-<tr id="i51" class="rowColor">
+<tr id="i52" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#param-java.lang.String-java.lang.Object-">param</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
+<div class="block">Adds a parameter to the URI query.</div>
+</td>
+</tr>
+<tr id="i53" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#parser-org.apache.juneau.parser.Parser-">parser</a></span>(<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> parser)</code>
<div class="block">Specifies the parser to use on this call.</div>
</td>
</tr>
-<tr id="i52" class="altColor">
+<tr id="i54" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#pipeTo-java.io.OutputStream-">pipeTo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a> os)</code>
<div class="block">Pipes the request output to the specified output stream when <a href="../../../../../org/apache/juneau/rest/client/RestCall.html#run--"><code>run()</code></a> is called.</div>
</td>
</tr>
-<tr id="i53" class="rowColor">
+<tr id="i55" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#pipeTo-java.io.OutputStream-boolean-">pipeTo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a> os,
boolean close)</code>
<div class="block">Pipe output from response to the specified output stream when <a href="../../../../../org/apache/juneau/rest/client/RestCall.html#run--"><code>run()</code></a> is called.</div>
</td>
</tr>
-<tr id="i54" class="altColor">
+<tr id="i56" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#pipeTo-java.lang.String-java.io.OutputStream-boolean-">pipeTo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> id,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a> os,
@@ -508,7 +522,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
that output stream with an ID so it can be retrieved through <a href="../../../../../org/apache/juneau/rest/client/RestCall.html#getOutputStream-java.lang.String-"><code>getOutputStream(String)</code></a>.</div>
</td>
</tr>
-<tr id="i55" class="rowColor">
+<tr id="i57" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#pipeTo-java.lang.String-java.io.Writer-boolean-">pipeTo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> id,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w,
@@ -517,56 +531,68 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
that writer with an ID so it can be retrieved through <a href="../../../../../org/apache/juneau/rest/client/RestCall.html#getWriter-java.lang.String-"><code>getWriter(String)</code></a>.</div>
</td>
</tr>
-<tr id="i56" class="altColor">
+<tr id="i58" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#pipeTo-java.io.Writer-">pipeTo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w)</code>
<div class="block">Pipes the request output to the specified writer when <a href="../../../../../org/apache/juneau/rest/client/RestCall.html#run--"><code>run()</code></a> is called.</div>
</td>
</tr>
-<tr id="i57" class="rowColor">
+<tr id="i59" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#pipeTo-java.io.Writer-boolean-">pipeTo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w,
boolean close)</code>
<div class="block">Pipe output from response to the specified writer when <a href="../../../../../org/apache/juneau/rest/client/RestCall.html#run--"><code>run()</code></a> is called.</div>
</td>
</tr>
-<tr id="i58" class="altColor">
+<tr id="i60" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#port-int-">port</a></span>(int port)</code>
+<div class="block">Sets the URI port.</div>
+</td>
+</tr>
+<tr id="i61" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#pragma-java.lang.Object-">pragma</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>Pragma</code> request header.</div>
</td>
</tr>
-<tr id="i59" class="rowColor">
+<tr id="i62" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#proxyAuthorization-java.lang.Object-">proxyAuthorization</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>Proxy-Authorization</code> request header.</div>
</td>
</tr>
-<tr id="i60" class="altColor">
+<tr id="i63" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#query-java.lang.String-">query</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> query)</code>
+<div class="block">Sets a custom URI query.</div>
+</td>
+</tr>
+<tr id="i64" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#range-java.lang.Object-">range</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>Range</code> request header.</div>
</td>
</tr>
-<tr id="i61" class="rowColor">
+<tr id="i65" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#redirectMaxAttempts-int-">redirectMaxAttempts</a></span>(int maxAttempts)</code>
<div class="block">Specify the number of redirects to follow before throwing an exception.</div>
</td>
</tr>
-<tr id="i62" class="altColor">
+<tr id="i66" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#referer-java.lang.Object-">referer</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>Referer</code> request header.</div>
</td>
</tr>
-<tr id="i63" class="rowColor">
+<tr id="i67" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#responsePattern-org.apache.juneau.rest.client.ResponsePattern-">responsePattern</a></span>(<a href="../../../../../org/apache/juneau/rest/client/ResponsePattern.html" title="class in org.apache.juneau.rest.client">ResponsePattern</a> responsePattern)</code>
<div class="block">Adds a response pattern finder to look for regular expression matches in the response output.</div>
</td>
</tr>
-<tr id="i64" class="altColor">
+<tr id="i68" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#retryable-int-long-org.apache.juneau.rest.client.RetryOn-">retryable</a></span>(int retries,
long interval,
@@ -574,55 +600,80 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<div class="block">Make this call retryable if an error response (>=400) is received.</div>
</td>
</tr>
-<tr id="i65" class="rowColor">
+<tr id="i69" class="rowColor">
<td class="colFirst"><code>int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#run--">run</a></span>()</code>
<div class="block">Method used to execute an HTTP response where you're only interested in the HTTP response code.</div>
</td>
</tr>
-<tr id="i66" class="altColor">
+<tr id="i70" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#scheme-java.lang.String-">scheme</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> scheme)</code>
+<div class="block">Sets the URI scheme.</div>
+</td>
+</tr>
+<tr id="i71" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#serializer-org.apache.juneau.serializer.Serializer-">serializer</a></span>(<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> serializer)</code>
<div class="block">Specifies the serializer to use on this call.</div>
</td>
</tr>
-<tr id="i67" class="rowColor">
+<tr id="i72" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#setConfig-org.apache.http.client.config.RequestConfig-">setConfig</a></span>(org.apache.http.client.config.RequestConfig config)</code>
<div class="block">Set configuration settings on this request.</div>
</td>
</tr>
-<tr id="i68" class="altColor">
+<tr id="i73" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#successPattern-java.lang.String-">successPattern</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> successPattern)</code>
<div class="block">Look for the specified regular expression pattern in the response output.</div>
</td>
</tr>
-<tr id="i69" class="rowColor">
+<tr id="i74" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#te-java.lang.Object-">te</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>TE</code> request header.</div>
</td>
</tr>
-<tr id="i70" class="altColor">
+<tr id="i75" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#upgrade-java.lang.Object-">upgrade</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>Upgrade</code> request header.</div>
</td>
</tr>
-<tr id="i71" class="rowColor">
+<tr id="i76" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#uri-java.lang.Object-">uri</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)</code>
+<div class="block">Sets the URI for this call.</div>
+</td>
+</tr>
+<tr id="i77" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#userAgent-java.lang.Object-">userAgent</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>User-Agent</code> request header.</div>
</td>
</tr>
-<tr id="i72" class="altColor">
+<tr id="i78" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#userInfo-java.lang.String-">userInfo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> userInfo)</code>
+<div class="block">Sets the URI user info.</div>
+</td>
+</tr>
+<tr id="i79" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#userInfo-java.lang.String-java.lang.String-">userInfo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> username,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> password)</code>
+<div class="block">Sets the URI user info.</div>
+</td>
+</tr>
+<tr id="i80" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#via-java.lang.Object-">via</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>Via</code> request header.</div>
</td>
</tr>
-<tr id="i73" class="rowColor">
+<tr id="i81" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#warning-java.lang.Object-">warning</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Sets the value for the <code>Warning</code> request header.</div>
@@ -650,20 +701,22 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<!-- -->
</a>
<h3>Constructor Detail</h3>
-<a name="RestCall-org.apache.juneau.rest.client.RestClient-org.apache.http.client.methods.HttpRequestBase-">
+<a name="RestCall-org.apache.juneau.rest.client.RestClient-org.apache.http.client.methods.HttpRequestBase-java.net.URI-">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>RestCall</h4>
-<pre>protected <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.89">RestCall</a>(<a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a> client,
- org.apache.http.client.methods.HttpRequestBase request)
+<pre>protected <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.92">RestCall</a>(<a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a> client,
+ org.apache.http.client.methods.HttpRequestBase request,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Constructs a REST call with the specified method name.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>client</code> - The client that created this request.</dd>
<dd><code>request</code> - The wrapped Apache HTTP client request object.</dd>
+<dd><code>uri</code> - The URI for this call.</dd>
<dt><span class="throwsLabel">Throws:</span></dt>
<dd><code><a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></code> - If an exception or non-200 response code occurred during the connection attempt.</dd>
</dl>
@@ -677,13 +730,161 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<!-- -->
</a>
<h3>Method Detail</h3>
+<a name="uri-java.lang.Object-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>uri</h4>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.122">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)
+ throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
+<div class="block">Sets the URI for this call.
+ <p>
+ Can be any of the following types:
+ <ul>
+ <li><a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>
+ <li><a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>
+ <li><code>URIBuilder</code>
+ <li>Anything else converted to a string using <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang"><code>Object.toString()</code></a>.
+ </ul>
+ Relative URL strings will be interpreted as relative to the root URL defined on the client.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>uri</code> - The URI to use for this call.
+ This overrides the URI passed in from the client.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="scheme-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scheme</h4>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.138">scheme</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> scheme)</pre>
+<div class="block">Sets the URI scheme.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>scheme</code> - The new URI host.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
+<a name="host-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>host</h4>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.149">host</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host)</pre>
+<div class="block">Sets the URI host.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>host</code> - The new URI host.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
+<a name="port-int-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>port</h4>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.160">port</a>(int port)</pre>
+<div class="block">Sets the URI port.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>port</code> - The new URI port.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
+<a name="param-java.lang.String-java.lang.Object-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>param</h4>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.173">param</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+ throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
+<div class="block">Adds a parameter to the URI query.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - The parameter name.</dd>
+<dd><code>value</code> - The parameter value converted to a string using UON notation.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="query-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>query</h4>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.184">query</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> query)</pre>
+<div class="block">Sets a custom URI query.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>query</code> - The new URI query string.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
+<a name="userInfo-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>userInfo</h4>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.195">userInfo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> userInfo)</pre>
+<div class="block">Sets the URI user info.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>userInfo</code> - The new URI user info.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
+<a name="userInfo-java.lang.String-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>userInfo</h4>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.207">userInfo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> username,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> password)</pre>
+<div class="block">Sets the URI user info.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>username</code> - The new URI username.</dd>
+<dd><code>password</code> - The new URI password.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
<a name="input-java.lang.Object-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>input</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.115">input</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.226">input</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the input for this REST call.</div>
<dl>
@@ -709,7 +910,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>serializer</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.128">serializer</a>(<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> serializer)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.239">serializer</a>(<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> serializer)</pre>
<div class="block">Specifies the serializer to use on this call.
<p>
Overrides the serializer specified on the <a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client"><code>RestClient</code></a>.</div>
@@ -727,7 +928,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>parser</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.141">parser</a>(<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> parser)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.252">parser</a>(<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> parser)</pre>
<div class="block">Specifies the parser to use on this call.
<p>
Overrides the parser specified on the <a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client"><code>RestClient</code></a>.</div>
@@ -745,7 +946,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>header</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.160">header</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.271">header</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Convenience method for setting a header value on the request.
<p>
@@ -765,7 +966,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>accept</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.173">accept</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.284">accept</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Accept</code> request header.
<p>
This overrides the media type specified on the parser, but is overridden by calling <code>header(<js>"Accept"</js>, value);</code></div>
@@ -783,7 +984,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>acceptCharset</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.185">acceptCharset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.296">acceptCharset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Accept-Charset</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Accept-Charset"</js>, value);</code></div>
@@ -801,7 +1002,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>acceptEncoding</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.197">acceptEncoding</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.308">acceptEncoding</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Accept-Encoding</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Accept-Encoding"</js>, value);</code></div>
@@ -819,7 +1020,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>acceptLanguage</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.209">acceptLanguage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.320">acceptLanguage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Accept-Language</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Accept-Language"</js>, value);</code></div>
@@ -837,7 +1038,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>authorization</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.221">authorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.332">authorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Authorization</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Authorization"</js>, value);</code></div>
@@ -855,7 +1056,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>cacheControl</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.233">cacheControl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.344">cacheControl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Cache-Control</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Cache-Control"</js>, value);</code></div>
@@ -873,7 +1074,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>connection</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.245">connection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.356">connection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Connection</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Connection"</js>, value);</code></div>
@@ -891,7 +1092,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>contentLength</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.257">contentLength</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.368">contentLength</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Content-Length</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Content-Length"</js>, value);</code></div>
@@ -909,7 +1110,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>contentType</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.269">contentType</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.380">contentType</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Content-Type</code> request header.
<p>
This overrides the media type specified on the serializer, but is overridden by calling <code>header(<js>"Content-Type"</js>, value);</code></div>
@@ -927,7 +1128,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>date</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.281">date</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.392">date</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Date</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Date"</js>, value);</code></div>
@@ -945,7 +1146,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>expect</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.293">expect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.404">expect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Expect</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Expect"</js>, value);</code></div>
@@ -963,7 +1164,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>forwarded</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.305">forwarded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.416">forwarded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Forwarded</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Forwarded"</js>, value);</code></div>
@@ -981,7 +1182,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>from</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.317">from</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.428">from</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>From</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"From"</js>, value);</code></div>
@@ -999,7 +1200,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>host</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.329">host</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.440">host</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Host</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Host"</js>, value);</code></div>
@@ -1017,7 +1218,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ifMatch</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.341">ifMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.452">ifMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>If-Match</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"If-Match"</js>, value);</code></div>
@@ -1035,7 +1236,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ifModifiedSince</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.353">ifModifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.464">ifModifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>If-Modified-Since</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"If-Modified-Since"</js>, value);</code></div>
@@ -1053,7 +1254,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ifNoneMatch</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.365">ifNoneMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.476">ifNoneMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>If-None-Match</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"If-None-Match"</js>, value);</code></div>
@@ -1071,7 +1272,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ifRange</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.377">ifRange</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.488">ifRange</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>If-Range</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"If-Range"</js>, value);</code></div>
@@ -1089,7 +1290,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ifUnmodifiedSince</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.389">ifUnmodifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.500">ifUnmodifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>If-Unmodified-Since</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"If-Unmodified-Since"</js>, value);</code></div>
@@ -1107,7 +1308,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>maxForwards</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.401">maxForwards</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.512">maxForwards</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Max-Forwards</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Max-Forwards"</js>, value);</code></div>
@@ -1125,7 +1326,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>origin</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.413">origin</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.524">origin</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Origin</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Origin"</js>, value);</code></div>
@@ -1143,7 +1344,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>pragma</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.425">pragma</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.536">pragma</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Pragma</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Pragma"</js>, value);</code></div>
@@ -1161,7 +1362,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>proxyAuthorization</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.437">proxyAuthorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.548">proxyAuthorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Proxy-Authorization</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Proxy-Authorization"</js>, value);</code></div>
@@ -1179,7 +1380,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>range</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.449">range</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.560">range</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Range</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Range"</js>, value);</code></div>
@@ -1197,7 +1398,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>referer</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.461">referer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.572">referer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Referer</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Referer"</js>, value);</code></div>
@@ -1215,7 +1416,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>te</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.473">te</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.584">te</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>TE</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"TE"</js>, value);</code></div>
@@ -1233,7 +1434,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>userAgent</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.485">userAgent</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.596">userAgent</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>User-Agent</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"User-Agent"</js>, value);</code></div>
@@ -1251,7 +1452,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>upgrade</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.497">upgrade</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.608">upgrade</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Upgrade</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Upgrade"</js>, value);</code></div>
@@ -1269,7 +1470,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>via</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.509">via</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.620">via</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Via</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Via"</js>, value);</code></div>
@@ -1287,7 +1488,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>warning</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.521">warning</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.632">warning</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Warning</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Warning"</js>, value);</code></div>
@@ -1305,7 +1506,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>clientVersion</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.531">clientVersion</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> version)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.642">clientVersion</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> version)</pre>
<div class="block">Sets the client version by setting the value for the <js>"X-Client-Version"</js> header.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1321,7 +1522,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>retryable</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.545">retryable</a>(int retries,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.656">retryable</a>(int retries,
long interval,
<a href="../../../../../org/apache/juneau/rest/client/RetryOn.html" title="interface in org.apache.juneau.rest.client">RetryOn</a> retryOn)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
@@ -1345,7 +1546,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>allowRedirectsOnPosts</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.573">allowRedirectsOnPosts</a>(boolean b)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.684">allowRedirectsOnPosts</a>(boolean b)</pre>
<div class="block">For this call, allow automatic redirects when a 302 or 307 occurs when
performing a POST.
<p>
@@ -1368,7 +1569,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>redirectMaxAttempts</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.584">redirectMaxAttempts</a>(int maxAttempts)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.695">redirectMaxAttempts</a>(int maxAttempts)</pre>
<div class="block">Specify the number of redirects to follow before throwing an exception.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1384,7 +1585,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>interceptor</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.595">interceptor</a>(<a href="../../../../../org/apache/juneau/rest/client/RestCallInterceptor.html" title="class in org.apache.juneau.rest.client">RestCallInterceptor</a> interceptor)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.706">interceptor</a>(<a href="../../../../../org/apache/juneau/rest/client/RestCallInterceptor.html" title="class in org.apache.juneau.rest.client">RestCallInterceptor</a> interceptor)</pre>
<div class="block">Add an interceptor for this call only.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1400,7 +1601,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>pipeTo</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/
<TRUNCATED>
[10/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/parser/Parser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/parser/Parser.html b/content/site/apidocs/src-html/org/apache/juneau/parser/Parser.html
index 0c1434b..55d3329 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/parser/Parser.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/parser/Parser.html
@@ -490,12 +490,12 @@
<span class="sourceLineNo">482</span> * @return An array of parsed objects.<a name="line.482"></a>
<span class="sourceLineNo">483</span> * @throws ParseException If the input contains a syntax error or is malformed, or is not valid for the specified type.<a name="line.483"></a>
<span class="sourceLineNo">484</span> */<a name="line.484"></a>
-<span class="sourceLineNo">485</span> public final Object[] parseArgs(Object input, ClassMeta<?>[] argTypes) throws ParseException {<a name="line.485"></a>
+<span class="sourceLineNo">485</span> public final Object[] parseArgs(Object input, Type[] argTypes) throws ParseException {<a name="line.485"></a>
<span class="sourceLineNo">486</span> if (argTypes == null || argTypes.length == 0)<a name="line.486"></a>
<span class="sourceLineNo">487</span> return new Object[0];<a name="line.487"></a>
<span class="sourceLineNo">488</span> ParserSession session = createSession(input);<a name="line.488"></a>
<span class="sourceLineNo">489</span> try {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> return doParseArgs(session, argTypes);<a name="line.490"></a>
+<span class="sourceLineNo">490</span> return doParse(session, session.getArgsClassMeta(argTypes));<a name="line.490"></a>
<span class="sourceLineNo">491</span> } catch (ParseException e) {<a name="line.491"></a>
<span class="sourceLineNo">492</span> throw e;<a name="line.492"></a>
<span class="sourceLineNo">493</span> } catch (Exception e) {<a name="line.493"></a>
@@ -505,187 +505,150 @@
<span class="sourceLineNo">497</span> }<a name="line.497"></a>
<span class="sourceLineNo">498</span> }<a name="line.498"></a>
<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span> /**<a name="line.500"></a>
-<span class="sourceLineNo">501</span> * Same as {@link #parseArgs(Object, ClassMeta[])} except allows you to pass in {@link Class} objects.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> *<a name="line.502"></a>
-<span class="sourceLineNo">503</span> * @param input The input. Subclasses can support different input types.<a name="line.503"></a>
-<span class="sourceLineNo">504</span> * @param argTypes Specifies the type of objects to create for each entry in the array.<a name="line.504"></a>
-<span class="sourceLineNo">505</span> * @return An array of parsed objects.<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * @throws ParseException If the input contains a syntax error or is malformed, or is not valid for the specified type.<a name="line.506"></a>
-<span class="sourceLineNo">507</span> */<a name="line.507"></a>
-<span class="sourceLineNo">508</span> public final Object[] parseArgs(Object input, Type[] argTypes) throws ParseException {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> if (argTypes == null || argTypes.length == 0)<a name="line.509"></a>
-<span class="sourceLineNo">510</span> return new Object[0];<a name="line.510"></a>
-<span class="sourceLineNo">511</span> ParserSession session = createSession(input);<a name="line.511"></a>
-<span class="sourceLineNo">512</span> try {<a name="line.512"></a>
-<span class="sourceLineNo">513</span> return doParseArgs(session, session.getClassMetas(argTypes));<a name="line.513"></a>
-<span class="sourceLineNo">514</span> } catch (ParseException e) {<a name="line.514"></a>
-<span class="sourceLineNo">515</span> throw e;<a name="line.515"></a>
-<span class="sourceLineNo">516</span> } catch (Exception e) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span> throw new ParseException(session, e);<a name="line.517"></a>
-<span class="sourceLineNo">518</span> } finally {<a name="line.518"></a>
-<span class="sourceLineNo">519</span> session.close();<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
-<span class="sourceLineNo">521</span> }<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span> /**<a name="line.523"></a>
-<span class="sourceLineNo">524</span> * Implementation method.<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * Default implementation throws an {@link UnsupportedOperationException}.<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * @param session The runtime session object returned by {@link #createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)}.<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * If <jk>null</jk>, one will be created using {@link #createSession(Object)}.<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * @param argTypes Specifies the type of objects to create for each entry in the array.<a name="line.528"></a>
-<span class="sourceLineNo">529</span> *<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * @return An array of parsed objects.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * @throws Exception If thrown from underlying stream, or if the input contains a syntax error or is malformed.<a name="line.531"></a>
-<span class="sourceLineNo">532</span> */<a name="line.532"></a>
-<span class="sourceLineNo">533</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> throw new UnsupportedOperationException("Parser '"+getClass().getName()+"' does not support this method.");<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span> //--------------------------------------------------------------------------------<a name="line.538"></a>
-<span class="sourceLineNo">539</span> // Other methods<a name="line.539"></a>
-<span class="sourceLineNo">540</span> //--------------------------------------------------------------------------------<a name="line.540"></a>
-<span class="sourceLineNo">541</span><a name="line.541"></a>
-<span class="sourceLineNo">542</span> /**<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * Adds a {@link ParserListener} to this parser to listen for parse events.<a name="line.543"></a>
-<span class="sourceLineNo">544</span> *<a name="line.544"></a>
-<span class="sourceLineNo">545</span> * @param listener The listener to associate with this parser.<a name="line.545"></a>
-<span class="sourceLineNo">546</span> * @return This object (for method chaining).<a name="line.546"></a>
-<span class="sourceLineNo">547</span> */<a name="line.547"></a>
-<span class="sourceLineNo">548</span> public Parser addListener(ParserListener listener) {<a name="line.548"></a>
-<span class="sourceLineNo">549</span> this.listeners.add(listener);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> return this;<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span><a name="line.552"></a>
-<span class="sourceLineNo">553</span> /**<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * Returns the current parser listeners associated with this parser.<a name="line.554"></a>
-<span class="sourceLineNo">555</span> *<a name="line.555"></a>
-<span class="sourceLineNo">556</span> * @return The current list of parser listeners.<a name="line.556"></a>
-<span class="sourceLineNo">557</span> */<a name="line.557"></a>
-<span class="sourceLineNo">558</span> public List<ParserListener> getListeners() {<a name="line.558"></a>
-<span class="sourceLineNo">559</span> return listeners;<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span> /**<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * Converts the specified string to the specified type.<a name="line.563"></a>
-<span class="sourceLineNo">564</span> *<a name="line.564"></a>
-<span class="sourceLineNo">565</span> * @param session The session object.<a name="line.565"></a>
-<span class="sourceLineNo">566</span> * @param outer The outer object if we're converting to an inner object that needs to be created within the context of an outer object.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> * @param s The string to convert.<a name="line.567"></a>
-<span class="sourceLineNo">568</span> * @param type The class type to convert the string to.<a name="line.568"></a>
-<span class="sourceLineNo">569</span> * @return The string converted as an object of the specified type.<a name="line.569"></a>
-<span class="sourceLineNo">570</span> * @throws Exception If the input contains a syntax error or is malformed, or is not valid for the specified type.<a name="line.570"></a>
-<span class="sourceLineNo">571</span> * @param <T> The class type to convert the string to.<a name="line.571"></a>
-<span class="sourceLineNo">572</span> */<a name="line.572"></a>
-<span class="sourceLineNo">573</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.573"></a>
-<span class="sourceLineNo">574</span> protected <T> T convertAttrToType(ParserSession session, Object outer, String s, ClassMeta<T> type) throws Exception {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> if (s == null)<a name="line.575"></a>
-<span class="sourceLineNo">576</span> return null;<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> if (type == null)<a name="line.578"></a>
-<span class="sourceLineNo">579</span> type = (ClassMeta<T>)object();<a name="line.579"></a>
-<span class="sourceLineNo">580</span> PojoSwap transform = type.getPojoSwap();<a name="line.580"></a>
-<span class="sourceLineNo">581</span> ClassMeta<?> sType = type.getSerializedClassMeta();<a name="line.581"></a>
-<span class="sourceLineNo">582</span><a name="line.582"></a>
-<span class="sourceLineNo">583</span> Object o = s;<a name="line.583"></a>
-<span class="sourceLineNo">584</span> if (sType.isChar())<a name="line.584"></a>
-<span class="sourceLineNo">585</span> o = s.charAt(0);<a name="line.585"></a>
-<span class="sourceLineNo">586</span> else if (sType.isNumber())<a name="line.586"></a>
-<span class="sourceLineNo">587</span> if (type.canCreateNewInstanceFromNumber(outer))<a name="line.587"></a>
-<span class="sourceLineNo">588</span> o = type.newInstanceFromNumber(session, outer, parseNumber(s, type.getNewInstanceFromNumberClass()));<a name="line.588"></a>
-<span class="sourceLineNo">589</span> else<a name="line.589"></a>
-<span class="sourceLineNo">590</span> o = parseNumber(s, (Class<? extends Number>)sType.getInnerClass());<a name="line.590"></a>
-<span class="sourceLineNo">591</span> else if (sType.isBoolean())<a name="line.591"></a>
-<span class="sourceLineNo">592</span> o = Boolean.parseBoolean(s);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> else if (! (sType.isCharSequence() || sType.isObject())) {<a name="line.593"></a>
-<span class="sourceLineNo">594</span> if (sType.canCreateNewInstanceFromString(outer))<a name="line.594"></a>
-<span class="sourceLineNo">595</span> o = sType.newInstanceFromString(outer, s);<a name="line.595"></a>
-<span class="sourceLineNo">596</span> else<a name="line.596"></a>
-<span class="sourceLineNo">597</span> throw new ParseException(session, "Invalid conversion from string to class ''{0}''", type);<a name="line.597"></a>
+<span class="sourceLineNo">500</span><a name="line.500"></a>
+<span class="sourceLineNo">501</span> //--------------------------------------------------------------------------------<a name="line.501"></a>
+<span class="sourceLineNo">502</span> // Other methods<a name="line.502"></a>
+<span class="sourceLineNo">503</span> //--------------------------------------------------------------------------------<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span> /**<a name="line.505"></a>
+<span class="sourceLineNo">506</span> * Adds a {@link ParserListener} to this parser to listen for parse events.<a name="line.506"></a>
+<span class="sourceLineNo">507</span> *<a name="line.507"></a>
+<span class="sourceLineNo">508</span> * @param listener The listener to associate with this parser.<a name="line.508"></a>
+<span class="sourceLineNo">509</span> * @return This object (for method chaining).<a name="line.509"></a>
+<span class="sourceLineNo">510</span> */<a name="line.510"></a>
+<span class="sourceLineNo">511</span> public Parser addListener(ParserListener listener) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span> this.listeners.add(listener);<a name="line.512"></a>
+<span class="sourceLineNo">513</span> return this;<a name="line.513"></a>
+<span class="sourceLineNo">514</span> }<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span> /**<a name="line.516"></a>
+<span class="sourceLineNo">517</span> * Returns the current parser listeners associated with this parser.<a name="line.517"></a>
+<span class="sourceLineNo">518</span> *<a name="line.518"></a>
+<span class="sourceLineNo">519</span> * @return The current list of parser listeners.<a name="line.519"></a>
+<span class="sourceLineNo">520</span> */<a name="line.520"></a>
+<span class="sourceLineNo">521</span> public List<ParserListener> getListeners() {<a name="line.521"></a>
+<span class="sourceLineNo">522</span> return listeners;<a name="line.522"></a>
+<span class="sourceLineNo">523</span> }<a name="line.523"></a>
+<span class="sourceLineNo">524</span><a name="line.524"></a>
+<span class="sourceLineNo">525</span> /**<a name="line.525"></a>
+<span class="sourceLineNo">526</span> * Converts the specified string to the specified type.<a name="line.526"></a>
+<span class="sourceLineNo">527</span> *<a name="line.527"></a>
+<span class="sourceLineNo">528</span> * @param session The session object.<a name="line.528"></a>
+<span class="sourceLineNo">529</span> * @param outer The outer object if we're converting to an inner object that needs to be created within the context of an outer object.<a name="line.529"></a>
+<span class="sourceLineNo">530</span> * @param s The string to convert.<a name="line.530"></a>
+<span class="sourceLineNo">531</span> * @param type The class type to convert the string to.<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * @return The string converted as an object of the specified type.<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * @throws Exception If the input contains a syntax error or is malformed, or is not valid for the specified type.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * @param <T> The class type to convert the string to.<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.536"></a>
+<span class="sourceLineNo">537</span> protected <T> T convertAttrToType(ParserSession session, Object outer, String s, ClassMeta<T> type) throws Exception {<a name="line.537"></a>
+<span class="sourceLineNo">538</span> if (s == null)<a name="line.538"></a>
+<span class="sourceLineNo">539</span> return null;<a name="line.539"></a>
+<span class="sourceLineNo">540</span><a name="line.540"></a>
+<span class="sourceLineNo">541</span> if (type == null)<a name="line.541"></a>
+<span class="sourceLineNo">542</span> type = (ClassMeta<T>)object();<a name="line.542"></a>
+<span class="sourceLineNo">543</span> PojoSwap transform = type.getPojoSwap();<a name="line.543"></a>
+<span class="sourceLineNo">544</span> ClassMeta<?> sType = type.getSerializedClassMeta();<a name="line.544"></a>
+<span class="sourceLineNo">545</span><a name="line.545"></a>
+<span class="sourceLineNo">546</span> Object o = s;<a name="line.546"></a>
+<span class="sourceLineNo">547</span> if (sType.isChar())<a name="line.547"></a>
+<span class="sourceLineNo">548</span> o = s.charAt(0);<a name="line.548"></a>
+<span class="sourceLineNo">549</span> else if (sType.isNumber())<a name="line.549"></a>
+<span class="sourceLineNo">550</span> if (type.canCreateNewInstanceFromNumber(outer))<a name="line.550"></a>
+<span class="sourceLineNo">551</span> o = type.newInstanceFromNumber(session, outer, parseNumber(s, type.getNewInstanceFromNumberClass()));<a name="line.551"></a>
+<span class="sourceLineNo">552</span> else<a name="line.552"></a>
+<span class="sourceLineNo">553</span> o = parseNumber(s, (Class<? extends Number>)sType.getInnerClass());<a name="line.553"></a>
+<span class="sourceLineNo">554</span> else if (sType.isBoolean())<a name="line.554"></a>
+<span class="sourceLineNo">555</span> o = Boolean.parseBoolean(s);<a name="line.555"></a>
+<span class="sourceLineNo">556</span> else if (! (sType.isCharSequence() || sType.isObject())) {<a name="line.556"></a>
+<span class="sourceLineNo">557</span> if (sType.canCreateNewInstanceFromString(outer))<a name="line.557"></a>
+<span class="sourceLineNo">558</span> o = sType.newInstanceFromString(outer, s);<a name="line.558"></a>
+<span class="sourceLineNo">559</span> else<a name="line.559"></a>
+<span class="sourceLineNo">560</span> throw new ParseException(session, "Invalid conversion from string to class ''{0}''", type);<a name="line.560"></a>
+<span class="sourceLineNo">561</span> }<a name="line.561"></a>
+<span class="sourceLineNo">562</span><a name="line.562"></a>
+<span class="sourceLineNo">563</span> if (transform != null)<a name="line.563"></a>
+<span class="sourceLineNo">564</span> o = transform.unswap(session, o, type);<a name="line.564"></a>
+<span class="sourceLineNo">565</span><a name="line.565"></a>
+<span class="sourceLineNo">566</span> return (T)o;<a name="line.566"></a>
+<span class="sourceLineNo">567</span> }<a name="line.567"></a>
+<span class="sourceLineNo">568</span><a name="line.568"></a>
+<span class="sourceLineNo">569</span> /**<a name="line.569"></a>
+<span class="sourceLineNo">570</span> * Convenience method for calling the {@link ParentProperty @ParentProperty} method on<a name="line.570"></a>
+<span class="sourceLineNo">571</span> * the specified object if it exists.<a name="line.571"></a>
+<span class="sourceLineNo">572</span> *<a name="line.572"></a>
+<span class="sourceLineNo">573</span> * @param cm The class type of the object.<a name="line.573"></a>
+<span class="sourceLineNo">574</span> * @param o The object.<a name="line.574"></a>
+<span class="sourceLineNo">575</span> * @param parent The parent to set.<a name="line.575"></a>
+<span class="sourceLineNo">576</span> * @throws Exception<a name="line.576"></a>
+<span class="sourceLineNo">577</span> */<a name="line.577"></a>
+<span class="sourceLineNo">578</span> protected void setParent(ClassMeta<?> cm, Object o, Object parent) throws Exception {<a name="line.578"></a>
+<span class="sourceLineNo">579</span> Method m = cm.getParentProperty();<a name="line.579"></a>
+<span class="sourceLineNo">580</span> if (m != null)<a name="line.580"></a>
+<span class="sourceLineNo">581</span> m.invoke(o, parent);<a name="line.581"></a>
+<span class="sourceLineNo">582</span> }<a name="line.582"></a>
+<span class="sourceLineNo">583</span><a name="line.583"></a>
+<span class="sourceLineNo">584</span> /**<a name="line.584"></a>
+<span class="sourceLineNo">585</span> * Convenience method for calling the {@link NameProperty @NameProperty} method on<a name="line.585"></a>
+<span class="sourceLineNo">586</span> * the specified object if it exists.<a name="line.586"></a>
+<span class="sourceLineNo">587</span> *<a name="line.587"></a>
+<span class="sourceLineNo">588</span> * @param cm The class type of the object.<a name="line.588"></a>
+<span class="sourceLineNo">589</span> * @param o The object.<a name="line.589"></a>
+<span class="sourceLineNo">590</span> * @param name The name to set.<a name="line.590"></a>
+<span class="sourceLineNo">591</span> * @throws Exception<a name="line.591"></a>
+<span class="sourceLineNo">592</span> */<a name="line.592"></a>
+<span class="sourceLineNo">593</span> protected void setName(ClassMeta<?> cm, Object o, Object name) throws Exception {<a name="line.593"></a>
+<span class="sourceLineNo">594</span> if (cm != null) {<a name="line.594"></a>
+<span class="sourceLineNo">595</span> Method m = cm.getNameProperty();<a name="line.595"></a>
+<span class="sourceLineNo">596</span> if (m != null)<a name="line.596"></a>
+<span class="sourceLineNo">597</span> m.invoke(o, name);<a name="line.597"></a>
<span class="sourceLineNo">598</span> }<a name="line.598"></a>
-<span class="sourceLineNo">599</span><a name="line.599"></a>
-<span class="sourceLineNo">600</span> if (transform != null)<a name="line.600"></a>
-<span class="sourceLineNo">601</span> o = transform.unswap(session, o, type);<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span> return (T)o;<a name="line.603"></a>
-<span class="sourceLineNo">604</span> }<a name="line.604"></a>
-<span class="sourceLineNo">605</span><a name="line.605"></a>
-<span class="sourceLineNo">606</span> /**<a name="line.606"></a>
-<span class="sourceLineNo">607</span> * Convenience method for calling the {@link ParentProperty @ParentProperty} method on<a name="line.607"></a>
-<span class="sourceLineNo">608</span> * the specified object if it exists.<a name="line.608"></a>
-<span class="sourceLineNo">609</span> *<a name="line.609"></a>
-<span class="sourceLineNo">610</span> * @param cm The class type of the object.<a name="line.610"></a>
-<span class="sourceLineNo">611</span> * @param o The object.<a name="line.611"></a>
-<span class="sourceLineNo">612</span> * @param parent The parent to set.<a name="line.612"></a>
-<span class="sourceLineNo">613</span> * @throws Exception<a name="line.613"></a>
-<span class="sourceLineNo">614</span> */<a name="line.614"></a>
-<span class="sourceLineNo">615</span> protected void setParent(ClassMeta<?> cm, Object o, Object parent) throws Exception {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> Method m = cm.getParentProperty();<a name="line.616"></a>
-<span class="sourceLineNo">617</span> if (m != null)<a name="line.617"></a>
-<span class="sourceLineNo">618</span> m.invoke(o, parent);<a name="line.618"></a>
-<span class="sourceLineNo">619</span> }<a name="line.619"></a>
-<span class="sourceLineNo">620</span><a name="line.620"></a>
-<span class="sourceLineNo">621</span> /**<a name="line.621"></a>
-<span class="sourceLineNo">622</span> * Convenience method for calling the {@link NameProperty @NameProperty} method on<a name="line.622"></a>
-<span class="sourceLineNo">623</span> * the specified object if it exists.<a name="line.623"></a>
-<span class="sourceLineNo">624</span> *<a name="line.624"></a>
-<span class="sourceLineNo">625</span> * @param cm The class type of the object.<a name="line.625"></a>
-<span class="sourceLineNo">626</span> * @param o The object.<a name="line.626"></a>
-<span class="sourceLineNo">627</span> * @param name The name to set.<a name="line.627"></a>
-<span class="sourceLineNo">628</span> * @throws Exception<a name="line.628"></a>
-<span class="sourceLineNo">629</span> */<a name="line.629"></a>
-<span class="sourceLineNo">630</span> protected void setName(ClassMeta<?> cm, Object o, Object name) throws Exception {<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (cm != null) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> Method m = cm.getNameProperty();<a name="line.632"></a>
-<span class="sourceLineNo">633</span> if (m != null)<a name="line.633"></a>
-<span class="sourceLineNo">634</span> m.invoke(o, name);<a name="line.634"></a>
-<span class="sourceLineNo">635</span> }<a name="line.635"></a>
-<span class="sourceLineNo">636</span> }<a name="line.636"></a>
-<span class="sourceLineNo">637</span><a name="line.637"></a>
-<span class="sourceLineNo">638</span> /**<a name="line.638"></a>
-<span class="sourceLineNo">639</span> * Method that gets called when an unknown bean property name is encountered.<a name="line.639"></a>
-<span class="sourceLineNo">640</span> *<a name="line.640"></a>
-<span class="sourceLineNo">641</span> * @param session The parser session.<a name="line.641"></a>
-<span class="sourceLineNo">642</span> * @param propertyName The unknown bean property name.<a name="line.642"></a>
-<span class="sourceLineNo">643</span> * @param beanMap The bean that doesn't have the expected property.<a name="line.643"></a>
-<span class="sourceLineNo">644</span> * @param line The line number where the property was found. <code>-1</code> if line numbers are not available.<a name="line.644"></a>
-<span class="sourceLineNo">645</span> * @param col The column number where the property was found. <code>-1</code> if column numbers are not available.<a name="line.645"></a>
-<span class="sourceLineNo">646</span> * @throws ParseException Automatically thrown if {@link BeanContext#BEAN_ignoreUnknownBeanProperties} setting<a name="line.646"></a>
-<span class="sourceLineNo">647</span> * on this parser is <jk>false</jk><a name="line.647"></a>
-<span class="sourceLineNo">648</span> * @param <T> The class type of the bean map that doesn't have the expected property.<a name="line.648"></a>
-<span class="sourceLineNo">649</span> */<a name="line.649"></a>
-<span class="sourceLineNo">650</span> protected <T> void onUnknownProperty(ParserSession session, String propertyName, BeanMap<T> beanMap, int line, int col) throws ParseException {<a name="line.650"></a>
-<span class="sourceLineNo">651</span> if (propertyName.equals("type") || propertyName.equals(session.getBeanTypePropertyName()))<a name="line.651"></a>
-<span class="sourceLineNo">652</span> return;<a name="line.652"></a>
-<span class="sourceLineNo">653</span> if (! session.isIgnoreUnknownBeanProperties())<a name="line.653"></a>
-<span class="sourceLineNo">654</span> throw new ParseException(session, "Unknown property ''{0}'' encountered while trying to parse into class ''{1}''", propertyName, beanMap.getClassMeta());<a name="line.654"></a>
-<span class="sourceLineNo">655</span> if (listeners.size() > 0)<a name="line.655"></a>
-<span class="sourceLineNo">656</span> for (ParserListener listener : listeners)<a name="line.656"></a>
-<span class="sourceLineNo">657</span> listener.onUnknownProperty(propertyName, beanMap.getClassMeta().getInnerClass(), beanMap.getBean(), line, col);<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span><a name="line.659"></a>
-<span class="sourceLineNo">660</span><a name="line.660"></a>
-<span class="sourceLineNo">661</span> /**<a name="line.661"></a>
-<span class="sourceLineNo">662</span> * Returns the media types handled based on the value of the {@link Consumes} annotation on the parser class.<a name="line.662"></a>
-<span class="sourceLineNo">663</span> * <p><a name="line.663"></a>
-<span class="sourceLineNo">664</span> * This method can be overridden by subclasses to determine the media types programatically.<a name="line.664"></a>
-<span class="sourceLineNo">665</span> *<a name="line.665"></a>
-<span class="sourceLineNo">666</span> * @return The list of media types. Never <jk>null</jk>.<a name="line.666"></a>
-<span class="sourceLineNo">667</span> */<a name="line.667"></a>
-<span class="sourceLineNo">668</span> public MediaType[] getMediaTypes() {<a name="line.668"></a>
-<span class="sourceLineNo">669</span> return mediaTypes;<a name="line.669"></a>
-<span class="sourceLineNo">670</span> }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span> /**<a name="line.672"></a>
-<span class="sourceLineNo">673</span> * Returns the first media type specified on this parser via the {@link Consumes} annotation.<a name="line.673"></a>
-<span class="sourceLineNo">674</span> *<a name="line.674"></a>
-<span class="sourceLineNo">675</span> * @return The media type.<a name="line.675"></a>
-<span class="sourceLineNo">676</span> */<a name="line.676"></a>
-<span class="sourceLineNo">677</span> public MediaType getPrimaryMediaType() {<a name="line.677"></a>
-<span class="sourceLineNo">678</span> return mediaTypes == null || mediaTypes.length == 0 ? null : mediaTypes[0];<a name="line.678"></a>
-<span class="sourceLineNo">679</span> }<a name="line.679"></a>
-<span class="sourceLineNo">680</span>}<a name="line.680"></a>
+<span class="sourceLineNo">599</span> }<a name="line.599"></a>
+<span class="sourceLineNo">600</span><a name="line.600"></a>
+<span class="sourceLineNo">601</span> /**<a name="line.601"></a>
+<span class="sourceLineNo">602</span> * Method that gets called when an unknown bean property name is encountered.<a name="line.602"></a>
+<span class="sourceLineNo">603</span> *<a name="line.603"></a>
+<span class="sourceLineNo">604</span> * @param session The parser session.<a name="line.604"></a>
+<span class="sourceLineNo">605</span> * @param propertyName The unknown bean property name.<a name="line.605"></a>
+<span class="sourceLineNo">606</span> * @param beanMap The bean that doesn't have the expected property.<a name="line.606"></a>
+<span class="sourceLineNo">607</span> * @param line The line number where the property was found. <code>-1</code> if line numbers are not available.<a name="line.607"></a>
+<span class="sourceLineNo">608</span> * @param col The column number where the property was found. <code>-1</code> if column numbers are not available.<a name="line.608"></a>
+<span class="sourceLineNo">609</span> * @throws ParseException Automatically thrown if {@link BeanContext#BEAN_ignoreUnknownBeanProperties} setting<a name="line.609"></a>
+<span class="sourceLineNo">610</span> * on this parser is <jk>false</jk><a name="line.610"></a>
+<span class="sourceLineNo">611</span> * @param <T> The class type of the bean map that doesn't have the expected property.<a name="line.611"></a>
+<span class="sourceLineNo">612</span> */<a name="line.612"></a>
+<span class="sourceLineNo">613</span> protected <T> void onUnknownProperty(ParserSession session, String propertyName, BeanMap<T> beanMap, int line, int col) throws ParseException {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> if (propertyName.equals("type") || propertyName.equals(session.getBeanTypePropertyName()))<a name="line.614"></a>
+<span class="sourceLineNo">615</span> return;<a name="line.615"></a>
+<span class="sourceLineNo">616</span> if (! session.isIgnoreUnknownBeanProperties())<a name="line.616"></a>
+<span class="sourceLineNo">617</span> throw new ParseException(session, "Unknown property ''{0}'' encountered while trying to parse into class ''{1}''", propertyName, beanMap.getClassMeta());<a name="line.617"></a>
+<span class="sourceLineNo">618</span> if (listeners.size() > 0)<a name="line.618"></a>
+<span class="sourceLineNo">619</span> for (ParserListener listener : listeners)<a name="line.619"></a>
+<span class="sourceLineNo">620</span> listener.onUnknownProperty(propertyName, beanMap.getClassMeta().getInnerClass(), beanMap.getBean(), line, col);<a name="line.620"></a>
+<span class="sourceLineNo">621</span> }<a name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span><a name="line.623"></a>
+<span class="sourceLineNo">624</span> /**<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * Returns the media types handled based on the value of the {@link Consumes} annotation on the parser class.<a name="line.625"></a>
+<span class="sourceLineNo">626</span> * <p><a name="line.626"></a>
+<span class="sourceLineNo">627</span> * This method can be overridden by subclasses to determine the media types programatically.<a name="line.627"></a>
+<span class="sourceLineNo">628</span> *<a name="line.628"></a>
+<span class="sourceLineNo">629</span> * @return The list of media types. Never <jk>null</jk>.<a name="line.629"></a>
+<span class="sourceLineNo">630</span> */<a name="line.630"></a>
+<span class="sourceLineNo">631</span> public MediaType[] getMediaTypes() {<a name="line.631"></a>
+<span class="sourceLineNo">632</span> return mediaTypes;<a name="line.632"></a>
+<span class="sourceLineNo">633</span> }<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span> /**<a name="line.635"></a>
+<span class="sourceLineNo">636</span> * Returns the first media type specified on this parser via the {@link Consumes} annotation.<a name="line.636"></a>
+<span class="sourceLineNo">637</span> *<a name="line.637"></a>
+<span class="sourceLineNo">638</span> * @return The media type.<a name="line.638"></a>
+<span class="sourceLineNo">639</span> */<a name="line.639"></a>
+<span class="sourceLineNo">640</span> public MediaType getPrimaryMediaType() {<a name="line.640"></a>
+<span class="sourceLineNo">641</span> return mediaTypes == null || mediaTypes.length == 0 ? null : mediaTypes[0];<a name="line.641"></a>
+<span class="sourceLineNo">642</span> }<a name="line.642"></a>
+<span class="sourceLineNo">643</span>}<a name="line.643"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.Builder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.Builder.html b/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.Builder.html
index 10bb134..8b57c5c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.Builder.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.Builder.html
@@ -75,13 +75,13 @@
<span class="sourceLineNo">067</span> * </ul><a name="line.67"></a>
<span class="sourceLineNo">068</span> * @throws IOException<a name="line.68"></a>
<span class="sourceLineNo">069</span> */<a name="line.69"></a>
-<span class="sourceLineNo">070</span> public ReaderResource(MediaType mediaType, Map<String,Object> headers, VarResolverSession varSession, Object...contents) throws IOException {<a name="line.70"></a>
+<span class="sourceLineNo">070</span> public ReaderResource(MediaType mediaType, Map<String,String> headers, VarResolverSession varSession, Object...contents) throws IOException {<a name="line.70"></a>
<span class="sourceLineNo">071</span> this.mediaType = mediaType;<a name="line.71"></a>
<span class="sourceLineNo">072</span> this.varSession = varSession;<a name="line.72"></a>
<span class="sourceLineNo">073</span><a name="line.73"></a>
<span class="sourceLineNo">074</span> Map<String,String> m = new LinkedHashMap<String,String>();<a name="line.74"></a>
<span class="sourceLineNo">075</span> if (headers != null)<a name="line.75"></a>
-<span class="sourceLineNo">076</span> for (Map.Entry<String,Object> e : headers.entrySet())<a name="line.76"></a>
+<span class="sourceLineNo">076</span> for (Map.Entry<String,String> e : headers.entrySet())<a name="line.76"></a>
<span class="sourceLineNo">077</span> m.put(e.getKey(), StringUtils.toString(e.getValue()));<a name="line.77"></a>
<span class="sourceLineNo">078</span> this.headers = Collections.unmodifiableMap(m);<a name="line.78"></a>
<span class="sourceLineNo">079</span><a name="line.79"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.html b/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.html
index 10bb134..8b57c5c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.html
@@ -75,13 +75,13 @@
<span class="sourceLineNo">067</span> * </ul><a name="line.67"></a>
<span class="sourceLineNo">068</span> * @throws IOException<a name="line.68"></a>
<span class="sourceLineNo">069</span> */<a name="line.69"></a>
-<span class="sourceLineNo">070</span> public ReaderResource(MediaType mediaType, Map<String,Object> headers, VarResolverSession varSession, Object...contents) throws IOException {<a name="line.70"></a>
+<span class="sourceLineNo">070</span> public ReaderResource(MediaType mediaType, Map<String,String> headers, VarResolverSession varSession, Object...contents) throws IOException {<a name="line.70"></a>
<span class="sourceLineNo">071</span> this.mediaType = mediaType;<a name="line.71"></a>
<span class="sourceLineNo">072</span> this.varSession = varSession;<a name="line.72"></a>
<span class="sourceLineNo">073</span><a name="line.73"></a>
<span class="sourceLineNo">074</span> Map<String,String> m = new LinkedHashMap<String,String>();<a name="line.74"></a>
<span class="sourceLineNo">075</span> if (headers != null)<a name="line.75"></a>
-<span class="sourceLineNo">076</span> for (Map.Entry<String,Object> e : headers.entrySet())<a name="line.76"></a>
+<span class="sourceLineNo">076</span> for (Map.Entry<String,String> e : headers.entrySet())<a name="line.76"></a>
<span class="sourceLineNo">077</span> m.put(e.getKey(), StringUtils.toString(e.getValue()));<a name="line.77"></a>
<span class="sourceLineNo">078</span> this.headers = Collections.unmodifiableMap(m);<a name="line.78"></a>
<span class="sourceLineNo">079</span><a name="line.79"></a>
[13/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
index db8eb67..45db5d1 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
@@ -446,164 +446,165 @@
<span class="sourceLineNo">438</span> // --------------------------------------------------------------------------------<a name="line.438"></a>
<span class="sourceLineNo">439</span> // Resolve the config file if the path was specified.<a name="line.439"></a>
<span class="sourceLineNo">440</span> // --------------------------------------------------------------------------------<a name="line.440"></a>
-<span class="sourceLineNo">441</span> if (cfPath != null) <a name="line.441"></a>
-<span class="sourceLineNo">442</span> cf = ConfigMgr.DEFAULT.get(cfPath).getResolving(createVarResolver().build());<a name="line.442"></a>
-<span class="sourceLineNo">443</span> <a name="line.443"></a>
-<span class="sourceLineNo">444</span> // --------------------------------------------------------------------------------<a name="line.444"></a>
-<span class="sourceLineNo">445</span> // Find config file.<a name="line.445"></a>
-<span class="sourceLineNo">446</span> // Can either be passed in as first parameter, or we discover it using<a name="line.446"></a>
-<span class="sourceLineNo">447</span> // the 'sun.java.command' system property.<a name="line.447"></a>
-<span class="sourceLineNo">448</span> // --------------------------------------------------------------------------------<a name="line.448"></a>
-<span class="sourceLineNo">449</span> if (cf == null) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> if (args.hasArg(0))<a name="line.450"></a>
-<span class="sourceLineNo">451</span> cfPath = args.getArg(0);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> else if (mf.containsKey("Main-ConfigFile"))<a name="line.452"></a>
-<span class="sourceLineNo">453</span> cfPath = mf.getString("Main-ConfigFile");<a name="line.453"></a>
-<span class="sourceLineNo">454</span> else {<a name="line.454"></a>
-<span class="sourceLineNo">455</span> String cmd = System.getProperty("sun.java.command", "not_found").split("\\s+")[0];<a name="line.455"></a>
-<span class="sourceLineNo">456</span> if (cmd.endsWith(".jar"))<a name="line.456"></a>
-<span class="sourceLineNo">457</span> cfPath = cmd.replace(".jar", ".cfg");<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> if (cfPath == null) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> System.err.println("Running class ["+getClass().getSimpleName()+"] without a config file.");<a name="line.461"></a>
-<span class="sourceLineNo">462</span> cf = ConfigMgr.DEFAULT.create();<a name="line.462"></a>
-<span class="sourceLineNo">463</span> } else {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> System.out.println("Running class ["+getClass().getSimpleName()+"] using config file ["+cfPath+"]");<a name="line.464"></a>
-<span class="sourceLineNo">465</span> cf = ConfigMgr.DEFAULT.get(cfPath).getResolving(createVarResolver().build());<a name="line.465"></a>
-<span class="sourceLineNo">466</span> }<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (cfPath != null)<a name="line.469"></a>
-<span class="sourceLineNo">470</span> System.setProperty("juneau.configFile", cfPath);<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span> // --------------------------------------------------------------------------------<a name="line.472"></a>
-<span class="sourceLineNo">473</span> // Set system properties.<a name="line.473"></a>
-<span class="sourceLineNo">474</span> // --------------------------------------------------------------------------------<a name="line.474"></a>
-<span class="sourceLineNo">475</span> Set<String> spKeys = cf.getSectionKeys("SystemProperties");<a name="line.475"></a>
-<span class="sourceLineNo">476</span> if (spKeys != null)<a name="line.476"></a>
-<span class="sourceLineNo">477</span> for (String key : spKeys)<a name="line.477"></a>
-<span class="sourceLineNo">478</span> System.setProperty(key, cf.get("SystemProperties", key));<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> // --------------------------------------------------------------------------------<a name="line.480"></a>
-<span class="sourceLineNo">481</span> // Add a config file change listener.<a name="line.481"></a>
-<span class="sourceLineNo">482</span> // --------------------------------------------------------------------------------<a name="line.482"></a>
-<span class="sourceLineNo">483</span> cf.addListener(new ConfigFileListener() {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> @Override /* ConfigFileListener */<a name="line.484"></a>
-<span class="sourceLineNo">485</span> public void onSave(ConfigFile cf) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> onConfigSave(cf);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> }<a name="line.487"></a>
-<span class="sourceLineNo">488</span> @Override /* ConfigFileListener */<a name="line.488"></a>
-<span class="sourceLineNo">489</span> public void onChange(ConfigFile cf, Set<String> changes) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> onConfigChange(cf, changes);<a name="line.490"></a>
-<span class="sourceLineNo">491</span> }<a name="line.491"></a>
-<span class="sourceLineNo">492</span> });<a name="line.492"></a>
-<span class="sourceLineNo">493</span> <a name="line.493"></a>
-<span class="sourceLineNo">494</span> // --------------------------------------------------------------------------------<a name="line.494"></a>
-<span class="sourceLineNo">495</span> // Add exit listeners.<a name="line.495"></a>
-<span class="sourceLineNo">496</span> // --------------------------------------------------------------------------------<a name="line.496"></a>
-<span class="sourceLineNo">497</span> new Thread() {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> @Override /* Thread */<a name="line.498"></a>
-<span class="sourceLineNo">499</span> public void run() {<a name="line.499"></a>
-<span class="sourceLineNo">500</span> Console c = System.console();<a name="line.500"></a>
-<span class="sourceLineNo">501</span> if (c == null)<a name="line.501"></a>
-<span class="sourceLineNo">502</span> System.out.println("No available console.");<a name="line.502"></a>
-<span class="sourceLineNo">503</span> else {<a name="line.503"></a>
-<span class="sourceLineNo">504</span> while (true) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> String l = c.readLine("\nEnter 'exit' to exit.\n");<a name="line.505"></a>
-<span class="sourceLineNo">506</span> if (l == null || l.equals("exit")) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> Microservice.this.stop();<a name="line.507"></a>
-<span class="sourceLineNo">508</span> break;<a name="line.508"></a>
-<span class="sourceLineNo">509</span> }<a name="line.509"></a>
-<span class="sourceLineNo">510</span> }<a name="line.510"></a>
-<span class="sourceLineNo">511</span> }<a name="line.511"></a>
-<span class="sourceLineNo">512</span> }<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }.start();<a name="line.513"></a>
-<span class="sourceLineNo">514</span> Runtime.getRuntime().addShutdownHook(<a name="line.514"></a>
-<span class="sourceLineNo">515</span> new Thread() {<a name="line.515"></a>
-<span class="sourceLineNo">516</span> @Override /* Thread */<a name="line.516"></a>
-<span class="sourceLineNo">517</span> public void run() {<a name="line.517"></a>
-<span class="sourceLineNo">518</span> Microservice.this.stop();<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
-<span class="sourceLineNo">521</span> );<a name="line.521"></a>
-<span class="sourceLineNo">522</span> onStart();<a name="line.522"></a>
-<span class="sourceLineNo">523</span> return this;<a name="line.523"></a>
-<span class="sourceLineNo">524</span> }<a name="line.524"></a>
-<span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span> /**<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * Joins the application with the current thread.<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * <p><a name="line.528"></a>
-<span class="sourceLineNo">529</span> * Default implementation is a no-op.<a name="line.529"></a>
-<span class="sourceLineNo">530</span> *<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * @return This object (for method chaining).<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * @throws Exception<a name="line.532"></a>
-<span class="sourceLineNo">533</span> */<a name="line.533"></a>
-<span class="sourceLineNo">534</span> public Microservice join() throws Exception {<a name="line.534"></a>
-<span class="sourceLineNo">535</span> return this;<a name="line.535"></a>
-<span class="sourceLineNo">536</span> }<a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span> /**<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * Stop this application.<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * <p><a name="line.540"></a>
-<span class="sourceLineNo">541</span> * Default implementation simply calls {@link #onStop()}.<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * <p><a name="line.542"></a>
-<span class="sourceLineNo">543</span> * Overridden methods MUST call this method LAST so that the {@link #onStop()} method is called.<a name="line.543"></a>
-<span class="sourceLineNo">544</span> * <a name="line.544"></a>
-<span class="sourceLineNo">545</span> * @return This object (for method chaining).<a name="line.545"></a>
-<span class="sourceLineNo">546</span> */<a name="line.546"></a>
-<span class="sourceLineNo">547</span> public Microservice stop() {<a name="line.547"></a>
-<span class="sourceLineNo">548</span> onStop();<a name="line.548"></a>
-<span class="sourceLineNo">549</span> return this;<a name="line.549"></a>
-<span class="sourceLineNo">550</span> }<a name="line.550"></a>
-<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span> /**<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * Kill the JVM by calling <code>System.exit(2);</code>.<a name="line.553"></a>
-<span class="sourceLineNo">554</span> */<a name="line.554"></a>
-<span class="sourceLineNo">555</span> public void kill() {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> // This triggers the shutdown hook.<a name="line.556"></a>
-<span class="sourceLineNo">557</span> System.exit(2);<a name="line.557"></a>
-<span class="sourceLineNo">558</span> }<a name="line.558"></a>
-<span class="sourceLineNo">559</span><a name="line.559"></a>
-<span class="sourceLineNo">560</span> <a name="line.560"></a>
-<span class="sourceLineNo">561</span> //--------------------------------------------------------------------------------<a name="line.561"></a>
-<span class="sourceLineNo">562</span> // Lifecycle listener methods.<a name="line.562"></a>
-<span class="sourceLineNo">563</span> // Subclasses can override these methods to run code on certain events.<a name="line.563"></a>
-<span class="sourceLineNo">564</span> //--------------------------------------------------------------------------------<a name="line.564"></a>
-<span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span> /**<a name="line.566"></a>
-<span class="sourceLineNo">567</span> * Called at the beginning of the {@link #start()} call.<a name="line.567"></a>
-<span class="sourceLineNo">568</span> * <p><a name="line.568"></a>
-<span class="sourceLineNo">569</span> * Subclasses can override this method to hook into the lifecycle of this application.<a name="line.569"></a>
-<span class="sourceLineNo">570</span> */<a name="line.570"></a>
-<span class="sourceLineNo">571</span> protected void onStart() {}<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span> /**<a name="line.573"></a>
-<span class="sourceLineNo">574</span> * Called at the end of the {@link #stop()} call.<a name="line.574"></a>
-<span class="sourceLineNo">575</span> * <p><a name="line.575"></a>
-<span class="sourceLineNo">576</span> * Subclasses can override this method to hook into the lifecycle of this application.<a name="line.576"></a>
-<span class="sourceLineNo">577</span> */<a name="line.577"></a>
-<span class="sourceLineNo">578</span> protected void onStop() {}<a name="line.578"></a>
-<span class="sourceLineNo">579</span><a name="line.579"></a>
-<span class="sourceLineNo">580</span> /**<a name="line.580"></a>
-<span class="sourceLineNo">581</span> * Called if the {@link ConfigFile#save()} is called on the config file.<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * <p><a name="line.582"></a>
-<span class="sourceLineNo">583</span> * Subclasses can override this method to listen for config file changes.<a name="line.583"></a>
-<span class="sourceLineNo">584</span> *<a name="line.584"></a>
-<span class="sourceLineNo">585</span> * @param cf The config file.<a name="line.585"></a>
-<span class="sourceLineNo">586</span> */<a name="line.586"></a>
-<span class="sourceLineNo">587</span> protected void onConfigSave(ConfigFile cf) {}<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span> /**<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * Called if one or more changes occur in the config file.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * <p><a name="line.591"></a>
-<span class="sourceLineNo">592</span> * Subclasses can override this method to listen for config file changes.<a name="line.592"></a>
-<span class="sourceLineNo">593</span> *<a name="line.593"></a>
-<span class="sourceLineNo">594</span> * @param cf The config file.<a name="line.594"></a>
-<span class="sourceLineNo">595</span> * @param changes The list of keys in the config file being changed.<a name="line.595"></a>
-<span class="sourceLineNo">596</span> */<a name="line.596"></a>
-<span class="sourceLineNo">597</span> protected void onConfigChange(ConfigFile cf, Set<String> changes) {}<a name="line.597"></a>
-<span class="sourceLineNo">598</span>}<a name="line.598"></a>
+<span class="sourceLineNo">441</span> ConfigFileBuilder cfb = new ConfigFileBuilder();<a name="line.441"></a>
+<span class="sourceLineNo">442</span> if (cfPath != null) <a name="line.442"></a>
+<span class="sourceLineNo">443</span> cf = cfb.build(cfPath).getResolving(createVarResolver().build());<a name="line.443"></a>
+<span class="sourceLineNo">444</span> <a name="line.444"></a>
+<span class="sourceLineNo">445</span> // --------------------------------------------------------------------------------<a name="line.445"></a>
+<span class="sourceLineNo">446</span> // Find config file.<a name="line.446"></a>
+<span class="sourceLineNo">447</span> // Can either be passed in as first parameter, or we discover it using<a name="line.447"></a>
+<span class="sourceLineNo">448</span> // the 'sun.java.command' system property.<a name="line.448"></a>
+<span class="sourceLineNo">449</span> // --------------------------------------------------------------------------------<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (cf == null) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> if (args.hasArg(0))<a name="line.451"></a>
+<span class="sourceLineNo">452</span> cfPath = args.getArg(0);<a name="line.452"></a>
+<span class="sourceLineNo">453</span> else if (mf.containsKey("Main-ConfigFile"))<a name="line.453"></a>
+<span class="sourceLineNo">454</span> cfPath = mf.getString("Main-ConfigFile");<a name="line.454"></a>
+<span class="sourceLineNo">455</span> else {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> String cmd = System.getProperty("sun.java.command", "not_found").split("\\s+")[0];<a name="line.456"></a>
+<span class="sourceLineNo">457</span> if (cmd.endsWith(".jar"))<a name="line.457"></a>
+<span class="sourceLineNo">458</span> cfPath = cmd.replace(".jar", ".cfg");<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span> if (cfPath == null) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span> System.err.println("Running class ["+getClass().getSimpleName()+"] without a config file.");<a name="line.462"></a>
+<span class="sourceLineNo">463</span> cf = cfb.build();<a name="line.463"></a>
+<span class="sourceLineNo">464</span> } else {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> System.out.println("Running class ["+getClass().getSimpleName()+"] using config file ["+cfPath+"]");<a name="line.465"></a>
+<span class="sourceLineNo">466</span> cf = cfb.build(cfPath).getResolving(createVarResolver().build());<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span> }<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span> if (cfPath != null)<a name="line.470"></a>
+<span class="sourceLineNo">471</span> System.setProperty("juneau.configFile", cfPath);<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span> // --------------------------------------------------------------------------------<a name="line.473"></a>
+<span class="sourceLineNo">474</span> // Set system properties.<a name="line.474"></a>
+<span class="sourceLineNo">475</span> // --------------------------------------------------------------------------------<a name="line.475"></a>
+<span class="sourceLineNo">476</span> Set<String> spKeys = cf.getSectionKeys("SystemProperties");<a name="line.476"></a>
+<span class="sourceLineNo">477</span> if (spKeys != null)<a name="line.477"></a>
+<span class="sourceLineNo">478</span> for (String key : spKeys)<a name="line.478"></a>
+<span class="sourceLineNo">479</span> System.setProperty(key, cf.get("SystemProperties", key));<a name="line.479"></a>
+<span class="sourceLineNo">480</span><a name="line.480"></a>
+<span class="sourceLineNo">481</span> // --------------------------------------------------------------------------------<a name="line.481"></a>
+<span class="sourceLineNo">482</span> // Add a config file change listener.<a name="line.482"></a>
+<span class="sourceLineNo">483</span> // --------------------------------------------------------------------------------<a name="line.483"></a>
+<span class="sourceLineNo">484</span> cf.addListener(new ConfigFileListener() {<a name="line.484"></a>
+<span class="sourceLineNo">485</span> @Override /* ConfigFileListener */<a name="line.485"></a>
+<span class="sourceLineNo">486</span> public void onSave(ConfigFile cf) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> onConfigSave(cf);<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> @Override /* ConfigFileListener */<a name="line.489"></a>
+<span class="sourceLineNo">490</span> public void onChange(ConfigFile cf, Set<String> changes) {<a name="line.490"></a>
+<span class="sourceLineNo">491</span> onConfigChange(cf, changes);<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span> });<a name="line.493"></a>
+<span class="sourceLineNo">494</span> <a name="line.494"></a>
+<span class="sourceLineNo">495</span> // --------------------------------------------------------------------------------<a name="line.495"></a>
+<span class="sourceLineNo">496</span> // Add exit listeners.<a name="line.496"></a>
+<span class="sourceLineNo">497</span> // --------------------------------------------------------------------------------<a name="line.497"></a>
+<span class="sourceLineNo">498</span> new Thread() {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> @Override /* Thread */<a name="line.499"></a>
+<span class="sourceLineNo">500</span> public void run() {<a name="line.500"></a>
+<span class="sourceLineNo">501</span> Console c = System.console();<a name="line.501"></a>
+<span class="sourceLineNo">502</span> if (c == null)<a name="line.502"></a>
+<span class="sourceLineNo">503</span> System.out.println("No available console.");<a name="line.503"></a>
+<span class="sourceLineNo">504</span> else {<a name="line.504"></a>
+<span class="sourceLineNo">505</span> while (true) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> String l = c.readLine("\nEnter 'exit' to exit.\n");<a name="line.506"></a>
+<span class="sourceLineNo">507</span> if (l == null || l.equals("exit")) {<a name="line.507"></a>
+<span class="sourceLineNo">508</span> Microservice.this.stop();<a name="line.508"></a>
+<span class="sourceLineNo">509</span> break;<a name="line.509"></a>
+<span class="sourceLineNo">510</span> }<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span> }<a name="line.512"></a>
+<span class="sourceLineNo">513</span> }<a name="line.513"></a>
+<span class="sourceLineNo">514</span> }.start();<a name="line.514"></a>
+<span class="sourceLineNo">515</span> Runtime.getRuntime().addShutdownHook(<a name="line.515"></a>
+<span class="sourceLineNo">516</span> new Thread() {<a name="line.516"></a>
+<span class="sourceLineNo">517</span> @Override /* Thread */<a name="line.517"></a>
+<span class="sourceLineNo">518</span> public void run() {<a name="line.518"></a>
+<span class="sourceLineNo">519</span> Microservice.this.stop();<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> }<a name="line.521"></a>
+<span class="sourceLineNo">522</span> );<a name="line.522"></a>
+<span class="sourceLineNo">523</span> onStart();<a name="line.523"></a>
+<span class="sourceLineNo">524</span> return this;<a name="line.524"></a>
+<span class="sourceLineNo">525</span> }<a name="line.525"></a>
+<span class="sourceLineNo">526</span><a name="line.526"></a>
+<span class="sourceLineNo">527</span> /**<a name="line.527"></a>
+<span class="sourceLineNo">528</span> * Joins the application with the current thread.<a name="line.528"></a>
+<span class="sourceLineNo">529</span> * <p><a name="line.529"></a>
+<span class="sourceLineNo">530</span> * Default implementation is a no-op.<a name="line.530"></a>
+<span class="sourceLineNo">531</span> *<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * @return This object (for method chaining).<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * @throws Exception<a name="line.533"></a>
+<span class="sourceLineNo">534</span> */<a name="line.534"></a>
+<span class="sourceLineNo">535</span> public Microservice join() throws Exception {<a name="line.535"></a>
+<span class="sourceLineNo">536</span> return this;<a name="line.536"></a>
+<span class="sourceLineNo">537</span> }<a name="line.537"></a>
+<span class="sourceLineNo">538</span><a name="line.538"></a>
+<span class="sourceLineNo">539</span> /**<a name="line.539"></a>
+<span class="sourceLineNo">540</span> * Stop this application.<a name="line.540"></a>
+<span class="sourceLineNo">541</span> * <p><a name="line.541"></a>
+<span class="sourceLineNo">542</span> * Default implementation simply calls {@link #onStop()}.<a name="line.542"></a>
+<span class="sourceLineNo">543</span> * <p><a name="line.543"></a>
+<span class="sourceLineNo">544</span> * Overridden methods MUST call this method LAST so that the {@link #onStop()} method is called.<a name="line.544"></a>
+<span class="sourceLineNo">545</span> * <a name="line.545"></a>
+<span class="sourceLineNo">546</span> * @return This object (for method chaining).<a name="line.546"></a>
+<span class="sourceLineNo">547</span> */<a name="line.547"></a>
+<span class="sourceLineNo">548</span> public Microservice stop() {<a name="line.548"></a>
+<span class="sourceLineNo">549</span> onStop();<a name="line.549"></a>
+<span class="sourceLineNo">550</span> return this;<a name="line.550"></a>
+<span class="sourceLineNo">551</span> }<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span> /**<a name="line.553"></a>
+<span class="sourceLineNo">554</span> * Kill the JVM by calling <code>System.exit(2);</code>.<a name="line.554"></a>
+<span class="sourceLineNo">555</span> */<a name="line.555"></a>
+<span class="sourceLineNo">556</span> public void kill() {<a name="line.556"></a>
+<span class="sourceLineNo">557</span> // This triggers the shutdown hook.<a name="line.557"></a>
+<span class="sourceLineNo">558</span> System.exit(2);<a name="line.558"></a>
+<span class="sourceLineNo">559</span> }<a name="line.559"></a>
+<span class="sourceLineNo">560</span><a name="line.560"></a>
+<span class="sourceLineNo">561</span> <a name="line.561"></a>
+<span class="sourceLineNo">562</span> //--------------------------------------------------------------------------------<a name="line.562"></a>
+<span class="sourceLineNo">563</span> // Lifecycle listener methods.<a name="line.563"></a>
+<span class="sourceLineNo">564</span> // Subclasses can override these methods to run code on certain events.<a name="line.564"></a>
+<span class="sourceLineNo">565</span> //--------------------------------------------------------------------------------<a name="line.565"></a>
+<span class="sourceLineNo">566</span><a name="line.566"></a>
+<span class="sourceLineNo">567</span> /**<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * Called at the beginning of the {@link #start()} call.<a name="line.568"></a>
+<span class="sourceLineNo">569</span> * <p><a name="line.569"></a>
+<span class="sourceLineNo">570</span> * Subclasses can override this method to hook into the lifecycle of this application.<a name="line.570"></a>
+<span class="sourceLineNo">571</span> */<a name="line.571"></a>
+<span class="sourceLineNo">572</span> protected void onStart() {}<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span> /**<a name="line.574"></a>
+<span class="sourceLineNo">575</span> * Called at the end of the {@link #stop()} call.<a name="line.575"></a>
+<span class="sourceLineNo">576</span> * <p><a name="line.576"></a>
+<span class="sourceLineNo">577</span> * Subclasses can override this method to hook into the lifecycle of this application.<a name="line.577"></a>
+<span class="sourceLineNo">578</span> */<a name="line.578"></a>
+<span class="sourceLineNo">579</span> protected void onStop() {}<a name="line.579"></a>
+<span class="sourceLineNo">580</span><a name="line.580"></a>
+<span class="sourceLineNo">581</span> /**<a name="line.581"></a>
+<span class="sourceLineNo">582</span> * Called if the {@link ConfigFile#save()} is called on the config file.<a name="line.582"></a>
+<span class="sourceLineNo">583</span> * <p><a name="line.583"></a>
+<span class="sourceLineNo">584</span> * Subclasses can override this method to listen for config file changes.<a name="line.584"></a>
+<span class="sourceLineNo">585</span> *<a name="line.585"></a>
+<span class="sourceLineNo">586</span> * @param cf The config file.<a name="line.586"></a>
+<span class="sourceLineNo">587</span> */<a name="line.587"></a>
+<span class="sourceLineNo">588</span> protected void onConfigSave(ConfigFile cf) {}<a name="line.588"></a>
+<span class="sourceLineNo">589</span><a name="line.589"></a>
+<span class="sourceLineNo">590</span> /**<a name="line.590"></a>
+<span class="sourceLineNo">591</span> * Called if one or more changes occur in the config file.<a name="line.591"></a>
+<span class="sourceLineNo">592</span> * <p><a name="line.592"></a>
+<span class="sourceLineNo">593</span> * Subclasses can override this method to listen for config file changes.<a name="line.593"></a>
+<span class="sourceLineNo">594</span> *<a name="line.594"></a>
+<span class="sourceLineNo">595</span> * @param cf The config file.<a name="line.595"></a>
+<span class="sourceLineNo">596</span> * @param changes The list of keys in the config file being changed.<a name="line.596"></a>
+<span class="sourceLineNo">597</span> */<a name="line.597"></a>
+<span class="sourceLineNo">598</span> protected void onConfigChange(ConfigFile cf, Set<String> changes) {}<a name="line.598"></a>
+<span class="sourceLineNo">599</span>}<a name="line.599"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html
index c420d64..a99a709 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html
@@ -48,7 +48,7 @@
<span class="sourceLineNo">040</span>@SuppressWarnings("serial")<a name="line.40"></a>
<span class="sourceLineNo">041</span>@RestResource(<a name="line.41"></a>
<span class="sourceLineNo">042</span> properties={<a name="line.42"></a>
-<span class="sourceLineNo">043</span> @Property(name=HTMLDOC_links, value="{up:'$R{requestParentURI}',options:'$R{servletURI}?method=OPTIONS'}")<a name="line.43"></a>
+<span class="sourceLineNo">043</span> @Property(name=HTMLDOC_links, value="{up:'$R{requestParentURI}',options:'?method=OPTIONS'}")<a name="line.43"></a>
<span class="sourceLineNo">044</span> },<a name="line.44"></a>
<span class="sourceLineNo">045</span> config="$S{juneau.configFile}",<a name="line.45"></a>
<span class="sourceLineNo">046</span> stylesheet="$C{REST/stylesheet,styles/juneau.css}"<a name="line.46"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html
index 06eb979..614cadb 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html
@@ -20,51 +20,47 @@
<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
<span class="sourceLineNo">013</span>package org.apache.juneau.microservice;<a name="line.13"></a>
<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static org.apache.juneau.html.HtmlDocSerializerContext.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.rest.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.rest.annotation.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.svl.vars.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * Superclass for all REST resource groups.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * <p><a name="line.23"></a>
-<span class="sourceLineNo">024</span> * In additional to the functionality of the {@link RestServletGroupDefault} group,<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * augments the {@link RestContext#getVarResolver()} method with the following additional variable types:<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <ul class='spaced-list'><a name="line.26"></a>
-<span class="sourceLineNo">027</span> * <li><jk>$ARG{...}</jk> - Command line arguments.<br><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * Resolves values from {@link Microservice#getArgs()}.<br><a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <h6>Example:</h6><a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <p class='bcode'><a name="line.30"></a>
-<span class="sourceLineNo">031</span> * String firstArg = request.getVarResolver().resolve(<js>"$ARG{0}"</js>); <jc>// First argument.</jc><a name="line.31"></a>
-<span class="sourceLineNo">032</span> * String namedArg = request.getVarResolver().resolve(<js>"$ARG{myarg}"</js>); <jc>// Named argument (e.g. "myarg=foo"). </jc><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * </p><a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <li><jk>$MF{...}</jk> - Manifest file entries.<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <h6>Example:</h6><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <p class='bcode'><a name="line.36"></a>
-<span class="sourceLineNo">037</span> * String mainClass = request.getVarResolver().resolve(<js>"$MF{Main-Class}"</js>); <jc>// Main class. </jc><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * </p><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * </ul><a name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>@SuppressWarnings("serial")<a name="line.41"></a>
-<span class="sourceLineNo">042</span>@RestResource(<a name="line.42"></a>
-<span class="sourceLineNo">043</span> properties={<a name="line.43"></a>
-<span class="sourceLineNo">044</span> @Property(name=HTMLDOC_links, value="{up:'$R{requestParentURI}',options:'$R{servletURI}?method=OPTIONS'}"),<a name="line.44"></a>
-<span class="sourceLineNo">045</span> },<a name="line.45"></a>
-<span class="sourceLineNo">046</span> config="$S{juneau.configFile}",<a name="line.46"></a>
-<span class="sourceLineNo">047</span> stylesheet="$C{REST/stylesheet,styles/juneau.css}"<a name="line.47"></a>
-<span class="sourceLineNo">048</span>)<a name="line.48"></a>
-<span class="sourceLineNo">049</span>public abstract class ResourceGroup extends RestServletGroupDefault {<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span> @Override /* RestServlet */<a name="line.51"></a>
-<span class="sourceLineNo">052</span> public synchronized void init(RestConfig config) throws Exception {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> config<a name="line.53"></a>
-<span class="sourceLineNo">054</span> .addVars(ArgsVar.class, ManifestFileVar.class)<a name="line.54"></a>
-<span class="sourceLineNo">055</span> .addVarContextObject(ArgsVar.SESSION_args, Microservice.getArgs())<a name="line.55"></a>
-<span class="sourceLineNo">056</span> .addVarContextObject(ManifestFileVar.SESSION_manifest, Microservice.getManifest());<a name="line.56"></a>
-<span class="sourceLineNo">057</span> super.init(config);<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">015</span>import org.apache.juneau.rest.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import org.apache.juneau.rest.annotation.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span>import org.apache.juneau.svl.vars.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span><a name="line.18"></a>
+<span class="sourceLineNo">019</span>/**<a name="line.19"></a>
+<span class="sourceLineNo">020</span> * Superclass for all REST resource groups.<a name="line.20"></a>
+<span class="sourceLineNo">021</span> * <p><a name="line.21"></a>
+<span class="sourceLineNo">022</span> * In additional to the functionality of the {@link RestServletGroupDefault} group,<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * augments the {@link RestContext#getVarResolver()} method with the following additional variable types:<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * <ul class='spaced-list'><a name="line.24"></a>
+<span class="sourceLineNo">025</span> * <li><jk>$ARG{...}</jk> - Command line arguments.<br><a name="line.25"></a>
+<span class="sourceLineNo">026</span> * Resolves values from {@link Microservice#getArgs()}.<br><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * <h6>Example:</h6><a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <p class='bcode'><a name="line.28"></a>
+<span class="sourceLineNo">029</span> * String firstArg = request.getVarResolver().resolve(<js>"$ARG{0}"</js>); <jc>// First argument.</jc><a name="line.29"></a>
+<span class="sourceLineNo">030</span> * String namedArg = request.getVarResolver().resolve(<js>"$ARG{myarg}"</js>); <jc>// Named argument (e.g. "myarg=foo"). </jc><a name="line.30"></a>
+<span class="sourceLineNo">031</span> * </p><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <li><jk>$MF{...}</jk> - Manifest file entries.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <h6>Example:</h6><a name="line.33"></a>
+<span class="sourceLineNo">034</span> * <p class='bcode'><a name="line.34"></a>
+<span class="sourceLineNo">035</span> * String mainClass = request.getVarResolver().resolve(<js>"$MF{Main-Class}"</js>); <jc>// Main class. </jc><a name="line.35"></a>
+<span class="sourceLineNo">036</span> * </p><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * </ul><a name="line.37"></a>
+<span class="sourceLineNo">038</span> */<a name="line.38"></a>
+<span class="sourceLineNo">039</span>@SuppressWarnings("serial")<a name="line.39"></a>
+<span class="sourceLineNo">040</span>@RestResource(<a name="line.40"></a>
+<span class="sourceLineNo">041</span> pageLinks="{up:'$R{requestParentURI}',options:'?method=OPTIONS'}",<a name="line.41"></a>
+<span class="sourceLineNo">042</span> config="$S{juneau.configFile}",<a name="line.42"></a>
+<span class="sourceLineNo">043</span> stylesheet="$C{REST/stylesheet,styles/juneau.css}"<a name="line.43"></a>
+<span class="sourceLineNo">044</span>)<a name="line.44"></a>
+<span class="sourceLineNo">045</span>public abstract class ResourceGroup extends RestServletGroupDefault {<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span> @Override /* RestServlet */<a name="line.47"></a>
+<span class="sourceLineNo">048</span> public synchronized void init(RestConfig config) throws Exception {<a name="line.48"></a>
+<span class="sourceLineNo">049</span> config<a name="line.49"></a>
+<span class="sourceLineNo">050</span> .addVars(ArgsVar.class, ManifestFileVar.class)<a name="line.50"></a>
+<span class="sourceLineNo">051</span> .addVarContextObject(ArgsVar.SESSION_args, Microservice.getArgs())<a name="line.51"></a>
+<span class="sourceLineNo">052</span> .addVarContextObject(ManifestFileVar.SESSION_manifest, Microservice.getManifest());<a name="line.52"></a>
+<span class="sourceLineNo">053</span> super.init(config);<a name="line.53"></a>
+<span class="sourceLineNo">054</span> }<a name="line.54"></a>
+<span class="sourceLineNo">055</span>}<a name="line.55"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
index 1f24a0c..e9e1a3d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
@@ -20,23 +20,19 @@
<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
<span class="sourceLineNo">013</span>package org.apache.juneau.microservice;<a name="line.13"></a>
<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static org.apache.juneau.html.HtmlDocSerializerContext.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.rest.annotation.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.rest.jena.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>/**<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * Superclass for all REST resources with RDF support.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> */<a name="line.22"></a>
-<span class="sourceLineNo">023</span>@SuppressWarnings("serial")<a name="line.23"></a>
-<span class="sourceLineNo">024</span>@RestResource(<a name="line.24"></a>
-<span class="sourceLineNo">025</span> properties={<a name="line.25"></a>
-<span class="sourceLineNo">026</span> @Property(name=HTMLDOC_links, value="{up:'$R{requestParentURI}',options:'$R{servletURI}?method=OPTIONS'}")<a name="line.26"></a>
-<span class="sourceLineNo">027</span> },<a name="line.27"></a>
-<span class="sourceLineNo">028</span> config="$S{juneau.configFile}",<a name="line.28"></a>
-<span class="sourceLineNo">029</span> stylesheet="$C{REST/stylesheet,styles/juneau.css}"<a name="line.29"></a>
-<span class="sourceLineNo">030</span>)<a name="line.30"></a>
-<span class="sourceLineNo">031</span>public abstract class ResourceJena extends RestServletJenaDefault {}<a name="line.31"></a>
+<span class="sourceLineNo">015</span>import org.apache.juneau.rest.annotation.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import org.apache.juneau.rest.jena.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span><a name="line.17"></a>
+<span class="sourceLineNo">018</span>/**<a name="line.18"></a>
+<span class="sourceLineNo">019</span> * Superclass for all REST resources with RDF support.<a name="line.19"></a>
+<span class="sourceLineNo">020</span> */<a name="line.20"></a>
+<span class="sourceLineNo">021</span>@SuppressWarnings("serial")<a name="line.21"></a>
+<span class="sourceLineNo">022</span>@RestResource(<a name="line.22"></a>
+<span class="sourceLineNo">023</span> pageLinks="{up:'$R{requestParentURI}',options:'?method=OPTIONS'}",<a name="line.23"></a>
+<span class="sourceLineNo">024</span> config="$S{juneau.configFile}",<a name="line.24"></a>
+<span class="sourceLineNo">025</span> stylesheet="$C{REST/stylesheet,styles/juneau.css}"<a name="line.25"></a>
+<span class="sourceLineNo">026</span>)<a name="line.26"></a>
+<span class="sourceLineNo">027</span>public abstract class ResourceJena extends RestServletJenaDefault {}<a name="line.27"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/ConfigResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/ConfigResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/ConfigResource.html
index d96065a..5e035ed 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/ConfigResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/ConfigResource.html
@@ -22,187 +22,184 @@
<span class="sourceLineNo">014</span><a name="line.14"></a>
<span class="sourceLineNo">015</span>import static javax.servlet.http.HttpServletResponse.*;<a name="line.15"></a>
<span class="sourceLineNo">016</span>import static org.apache.juneau.dto.html5.HtmlBuilder.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span>import static org.apache.juneau.html.HtmlDocSerializerContext.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span><a name="line.18"></a>
-<span class="sourceLineNo">019</span>import java.io.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.Map;<a name="line.20"></a>
-<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.dto.html5.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.ini.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.microservice.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.rest.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.rest.annotation.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.rest.annotation.Body;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Shows contents of the microservice configuration file.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> */<a name="line.32"></a>
-<span class="sourceLineNo">033</span>@RestResource(<a name="line.33"></a>
-<span class="sourceLineNo">034</span> path="/config",<a name="line.34"></a>
-<span class="sourceLineNo">035</span> title="Configuration",<a name="line.35"></a>
-<span class="sourceLineNo">036</span> description="Contents of configuration file.",<a name="line.36"></a>
-<span class="sourceLineNo">037</span> properties={<a name="line.37"></a>
-<span class="sourceLineNo">038</span> @Property(name=HTMLDOC_links, value="{up:'$R{requestParentURI}',options:'$R{servletURI}?method=OPTIONS',edit:'$R{servletURI}/edit'}"),<a name="line.38"></a>
-<span class="sourceLineNo">039</span> }<a name="line.39"></a>
-<span class="sourceLineNo">040</span>)<a name="line.40"></a>
-<span class="sourceLineNo">041</span>public class ConfigResource extends Resource {<a name="line.41"></a>
-<span class="sourceLineNo">042</span> private static final long serialVersionUID = 1L;<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span> /**<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * [GET /] - Show contents of config file.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> *<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * @return The config file.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * @throws Exception<a name="line.48"></a>
-<span class="sourceLineNo">049</span> */<a name="line.49"></a>
-<span class="sourceLineNo">050</span> @RestMethod(name="GET", path="/", description="Show contents of config file.")<a name="line.50"></a>
-<span class="sourceLineNo">051</span> public ConfigFile getConfigContents() throws Exception {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> return getServletConfig().getConfigFile();<a name="line.52"></a>
-<span class="sourceLineNo">053</span> }<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * [GET /edit] - Show config file edit page.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> *<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * @param req The HTTP request.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * @return The config file as a reader resource.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * @throws Exception<a name="line.60"></a>
-<span class="sourceLineNo">061</span> */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> @RestMethod(name="GET", path="/edit", description="Edit config file.")<a name="line.62"></a>
-<span class="sourceLineNo">063</span> public Form getConfigEditForm(RestRequest req) throws Exception {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> return form().id("form").action(req.getServletURI()).method("POST").enctype("application/x-www-form-urlencoded").children(<a name="line.64"></a>
-<span class="sourceLineNo">065</span> div()._class("data").children(<a name="line.65"></a>
-<span class="sourceLineNo">066</span> table(<a name="line.66"></a>
-<span class="sourceLineNo">067</span> tr(td().style("text-align:right").children(button("submit","Submit"),button("reset","Reset"))),<a name="line.67"></a>
-<span class="sourceLineNo">068</span> tr(th().child("Contents")),<a name="line.68"></a>
-<span class="sourceLineNo">069</span> tr(th().child(<a name="line.69"></a>
-<span class="sourceLineNo">070</span> textarea().name("contents").rows(40).cols(120).style("white-space:pre;word-wrap:normal;overflow-x:scroll;font-family:monospace;")<a name="line.70"></a>
-<span class="sourceLineNo">071</span> .text(getConfigContents().toString()))<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> )<a name="line.74"></a>
-<span class="sourceLineNo">075</span> );<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> /**<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * [GET /{section}] - Show config file section.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> *<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * @param section The section name.<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * @return The config file section.<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * @throws Exception<a name="line.83"></a>
-<span class="sourceLineNo">084</span> */<a name="line.84"></a>
-<span class="sourceLineNo">085</span> @RestMethod(name="GET", path="/{section}",<a name="line.85"></a>
-<span class="sourceLineNo">086</span> description="Show config file section.",<a name="line.86"></a>
-<span class="sourceLineNo">087</span> parameters={<a name="line.87"></a>
-<span class="sourceLineNo">088</span> @Parameter(in="path", name="section", description="Section name.")<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span> )<a name="line.90"></a>
-<span class="sourceLineNo">091</span> public ObjectMap getConfigSection(@Path("section") String section) throws Exception {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> return getSection(section);<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> * [GET /{section}/{key}] - Show config file entry.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> *<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * @param section The section name.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * @param key The section key.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @return The value of the config file entry.<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * @throws Exception<a name="line.101"></a>
-<span class="sourceLineNo">102</span> */<a name="line.102"></a>
-<span class="sourceLineNo">103</span> @RestMethod(name="GET", path="/{section}/{key}",<a name="line.103"></a>
-<span class="sourceLineNo">104</span> description="Show config file entry.",<a name="line.104"></a>
-<span class="sourceLineNo">105</span> parameters={<a name="line.105"></a>
-<span class="sourceLineNo">106</span> @Parameter(in="path", name="section", description="Section name."),<a name="line.106"></a>
-<span class="sourceLineNo">107</span> @Parameter(in="path", name="key", description="Entry name.")<a name="line.107"></a>
-<span class="sourceLineNo">108</span> }<a name="line.108"></a>
-<span class="sourceLineNo">109</span> )<a name="line.109"></a>
-<span class="sourceLineNo">110</span> public String getConfigEntry(@Path("section") String section, @Path("key") String key) throws Exception {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> return getSection(section).getString(key);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * [POST /] - Sets contents of config file from a FORM post.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> *<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * @param contents The new contents of the config file.<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * @return The new config file contents.<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * @throws Exception<a name="line.119"></a>
-<span class="sourceLineNo">120</span> */<a name="line.120"></a>
-<span class="sourceLineNo">121</span> @RestMethod(name="POST", path="/",<a name="line.121"></a>
-<span class="sourceLineNo">122</span> description="Sets contents of config file from a FORM post.",<a name="line.122"></a>
-<span class="sourceLineNo">123</span> parameters={<a name="line.123"></a>
-<span class="sourceLineNo">124</span> @Parameter(in="formData", name="contents", description="New contents in INI file format.")<a name="line.124"></a>
-<span class="sourceLineNo">125</span> }<a name="line.125"></a>
-<span class="sourceLineNo">126</span> )<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public ConfigFile setConfigContentsFormPost(@FormData("contents") String contents) throws Exception {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> return setConfigContents(new StringReader(contents));<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> /**<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * [PUT /] - Sets contents of config file.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> *<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * @param contents The new contents of the config file.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * @return The new config file contents.<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * @throws Exception<a name="line.136"></a>
-<span class="sourceLineNo">137</span> */<a name="line.137"></a>
-<span class="sourceLineNo">138</span> @RestMethod(name="PUT", path="/",<a name="line.138"></a>
-<span class="sourceLineNo">139</span> description="Sets contents of config file.",<a name="line.139"></a>
-<span class="sourceLineNo">140</span> parameters={<a name="line.140"></a>
-<span class="sourceLineNo">141</span> @Parameter(in="body", description="New contents in INI file format.")<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> public ConfigFile setConfigContents(@Body Reader contents) throws Exception {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> ConfigFile cf2 = ConfigMgr.DEFAULT.create().load(contents);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> return getConfigContents().merge(cf2).save();<a name="line.146"></a>
-<span class="sourceLineNo">147</span> }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span> /**<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * [PUT /{section}] - Add or overwrite a config file section.<a name="line.150"></a>
-<span class="sourceLineNo">151</span> *<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @param section The section name.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * @param contents The new contents of the config file section.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @return The new section.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @throws Exception<a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> @RestMethod(name="PUT", path="/{section}",<a name="line.157"></a>
-<span class="sourceLineNo">158</span> description="Add or overwrite a config file section.",<a name="line.158"></a>
-<span class="sourceLineNo">159</span> parameters={<a name="line.159"></a>
-<span class="sourceLineNo">160</span> @Parameter(in="path", name="section", description="Section name."),<a name="line.160"></a>
-<span class="sourceLineNo">161</span> @Parameter(in="body", description="New contents for section as a simple map with string keys and values.")<a name="line.161"></a>
-<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span> )<a name="line.163"></a>
-<span class="sourceLineNo">164</span> public ObjectMap setConfigSection(@Path("section") String section, @Body Map<String,String> contents) throws Exception {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> getConfigContents().setSection(section, contents);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return getSection(section);<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> /**<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * [PUT /{section}/{key}] - Add or overwrite a config file entry.<a name="line.170"></a>
-<span class="sourceLineNo">171</span> *<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * @param section The section name.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * @param key The section key.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * @param value The new value.<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * @return The new value.<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * @throws Exception<a name="line.176"></a>
-<span class="sourceLineNo">177</span> */<a name="line.177"></a>
-<span class="sourceLineNo">178</span> @RestMethod(name="PUT", path="/{section}/{key}",<a name="line.178"></a>
-<span class="sourceLineNo">179</span> description="Add or overwrite a config file entry.",<a name="line.179"></a>
-<span class="sourceLineNo">180</span> parameters={<a name="line.180"></a>
-<span class="sourceLineNo">181</span> @Parameter(in="path", name="section", description="Section name."),<a name="line.181"></a>
-<span class="sourceLineNo">182</span> @Parameter(in="path", name="key", description="Entry name."),<a name="line.182"></a>
-<span class="sourceLineNo">183</span> @Parameter(in="body", description="New value as a string.")<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> )<a name="line.185"></a>
-<span class="sourceLineNo">186</span> public String setConfigSection(@Path("section") String section, @Path("key") String key, @Body String value) throws Exception {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> getConfigContents().put(section, key, value, false);<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return getSection(section).getString(key);<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span> private ObjectMap getSection(String name) throws Exception {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> ObjectMap m = getConfigContents().getSectionMap(name);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> if (m == null)<a name="line.193"></a>
-<span class="sourceLineNo">194</span> throw new RestException(SC_NOT_FOUND, "Section not found.");<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return m;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>}<a name="line.197"></a>
+<span class="sourceLineNo">017</span><a name="line.17"></a>
+<span class="sourceLineNo">018</span>import java.io.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span>import java.util.Map;<a name="line.19"></a>
+<span class="sourceLineNo">020</span><a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.dto.html5.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.juneau.ini.*;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.juneau.microservice.*;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.juneau.rest.*;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.juneau.rest.annotation.*;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.juneau.rest.annotation.Body;<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> * Shows contents of the microservice configuration file.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> */<a name="line.31"></a>
+<span class="sourceLineNo">032</span>@RestResource(<a name="line.32"></a>
+<span class="sourceLineNo">033</span> path="/config",<a name="line.33"></a>
+<span class="sourceLineNo">034</span> title="Configuration",<a name="line.34"></a>
+<span class="sourceLineNo">035</span> description="Contents of configuration file.",<a name="line.35"></a>
+<span class="sourceLineNo">036</span> pageLinks="{up:'$R{requestParentURI}',options:'?method=OPTIONS',edit:'edit'}"<a name="line.36"></a>
+<span class="sourceLineNo">037</span>)<a name="line.37"></a>
+<span class="sourceLineNo">038</span>public class ConfigResource extends Resource {<a name="line.38"></a>
+<span class="sourceLineNo">039</span> private static final long serialVersionUID = 1L;<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span> /**<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * [GET /] - Show contents of config file.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> *<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * @return The config file.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * @throws Exception<a name="line.45"></a>
+<span class="sourceLineNo">046</span> */<a name="line.46"></a>
+<span class="sourceLineNo">047</span> @RestMethod(name="GET", path="/", description="Show contents of config file.")<a name="line.47"></a>
+<span class="sourceLineNo">048</span> public ConfigFile getConfigContents() throws Exception {<a name="line.48"></a>
+<span class="sourceLineNo">049</span> return getServletConfig().getConfigFile();<a name="line.49"></a>
+<span class="sourceLineNo">050</span> }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> /**<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * [GET /edit] - Show config file edit page.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> *<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * @param req The HTTP request.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * @return The config file as a reader resource.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * @throws Exception<a name="line.57"></a>
+<span class="sourceLineNo">058</span> */<a name="line.58"></a>
+<span class="sourceLineNo">059</span> @RestMethod(name="GET", path="/edit", description="Edit config file.")<a name="line.59"></a>
+<span class="sourceLineNo">060</span> public Form getConfigEditForm(RestRequest req) throws Exception {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> return form().id("form").action(req.getServletURI()).method("POST").enctype("application/x-www-form-urlencoded").children(<a name="line.61"></a>
+<span class="sourceLineNo">062</span> div()._class("data").children(<a name="line.62"></a>
+<span class="sourceLineNo">063</span> table(<a name="line.63"></a>
+<span class="sourceLineNo">064</span> tr(td().style("text-align:right").children(button("submit","Submit"),button("reset","Reset"))),<a name="line.64"></a>
+<span class="sourceLineNo">065</span> tr(th().child("Contents")),<a name="line.65"></a>
+<span class="sourceLineNo">066</span> tr(th().child(<a name="line.66"></a>
+<span class="sourceLineNo">067</span> textarea().name("contents").rows(40).cols(120).style("white-space:pre;word-wrap:normal;overflow-x:scroll;font-family:monospace;")<a name="line.67"></a>
+<span class="sourceLineNo">068</span> .text(getConfigContents().toString()))<a name="line.68"></a>
+<span class="sourceLineNo">069</span> )<a name="line.69"></a>
+<span class="sourceLineNo">070</span> )<a name="line.70"></a>
+<span class="sourceLineNo">071</span> )<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><a name="line.74"></a>
+<span class="sourceLineNo">075</span> /**<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * [GET /{section}] - Show config file section.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> *<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * @param section The section name.<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * @return The config file section.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * @throws Exception<a name="line.80"></a>
+<span class="sourceLineNo">081</span> */<a name="line.81"></a>
+<span class="sourceLineNo">082</span> @RestMethod(name="GET", path="/{section}",<a name="line.82"></a>
+<span class="sourceLineNo">083</span> description="Show config file section.",<a name="line.83"></a>
+<span class="sourceLineNo">084</span> parameters={<a name="line.84"></a>
+<span class="sourceLineNo">085</span> @Parameter(in="path", name="section", description="Section name.")<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
+<span class="sourceLineNo">087</span> )<a name="line.87"></a>
+<span class="sourceLineNo">088</span> public ObjectMap getConfigSection(@Path("section") String section) throws Exception {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> return getSection(section);<a name="line.89"></a>
+<span class="sourceLineNo">090</span> }<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span> /**<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * [GET /{section}/{key}] - Show config file entry.<a name="line.93"></a>
+<span class="sourceLineNo">094</span> *<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * @param section The section name.<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * @param key The section key.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * @return The value of the config file entry.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * @throws Exception<a name="line.98"></a>
+<span class="sourceLineNo">099</span> */<a name="line.99"></a>
+<span class="sourceLineNo">100</span> @RestMethod(name="GET", path="/{section}/{key}",<a name="line.100"></a>
+<span class="sourceLineNo">101</span> description="Show config file entry.",<a name="line.101"></a>
+<span class="sourceLineNo">102</span> parameters={<a name="line.102"></a>
+<span class="sourceLineNo">103</span> @Parameter(in="path", name="section", description="Section name."),<a name="line.103"></a>
+<span class="sourceLineNo">104</span> @Parameter(in="path", name="key", description="Entry name.")<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span> )<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public String getConfigEntry(@Path("section") String section, @Path("key") String key) throws Exception {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return getSection(section).getString(key);<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> /**<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * [POST /] - Sets contents of config file from a FORM post.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> *<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * @param contents The new contents of the config file.<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * @return The new config file contents.<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * @throws Exception<a name="line.116"></a>
+<span class="sourceLineNo">117</span> */<a name="line.117"></a>
+<span class="sourceLineNo">118</span> @RestMethod(name="POST", path="/",<a name="line.118"></a>
+<span class="sourceLineNo">119</span> description="Sets contents of config file from a FORM post.",<a name="line.119"></a>
+<span class="sourceLineNo">120</span> parameters={<a name="line.120"></a>
+<span class="sourceLineNo">121</span> @Parameter(in="formData", name="contents", description="New contents in INI file format.")<a name="line.121"></a>
+<span class="sourceLineNo">122</span> }<a name="line.122"></a>
+<span class="sourceLineNo">123</span> )<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public ConfigFile setConfigContentsFormPost(@FormData("contents") String contents) throws Exception {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> return setConfigContents(new StringReader(contents));<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> /**<a name="line.128"></a>
+<span class="sourceLineNo">129</span> * [PUT /] - Sets contents of config file.<a name="line.129"></a>
+<span class="sourceLineNo">130</span> *<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * @param contents The new contents of the config file.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * @return The new config file contents.<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * @throws Exception<a name="line.133"></a>
+<span class="sourceLineNo">134</span> */<a name="line.134"></a>
+<span class="sourceLineNo">135</span> @RestMethod(name="PUT", path="/",<a name="line.135"></a>
+<span class="sourceLineNo">136</span> description="Sets contents of config file.",<a name="line.136"></a>
+<span class="sourceLineNo">137</span> parameters={<a name="line.137"></a>
+<span class="sourceLineNo">138</span> @Parameter(in="body", description="New contents in INI file format.")<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> public ConfigFile setConfigContents(@Body Reader contents) throws Exception {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> ConfigFile cf2 = new ConfigFileBuilder().build(contents);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return getConfigContents().merge(cf2).save();<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> /**<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * [PUT /{section}] - Add or overwrite a config file section.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> *<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * @param section The section name.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * @param contents The new contents of the config file section.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @return The new section.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * @throws Exception<a name="line.152"></a>
+<span class="sourceLineNo">153</span> */<a name="line.153"></a>
+<span class="sourceLineNo">154</span> @RestMethod(name="PUT", path="/{section}",<a name="line.154"></a>
+<span class="sourceLineNo">155</span> description="Add or overwrite a config file section.",<a name="line.155"></a>
+<span class="sourceLineNo">156</span> parameters={<a name="line.156"></a>
+<span class="sourceLineNo">157</span> @Parameter(in="path", name="section", description="Section name."),<a name="line.157"></a>
+<span class="sourceLineNo">158</span> @Parameter(in="body", description="New contents for section as a simple map with string keys and values.")<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span> )<a name="line.160"></a>
+<span class="sourceLineNo">161</span> public ObjectMap setConfigSection(@Path("section") String section, @Body Map<String,String> contents) throws Exception {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> getConfigContents().setSection(section, contents);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> return getSection(section);<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">166</span> /**<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * [PUT /{section}/{key}] - Add or overwrite a config file entry.<a name="line.167"></a>
+<span class="sourceLineNo">168</span> *<a name="line.168"></a>
+<span class="sourceLineNo">169</span> * @param section The section name.<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * @param key The section key.<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * @param value The new value.<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * @return The new value.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * @throws Exception<a name="line.173"></a>
+<span class="sourceLineNo">174</span> */<a name="line.174"></a>
+<span class="sourceLineNo">175</span> @RestMethod(name="PUT", path="/{section}/{key}",<a name="line.175"></a>
+<span class="sourceLineNo">176</span> description="Add or overwrite a config file entry.",<a name="line.176"></a>
+<span class="sourceLineNo">177</span> parameters={<a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Parameter(in="path", name="section", description="Section name."),<a name="line.178"></a>
+<span class="sourceLineNo">179</span> @Parameter(in="path", name="key", description="Entry name."),<a name="line.179"></a>
+<span class="sourceLineNo">180</span> @Parameter(in="body", description="New value as a string.")<a name="line.180"></a>
+<span class="sourceLineNo">181</span> }<a name="line.181"></a>
+<span class="sourceLineNo">182</span> )<a name="line.182"></a>
+<span class="sourceLineNo">183</span> public String setConfigSection(@Path("section") String section, @Path("key") String key, @Body String value) throws Exception {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> getConfigContents().put(section, key, value, false);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> return getSection(section).getString(key);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> private ObjectMap getSection(String name) throws Exception {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> ObjectMap m = getConfigContents().getSectionMap(name);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> if (m == null)<a name="line.190"></a>
+<span class="sourceLineNo">191</span> throw new RestException(SC_NOT_FOUND, "Section not found.");<a name="line.191"></a>
+<span class="sourceLineNo">192</span> return m;<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>}<a name="line.194"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
index ce19e07..0ae9633 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
@@ -65,9 +65,9 @@
<span class="sourceLineNo">057</span> title="File System Explorer",<a name="line.57"></a>
<span class="sourceLineNo">058</span> description="Contents of $R{attribute.path}",<a name="line.58"></a>
<span class="sourceLineNo">059</span> messages="nls/DirectoryResource",<a name="line.59"></a>
-<span class="sourceLineNo">060</span> properties={<a name="line.60"></a>
-<span class="sourceLineNo">061</span> @Property(name=HTML_uriAnchorText, value=PROPERTY_NAME),<a name="line.61"></a>
-<span class="sourceLineNo">062</span> @Property(name=HTMLDOC_links, value="{up:'$R{requestParentURI}',options:'?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.DirectoryResource)'}"),<a name="line.62"></a>
+<span class="sourceLineNo">060</span> pageLinks="{up:'$R{requestParentURI}',options:'?method=OPTIONS'}",<a name="line.60"></a>
+<span class="sourceLineNo">061</span> properties={<a name="line.61"></a>
+<span class="sourceLineNo">062</span> @Property(name=HTML_uriAnchorText, value=PROPERTY_NAME),<a name="line.62"></a>
<span class="sourceLineNo">063</span> @Property(name=REST_allowMethodParam, value="*"),<a name="line.63"></a>
<span class="sourceLineNo">064</span> @Property(name="DirectoryResource.rootDir", value=""),<a name="line.64"></a>
<span class="sourceLineNo">065</span> @Property(name="DirectoryResource.allowViews", value="false"),<a name="line.65"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.html
index ce19e07..0ae9633 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.html
@@ -65,9 +65,9 @@
<span class="sourceLineNo">057</span> title="File System Explorer",<a name="line.57"></a>
<span class="sourceLineNo">058</span> description="Contents of $R{attribute.path}",<a name="line.58"></a>
<span class="sourceLineNo">059</span> messages="nls/DirectoryResource",<a name="line.59"></a>
-<span class="sourceLineNo">060</span> properties={<a name="line.60"></a>
-<span class="sourceLineNo">061</span> @Property(name=HTML_uriAnchorText, value=PROPERTY_NAME),<a name="line.61"></a>
-<span class="sourceLineNo">062</span> @Property(name=HTMLDOC_links, value="{up:'$R{requestParentURI}',options:'?method=OPTIONS',source:'$R{servletParentURI}/source?classes=(org.apache.juneau.rest.samples.DirectoryResource)'}"),<a name="line.62"></a>
+<span class="sourceLineNo">060</span> pageLinks="{up:'$R{requestParentURI}',options:'?method=OPTIONS'}",<a name="line.60"></a>
+<span class="sourceLineNo">061</span> properties={<a name="line.61"></a>
+<span class="sourceLineNo">062</span> @Property(name=HTML_uriAnchorText, value=PROPERTY_NAME),<a name="line.62"></a>
<span class="sourceLineNo">063</span> @Property(name=REST_allowMethodParam, value="*"),<a name="line.63"></a>
<span class="sourceLineNo">064</span> @Property(name="DirectoryResource.rootDir", value=""),<a name="line.64"></a>
<span class="sourceLineNo">065</span> @Property(name="DirectoryResource.allowViews", value="false"),<a name="line.65"></a>
[05/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/RestResponse.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestResponse.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestResponse.html
index c549931..f7a539f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestResponse.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestResponse.html
@@ -29,399 +29,461 @@
<span class="sourceLineNo">021</span><a name="line.21"></a>
<span class="sourceLineNo">022</span>import org.apache.juneau.*;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import org.apache.juneau.encoders.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.jena.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.json.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.serializer.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.urlencoding.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.xml.*;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Represents an HTTP response for a REST resource.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <p><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * Essentially an extended {@link HttpServletResponse} with some special convenience methods<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * that allow you to easily output POJOs as responses.<a name="line.34"></a>
+<span class="sourceLineNo">024</span>import org.apache.juneau.html.*;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.juneau.jena.*;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.juneau.json.*;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.juneau.rest.annotation.*;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.juneau.serializer.*;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.juneau.urlencoding.*;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.juneau.utils.*;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.juneau.xml.*;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>/**<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * Represents an HTTP response for a REST resource.<a name="line.34"></a>
<span class="sourceLineNo">035</span> * <p><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * Since this class extends {@link HttpServletResponse}, developers are free to use these<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * convenience methods, or revert to using lower level methods like any other servlet response.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <h5 class='section'>Example:</h5><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <p class='bcode'><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>)<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <jk>public void</jk> doGet(RestRequest req, RestResponse res) {<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * res.setProperty(HtmlSerializerContext.<jsf>HTMLDOC_title</jsf>, <js>"My title"</js>)<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * .setOutput(<js>"Simple string response"</js>);<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * }<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * </p><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <p><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this class.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>public final class RestResponse extends HttpServletResponseWrapper {<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> private final RestRequest request;<a name="line.52"></a>
-<span class="sourceLineNo">053</span> private Object output; // The POJO being sent to the output.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private boolean isNullOutput; // The output is null (as opposed to not being set at all)<a name="line.54"></a>
-<span class="sourceLineNo">055</span> private ObjectMap properties; // Response properties<a name="line.55"></a>
-<span class="sourceLineNo">056</span> SerializerGroup serializerGroup;<a name="line.56"></a>
-<span class="sourceLineNo">057</span> UrlEncodingSerializer urlEncodingSerializer; // The serializer used to convert arguments passed into Redirect objects.<a name="line.57"></a>
-<span class="sourceLineNo">058</span> private EncoderGroup encoders;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private ServletOutputStream os;<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> /**<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * Constructor.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> */<a name="line.63"></a>
-<span class="sourceLineNo">064</span> RestResponse(RestContext context, RestRequest req, HttpServletResponse res) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span> super(res);<a name="line.65"></a>
-<span class="sourceLineNo">066</span> this.request = req;<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span> for (Map.Entry<String,Object> e : context.getDefaultResponseHeaders().entrySet())<a name="line.68"></a>
-<span class="sourceLineNo">069</span> setHeader(e.getKey(), e.getValue().toString());<a name="line.69"></a>
+<span class="sourceLineNo">036</span> * Essentially an extended {@link HttpServletResponse} with some special convenience methods<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * that allow you to easily output POJOs as responses.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <p><a name="line.38"></a>
+<span class="sourceLineNo">039</span> * Since this class extends {@link HttpServletResponse}, developers are free to use these<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * convenience methods, or revert to using lower level methods like any other servlet response.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <h5 class='section'>Example:</h5><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <p class='bcode'><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>)<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <jk>public void</jk> doGet(RestRequest req, RestResponse res) {<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * res.setPageTitle(<js>"My title"</js>)<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * .setOutput(<js>"Simple string response"</js>);<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * }<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * </p><a name="line.49"></a>
+<span class="sourceLineNo">050</span> * <p><a name="line.50"></a>
+<span class="sourceLineNo">051</span> * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this class.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>public final class RestResponse extends HttpServletResponseWrapper {<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> private final RestRequest request;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> private Object output; // The POJO being sent to the output.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> private boolean isNullOutput; // The output is null (as opposed to not being set at all)<a name="line.57"></a>
+<span class="sourceLineNo">058</span> private ObjectMap properties; // Response properties<a name="line.58"></a>
+<span class="sourceLineNo">059</span> SerializerGroup serializerGroup;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> UrlEncodingSerializer urlEncodingSerializer; // The serializer used to convert arguments passed into Redirect objects.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> private EncoderGroup encoders;<a name="line.61"></a>
+<span class="sourceLineNo">062</span> private ServletOutputStream os;<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span> /**<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * Constructor.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> */<a name="line.66"></a>
+<span class="sourceLineNo">067</span> RestResponse(RestContext context, RestRequest req, HttpServletResponse res) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> super(res);<a name="line.68"></a>
+<span class="sourceLineNo">069</span> this.request = req;<a name="line.69"></a>
<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> try {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> String passThroughHeaders = req.getHeader("x-response-headers");<a name="line.72"></a>
-<span class="sourceLineNo">073</span> if (passThroughHeaders != null) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> ObjectMap m = context.getUrlEncodingParser().parseParameter(passThroughHeaders, ObjectMap.class);<a name="line.74"></a>
-<span class="sourceLineNo">075</span> for (Map.Entry<String,Object> e : m.entrySet())<a name="line.75"></a>
-<span class="sourceLineNo">076</span> setHeader(e.getKey(), e.getValue().toString());<a name="line.76"></a>
-<span class="sourceLineNo">077</span> }<a name="line.77"></a>
-<span class="sourceLineNo">078</span> } catch (Exception e1) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> throw new RestException(SC_BAD_REQUEST, "Invalid format for header 'x-response-headers'. Must be in URL-encoded format.").initCause(e1);<a name="line.79"></a>
-<span class="sourceLineNo">080</span> }<a name="line.80"></a>
-<span class="sourceLineNo">081</span> }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> /*<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> */<a name="line.85"></a>
-<span class="sourceLineNo">086</span> @SuppressWarnings("hiding")<a name="line.86"></a>
-<span class="sourceLineNo">087</span> final void init(ObjectMap properties, String defaultCharset, SerializerGroup mSerializers, UrlEncodingSerializer mUrlEncodingSerializer, EncoderGroup encoders) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> this.properties = properties;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> this.serializerGroup = mSerializers;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> this.urlEncodingSerializer = mUrlEncodingSerializer;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> this.encoders = encoders;<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span> // Find acceptable charset<a name="line.93"></a>
-<span class="sourceLineNo">094</span> String h = request.getHeader("accept-charset");<a name="line.94"></a>
-<span class="sourceLineNo">095</span> String charset = null;<a name="line.95"></a>
-<span class="sourceLineNo">096</span> if (h == null)<a name="line.96"></a>
-<span class="sourceLineNo">097</span> charset = defaultCharset;<a name="line.97"></a>
-<span class="sourceLineNo">098</span> else for (MediaRange r : MediaRange.parse(h)) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> if (r.getQValue() > 0) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span> MediaType mt = r.getMediaType();<a name="line.100"></a>
-<span class="sourceLineNo">101</span> if (mt.getType().equals("*"))<a name="line.101"></a>
-<span class="sourceLineNo">102</span> charset = defaultCharset;<a name="line.102"></a>
-<span class="sourceLineNo">103</span> else if (Charset.isSupported(mt.getType()))<a name="line.103"></a>
-<span class="sourceLineNo">104</span> charset = mt.getType();<a name="line.104"></a>
-<span class="sourceLineNo">105</span> if (charset != null)<a name="line.105"></a>
-<span class="sourceLineNo">106</span> break;<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span> }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> if (charset == null)<a name="line.110"></a>
-<span class="sourceLineNo">111</span> throw new RestException(SC_NOT_ACCEPTABLE, "No supported charsets in header ''Accept-Charset'': ''{0}''", request.getHeader("Accept-Charset"));<a name="line.111"></a>
-<span class="sourceLineNo">112</span> super.setCharacterEncoding(charset);<a name="line.112"></a>
-<span class="sourceLineNo">113</span> }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span> /**<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * Gets the serializer group for the response.<a name="line.116"></a>
-<span class="sourceLineNo">117</span> *<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * @return The serializer group for the response.<a name="line.118"></a>
-<span class="sourceLineNo">119</span> */<a name="line.119"></a>
-<span class="sourceLineNo">120</span> public SerializerGroup getSerializerGroup() {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> return serializerGroup;<a name="line.121"></a>
-<span class="sourceLineNo">122</span> }<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span> /**<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * Returns the media types that are valid for <code>Accept</code> headers on the request.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> *<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * @return The set of media types registered in the parser group of this request.<a name="line.127"></a>
-<span class="sourceLineNo">128</span> */<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> return serializerGroup.getSupportedMediaTypes();<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> /**<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * Returns the codings that are valid for <code>Accept-Encoding</code> and <code>Content-Encoding</code> headers on the request.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> *<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * @return The set of media types registered in the parser group of this request.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * @throws RestServletException<a name="line.137"></a>
-<span class="sourceLineNo">138</span> */<a name="line.138"></a>
-<span class="sourceLineNo">139</span> public List<String> getSupportedEncodings() throws RestServletException {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> return encoders.getSupportedEncodings();<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<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> * Sets the HTTP output on the response.<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * <p><a name="line.145"></a>
-<span class="sourceLineNo">146</span> * Calling this method is functionally equivalent to returning the object in the REST Java method.<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * <p><a name="line.147"></a>
-<span class="sourceLineNo">148</span> * Can be of any of the following types:<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * <ul><a name="line.149"></a>
-<span class="sourceLineNo">150</span> * <li> {@link InputStream}<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * <li> {@link Reader}<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * <li> Any serializable type defined in <a class="doclink" href="../../../../overview-summary.html#Core.PojoCategories">POJO Categories</a><a name="line.152"></a>
-<span class="sourceLineNo">153</span> * </ul><a name="line.153"></a>
-<span class="sourceLineNo">154</span> * <p><a name="line.154"></a>
-<span class="sourceLineNo">155</span> * If it's an {@link InputStream} or {@link Reader}, you must also specify the <code>Content-Type</code> using the {@link #setContentType(String)} method.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> *<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * @param output The output to serialize to the connection.<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * @return This object (for method chaining).<a name="line.158"></a>
-<span class="sourceLineNo">159</span> */<a name="line.159"></a>
-<span class="sourceLineNo">160</span> public RestResponse setOutput(Object output) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> this.output = output;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> this.isNullOutput = output == null;<a name="line.162"></a>
-<span class="sourceLineNo">163</span> return this;<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">166</span> /**<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * Add a serializer property to send to the serializers to override a default value.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * <p><a name="line.168"></a>
-<span class="sourceLineNo">169</span> * Can be any value specified in the following classes:<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * <ul><a name="line.170"></a>
-<span class="sourceLineNo">171</span> * <li>{@link SerializerContext}<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * <li>{@link JsonSerializerContext}<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * <li>{@link XmlSerializerContext}<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * <li>{@link RdfSerializerContext}<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * </ul><a name="line.175"></a>
-<span class="sourceLineNo">176</span> *<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * @param key The setting name.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * @param value The setting value.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * @return This object (for method chaining).<a name="line.179"></a>
-<span class="sourceLineNo">180</span> */<a name="line.180"></a>
-<span class="sourceLineNo">181</span> public RestResponse setProperty(String key, Object value) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> properties.put(key, value);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> return this;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> /**<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * Returns the properties set via {@link #setProperty(String, Object)}.<a name="line.187"></a>
-<span class="sourceLineNo">188</span> *<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * @return A map of all the property values set.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> */<a name="line.190"></a>
-<span class="sourceLineNo">191</span> public ObjectMap getProperties() {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> return properties;<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<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> * Shortcut method that allows you to use varargs to simplify setting array output.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> *<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * <h5 class='section'>Example:</h5><a name="line.198"></a>
-<span class="sourceLineNo">199</span> * <p class='bcode'><a name="line.199"></a>
-<span class="sourceLineNo">200</span> * <jc>// Instead of...</jc><a name="line.200"></a>
-<span class="sourceLineNo">201</span> * response.setOutput(<jk>new</jk> Object[]{x,y,z});<a name="line.201"></a>
-<span class="sourceLineNo">202</span> *<a name="line.202"></a>
-<span class="sourceLineNo">203</span> * <jc>// ...call this...</jc><a name="line.203"></a>
-<span class="sourceLineNo">204</span> * response.setOutput(x,y,z);<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * </p><a name="line.205"></a>
-<span class="sourceLineNo">206</span> *<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * @param output The output to serialize to the connection.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * @return This object (for method chaining).<a name="line.208"></a>
-<span class="sourceLineNo">209</span> */<a name="line.209"></a>
-<span class="sourceLineNo">210</span> public RestResponse setOutputs(Object...output) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> this.output = output;<a name="line.211"></a>
-<span class="sourceLineNo">212</span> return this;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> /**<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * Returns the output that was set by calling {@link #setOutput(Object)}.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> *<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * @return The output object.<a name="line.218"></a>
-<span class="sourceLineNo">219</span> */<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public Object getOutput() {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return output;<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> /**<a name="line.224"></a>
-<span class="sourceLineNo">225</span> * Returns <jk>true</jk> if this response has any output associated with it.<a name="line.225"></a>
-<span class="sourceLineNo">226</span> *<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * @return <jk>true</jk> if {@code setInput()} has been called.<a name="line.227"></a>
-<span class="sourceLineNo">228</span> */<a name="line.228"></a>
-<span class="sourceLineNo">229</span> public boolean hasOutput() {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> return output != null || isNullOutput;<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span> /**<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * Sets the output to a plain-text message regardless of the content type.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> *<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * @param text The output text to send.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> * @return This object (for method chaining).<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * @throws IOException If a problem occurred trying to write to the writer.<a name="line.238"></a>
-<span class="sourceLineNo">239</span> */<a name="line.239"></a>
-<span class="sourceLineNo">240</span> public RestResponse sendPlainText(String text) throws IOException {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> setContentType("text/plain");<a name="line.241"></a>
-<span class="sourceLineNo">242</span> getNegotiatedWriter().write(text);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> return this;<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> /**<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * Equivalent to {@link HttpServletResponse#getOutputStream()}, except<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * wraps the output stream if an {@link Encoder} was found that matched<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * the <code>Accept-Encoding</code> header.<a name="line.249"></a>
-<span class="sourceLineNo">250</span> *<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * @return A negotiated output stream.<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * @throws IOException<a name="line.252"></a>
-<span class="sourceLineNo">253</span> */<a name="line.253"></a>
-<span class="sourceLineNo">254</span> public ServletOutputStream getNegotiatedOutputStream() throws IOException {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> if (os == null) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> Encoder encoder = null;<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span> String ae = request.getHeader("Accept-Encoding");<a name="line.258"></a>
-<span class="sourceLineNo">259</span> if (! (ae == null || ae.isEmpty())) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> EncoderMatch match = encoders != null ? encoders.getEncoderMatch(ae) : null;<a name="line.260"></a>
-<span class="sourceLineNo">261</span> if (match == null) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> // Identity should always match unless "identity;q=0" or "*;q=0" is specified.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (ae.matches(".*(identity|\\*)\\s*;\\s*q\\s*=\\s*(0(?!\\.)|0\\.0).*")) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> throw new RestException(SC_NOT_ACCEPTABLE,<a name="line.264"></a>
-<span class="sourceLineNo">265</span> "Unsupported encoding in request header ''Accept-Encoding'': ''{0}''\n\tSupported codings: {1}",<a name="line.265"></a>
-<span class="sourceLineNo">266</span> ae, encoders.getSupportedEncodings()<a name="line.266"></a>
-<span class="sourceLineNo">267</span> );<a name="line.267"></a>
-<span class="sourceLineNo">268</span> }<a name="line.268"></a>
-<span class="sourceLineNo">269</span> } else {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> encoder = match.getEncoder();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> String encoding = match.getEncoding().toString();<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> // Some clients don't recognize identity as an encoding, so don't set it.<a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (! encoding.equals("identity"))<a name="line.274"></a>
-<span class="sourceLineNo">275</span> setHeader("content-encoding", encoding);<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> }<a name="line.277"></a>
-<span class="sourceLineNo">278</span> os = getOutputStream();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> if (encoder != null) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> final OutputStream os2 = encoder.getOutputStream(os);<a name="line.280"></a>
-<span class="sourceLineNo">281</span> os = new ServletOutputStream(){<a name="line.281"></a>
-<span class="sourceLineNo">282</span> @Override /* OutputStream */<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public final void write(byte[] b, int off, int len) throws IOException {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> os2.write(b, off, len);<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span> @Override /* OutputStream */<a name="line.286"></a>
-<span class="sourceLineNo">287</span> public final void write(int b) throws IOException {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> os2.write(b);<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span> @Override /* OutputStream */<a name="line.290"></a>
-<span class="sourceLineNo">291</span> public final void flush() throws IOException {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> os2.flush();<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span> @Override /* OutputStream */<a name="line.294"></a>
-<span class="sourceLineNo">295</span> public final void close() throws IOException {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> os2.close();<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span> };<a name="line.298"></a>
-<span class="sourceLineNo">299</span> }<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span> return os;<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span> @Override /* ServletResponse */<a name="line.304"></a>
-<span class="sourceLineNo">305</span> public ServletOutputStream getOutputStream() throws IOException {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> if (os == null)<a name="line.306"></a>
-<span class="sourceLineNo">307</span> os = super.getOutputStream();<a name="line.307"></a>
-<span class="sourceLineNo">308</span> return os;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> /**<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * Returns <jk>true</jk> if {@link #getOutputStream()} has been called.<a name="line.312"></a>
-<span class="sourceLineNo">313</span> *<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * @return <jk>true</jk> if {@link #getOutputStream()} has been called.<a name="line.314"></a>
-<span class="sourceLineNo">315</span> */<a name="line.315"></a>
-<span class="sourceLineNo">316</span> public boolean getOutputStreamCalled() {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return os != null;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> }<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span> /**<a name="line.320"></a>
-<span class="sourceLineNo">321</span> * Returns the writer to the response body.<a name="line.321"></a>
-<span class="sourceLineNo">322</span> * This methods bypasses any specified encoders and returns a regular unbuffered writer.<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * Use the {@link #getNegotiatedWriter()} method if you want to use the matched encoder (if any).<a name="line.323"></a>
-<span class="sourceLineNo">324</span> */<a name="line.324"></a>
-<span class="sourceLineNo">325</span> @Override /* ServletResponse */<a name="line.325"></a>
-<span class="sourceLineNo">326</span> public PrintWriter getWriter() throws IOException {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return getWriter(true);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> /**<a name="line.330"></a>
-<span class="sourceLineNo">331</span> * Convenience method meant to be used when rendering directly to a browser with no buffering.<a name="line.331"></a>
-<span class="sourceLineNo">332</span> * Sets the header <js>"x-content-type-options=nosniff"</js> so that output is rendered<a name="line.332"></a>
-<span class="sourceLineNo">333</span> * immediately on IE and Chrome without any buffering for content-type sniffing.<a name="line.333"></a>
-<span class="sourceLineNo">334</span> *<a name="line.334"></a>
-<span class="sourceLineNo">335</span> * @param contentType The value to set as the <code>Content-Type</code> on the response.<a name="line.335"></a>
-<span class="sourceLineNo">336</span> * @return The raw writer.<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * @throws IOException<a name="line.337"></a>
-<span class="sourceLineNo">338</span> */<a name="line.338"></a>
-<span class="sourceLineNo">339</span> public PrintWriter getDirectWriter(String contentType) throws IOException {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> setContentType(contentType);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> setHeader("x-content-type-options", "nosniff");<a name="line.341"></a>
-<span class="sourceLineNo">342</span> return getWriter();<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span> /**<a name="line.345"></a>
-<span class="sourceLineNo">346</span> * Equivalent to {@link HttpServletResponse#getWriter()}, except<a name="line.346"></a>
-<span class="sourceLineNo">347</span> * wraps the output stream if an {@link Encoder} was found that matched<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * the <code>Accept-Encoding</code> header and sets the <code>Content-Encoding</code><a name="line.348"></a>
-<span class="sourceLineNo">349</span> * header to the appropriate value.<a name="line.349"></a>
-<span class="sourceLineNo">350</span> *<a name="line.350"></a>
-<span class="sourceLineNo">351</span> * @return The negotiated writer.<a name="line.351"></a>
-<span class="sourceLineNo">352</span> * @throws IOException<a name="line.352"></a>
-<span class="sourceLineNo">353</span> */<a name="line.353"></a>
-<span class="sourceLineNo">354</span> public PrintWriter getNegotiatedWriter() throws IOException {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> return getWriter(false);<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span> private PrintWriter getWriter(boolean raw) throws IOException {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> // If plain text requested, override it now.<a name="line.359"></a>
-<span class="sourceLineNo">360</span> if (request.isPlainText()) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> setHeader("Content-Type", "text/plain");<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span> try {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> OutputStream out = (raw ? getOutputStream() : getNegotiatedOutputStream());<a name="line.365"></a>
-<span class="sourceLineNo">366</span> return new PrintWriter(new OutputStreamWriter(out, getCharacterEncoding()));<a name="line.366"></a>
-<span class="sourceLineNo">367</span> } catch (UnsupportedEncodingException e) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> String ce = getCharacterEncoding();<a name="line.368"></a>
-<span class="sourceLineNo">369</span> setCharacterEncoding("UTF-8");<a name="line.369"></a>
-<span class="sourceLineNo">370</span> throw new RestException(SC_NOT_ACCEPTABLE, "Unsupported charset in request header ''Accept-Charset'': ''{0}''", ce);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> }<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> /**<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * Returns the <code>Content-Type</code> header stripped of the charset attribute if present.<a name="line.375"></a>
-<span class="sourceLineNo">376</span> *<a name="line.376"></a>
-<span class="sourceLineNo">377</span> * @return The <code>media-type</code> portion of the <code>Content-Type</code> header.<a name="line.377"></a>
-<span class="sourceLineNo">378</span> */<a name="line.378"></a>
-<span class="sourceLineNo">379</span> public MediaType getMediaType() {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> return MediaType.forString(getContentType());<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> /**<a name="line.383"></a>
-<span class="sourceLineNo">384</span> * Redirects to the specified URI.<a name="line.384"></a>
-<span class="sourceLineNo">385</span> * <p><a name="line.385"></a>
-<span class="sourceLineNo">386</span> * Relative URIs are always interpreted as relative to the context root.<a name="line.386"></a>
-<span class="sourceLineNo">387</span> * This is similar to how WAS handles redirect requests, and is different from how Tomcat<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * handles redirect requests.<a name="line.388"></a>
-<span class="sourceLineNo">389</span> */<a name="line.389"></a>
-<span class="sourceLineNo">390</span> @Override /* ServletResponse */<a name="line.390"></a>
-<span class="sourceLineNo">391</span> public void sendRedirect(String uri) throws IOException {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> char c = (uri.length() > 0 ? uri.charAt(0) : 0);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (c != '/' && uri.indexOf("://") == -1)<a name="line.393"></a>
-<span class="sourceLineNo">394</span> uri = request.getContextPath() + '/' + uri;<a name="line.394"></a>
-<span class="sourceLineNo">395</span> super.sendRedirect(uri);<a name="line.395"></a>
-<span class="sourceLineNo">396</span> }<a name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span> /**<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * Returns the URL-encoding serializer associated with this response.<a name="line.399"></a>
-<span class="sourceLineNo">400</span> *<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * @return The URL-encoding serializer associated with this response.<a name="line.401"></a>
-<span class="sourceLineNo">402</span> */<a name="line.402"></a>
-<span class="sourceLineNo">403</span> public UrlEncodingSerializer getUrlEncodingSerializer() {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> return urlEncodingSerializer;<a name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span> @Override /* ServletResponse */<a name="line.407"></a>
-<span class="sourceLineNo">408</span> public void setHeader(String name, String value) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> // Jetty doesn't set the content type correctly if set through this method.<a name="line.409"></a>
-<span class="sourceLineNo">410</span> // Tomcat/WAS does.<a name="line.410"></a>
-<span class="sourceLineNo">411</span> if (name.equalsIgnoreCase("Content-Type"))<a name="line.411"></a>
-<span class="sourceLineNo">412</span> super.setContentType(value);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> else<a name="line.413"></a>
-<span class="sourceLineNo">414</span> super.setHeader(name, value);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span>}<a name="line.416"></a>
+<span class="sourceLineNo">071</span> for (Map.Entry<String,Object> e : context.getDefaultResponseHeaders().entrySet())<a name="line.71"></a>
+<span class="sourceLineNo">072</span> setHeader(e.getKey(), e.getValue().toString());<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> try {<a name="line.74"></a>
+<span class="sourceLineNo">075</span> String passThroughHeaders = req.getHeader("x-response-headers");<a name="line.75"></a>
+<span class="sourceLineNo">076</span> if (passThroughHeaders != null) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> ObjectMap m = context.getUrlEncodingParser().parseParameter(passThroughHeaders, ObjectMap.class);<a name="line.77"></a>
+<span class="sourceLineNo">078</span> for (Map.Entry<String,Object> e : m.entrySet())<a name="line.78"></a>
+<span class="sourceLineNo">079</span> setHeader(e.getKey(), e.getValue().toString());<a name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span> } catch (Exception e1) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> throw new RestException(SC_BAD_REQUEST, "Invalid format for header 'x-response-headers'. Must be in URL-encoded format.").initCause(e1);<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }<a name="line.83"></a>
+<span class="sourceLineNo">084</span> }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> /*<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> */<a name="line.88"></a>
+<span class="sourceLineNo">089</span> @SuppressWarnings("hiding")<a name="line.89"></a>
+<span class="sourceLineNo">090</span> final void init(ObjectMap properties, String defaultCharset, SerializerGroup mSerializers, UrlEncodingSerializer mUrlEncodingSerializer, EncoderGroup encoders) {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> this.properties = properties;<a name="line.91"></a>
+<span class="sourceLineNo">092</span> this.serializerGroup = mSerializers;<a name="line.92"></a>
+<span class="sourceLineNo">093</span> this.urlEncodingSerializer = mUrlEncodingSerializer;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> this.encoders = encoders;<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span> // Find acceptable charset<a name="line.96"></a>
+<span class="sourceLineNo">097</span> String h = request.getHeader("accept-charset");<a name="line.97"></a>
+<span class="sourceLineNo">098</span> String charset = null;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> if (h == null)<a name="line.99"></a>
+<span class="sourceLineNo">100</span> charset = defaultCharset;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> else for (MediaRange r : MediaRange.parse(h)) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> if (r.getQValue() > 0) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> MediaType mt = r.getMediaType();<a name="line.103"></a>
+<span class="sourceLineNo">104</span> if (mt.getType().equals("*"))<a name="line.104"></a>
+<span class="sourceLineNo">105</span> charset = defaultCharset;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> else if (Charset.isSupported(mt.getType()))<a name="line.106"></a>
+<span class="sourceLineNo">107</span> charset = mt.getType();<a name="line.107"></a>
+<span class="sourceLineNo">108</span> if (charset != null)<a name="line.108"></a>
+<span class="sourceLineNo">109</span> break;<a name="line.109"></a>
+<span class="sourceLineNo">110</span> }<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> if (charset == null)<a name="line.113"></a>
+<span class="sourceLineNo">114</span> throw new RestException(SC_NOT_ACCEPTABLE, "No supported charsets in header ''Accept-Charset'': ''{0}''", request.getHeader("Accept-Charset"));<a name="line.114"></a>
+<span class="sourceLineNo">115</span> super.setCharacterEncoding(charset);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> /**<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * Gets the serializer group for the response.<a name="line.119"></a>
+<span class="sourceLineNo">120</span> *<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @return The serializer group for the response.<a name="line.121"></a>
+<span class="sourceLineNo">122</span> */<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public SerializerGroup getSerializerGroup() {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> return serializerGroup;<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<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> * Returns the media types that are valid for <code>Accept</code> headers on the request.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> *<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * @return The set of media types registered in the parser group of this request.<a name="line.130"></a>
+<span class="sourceLineNo">131</span> */<a name="line.131"></a>
+<span class="sourceLineNo">132</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> return serializerGroup.getSupportedMediaTypes();<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * Returns the codings that are valid for <code>Accept-Encoding</code> and <code>Content-Encoding</code> headers on the request.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> *<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * @return The set of media types registered in the parser group of this request.<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * @throws RestServletException<a name="line.140"></a>
+<span class="sourceLineNo">141</span> */<a name="line.141"></a>
+<span class="sourceLineNo">142</span> public List<String> getSupportedEncodings() throws RestServletException {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return encoders.getSupportedEncodings();<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> /**<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * Sets the HTTP output on the response.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <p><a name="line.148"></a>
+<span class="sourceLineNo">149</span> * Calling this method is functionally equivalent to returning the object in the REST Java method.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * <p><a name="line.150"></a>
+<span class="sourceLineNo">151</span> * Can be of any of the following types:<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * <ul><a name="line.152"></a>
+<span class="sourceLineNo">153</span> * <li> {@link InputStream}<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * <li> {@link Reader}<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * <li> Any serializable type defined in <a class="doclink" href="../../../../overview-summary.html#Core.PojoCategories">POJO Categories</a><a name="line.155"></a>
+<span class="sourceLineNo">156</span> * </ul><a name="line.156"></a>
+<span class="sourceLineNo">157</span> * <p><a name="line.157"></a>
+<span class="sourceLineNo">158</span> * If it's an {@link InputStream} or {@link Reader}, you must also specify the <code>Content-Type</code> using the {@link #setContentType(String)} method.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> *<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * @param output The output to serialize to the connection.<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * @return This object (for method chaining).<a name="line.161"></a>
+<span class="sourceLineNo">162</span> */<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public RestResponse setOutput(Object output) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> this.output = output;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> this.isNullOutput = output == null;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> return this;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> /**<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * Add a serializer property to send to the serializers to override a default value.<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * <p><a name="line.171"></a>
+<span class="sourceLineNo">172</span> * Can be any value specified in the following classes:<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * <ul><a name="line.173"></a>
+<span class="sourceLineNo">174</span> * <li>{@link SerializerContext}<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * <li>{@link JsonSerializerContext}<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * <li>{@link XmlSerializerContext}<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * <li>{@link RdfSerializerContext}<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * </ul><a name="line.178"></a>
+<span class="sourceLineNo">179</span> *<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * @param key The setting name.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * @param value The setting value.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * @return This object (for method chaining).<a name="line.182"></a>
+<span class="sourceLineNo">183</span> */<a name="line.183"></a>
+<span class="sourceLineNo">184</span> public RestResponse setProperty(String key, Object value) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> properties.put(key, value);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> return this;<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span> /**<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * Returns the properties set via {@link #setProperty(String, Object)}.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> *<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * @return A map of all the property values set.<a name="line.192"></a>
+<span class="sourceLineNo">193</span> */<a name="line.193"></a>
+<span class="sourceLineNo">194</span> public ObjectMap getProperties() {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> return properties;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> }<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span> /**<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * Shortcut method that allows you to use varargs to simplify setting array output.<a name="line.199"></a>
+<span class="sourceLineNo">200</span> *<a name="line.200"></a>
+<span class="sourceLineNo">201</span> * <h5 class='section'>Example:</h5><a name="line.201"></a>
+<span class="sourceLineNo">202</span> * <p class='bcode'><a name="line.202"></a>
+<span class="sourceLineNo">203</span> * <jc>// Instead of...</jc><a name="line.203"></a>
+<span class="sourceLineNo">204</span> * response.setOutput(<jk>new</jk> Object[]{x,y,z});<a name="line.204"></a>
+<span class="sourceLineNo">205</span> *<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * <jc>// ...call this...</jc><a name="line.206"></a>
+<span class="sourceLineNo">207</span> * response.setOutput(x,y,z);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * </p><a name="line.208"></a>
+<span class="sourceLineNo">209</span> *<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * @param output The output to serialize to the connection.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * @return This object (for method chaining).<a name="line.211"></a>
+<span class="sourceLineNo">212</span> */<a name="line.212"></a>
+<span class="sourceLineNo">213</span> public RestResponse setOutputs(Object...output) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> this.output = output;<a name="line.214"></a>
+<span class="sourceLineNo">215</span> return this;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> /**<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * Returns the output that was set by calling {@link #setOutput(Object)}.<a name="line.219"></a>
+<span class="sourceLineNo">220</span> *<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * @return The output object.<a name="line.221"></a>
+<span class="sourceLineNo">222</span> */<a name="line.222"></a>
+<span class="sourceLineNo">223</span> public Object getOutput() {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> return output;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span> /**<a name="line.227"></a>
+<span class="sourceLineNo">228</span> * Returns <jk>true</jk> if this response has any output associated with it.<a name="line.228"></a>
+<span class="sourceLineNo">229</span> *<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * @return <jk>true</jk> if {@code setInput()} has been called.<a name="line.230"></a>
+<span class="sourceLineNo">231</span> */<a name="line.231"></a>
+<span class="sourceLineNo">232</span> public boolean hasOutput() {<a name="line.232"></a>
+<span class="sourceLineNo">233</span> return output != null || isNullOutput;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span> /**<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * Sets the output to a plain-text message regardless of the content type.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> *<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * @param text The output text to send.<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * @return This object (for method chaining).<a name="line.240"></a>
+<span class="sourceLineNo">241</span> * @throws IOException If a problem occurred trying to write to the writer.<a name="line.241"></a>
+<span class="sourceLineNo">242</span> */<a name="line.242"></a>
+<span class="sourceLineNo">243</span> public RestResponse sendPlainText(String text) throws IOException {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> setContentType("text/plain");<a name="line.244"></a>
+<span class="sourceLineNo">245</span> getNegotiatedWriter().write(text);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return this;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> /**<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * Equivalent to {@link HttpServletResponse#getOutputStream()}, except<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * wraps the output stream if an {@link Encoder} was found that matched<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * the <code>Accept-Encoding</code> header.<a name="line.252"></a>
+<span class="sourceLineNo">253</span> *<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * @return A negotiated output stream.<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * @throws IOException<a name="line.255"></a>
+<span class="sourceLineNo">256</span> */<a name="line.256"></a>
+<span class="sourceLineNo">257</span> public ServletOutputStream getNegotiatedOutputStream() throws IOException {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (os == null) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> Encoder encoder = null;<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> String ae = request.getHeader("Accept-Encoding");<a name="line.261"></a>
+<span class="sourceLineNo">262</span> if (! (ae == null || ae.isEmpty())) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> EncoderMatch match = encoders != null ? encoders.getEncoderMatch(ae) : null;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (match == null) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> // Identity should always match unless "identity;q=0" or "*;q=0" is specified.<a name="line.265"></a>
+<span class="sourceLineNo">266</span> if (ae.matches(".*(identity|\\*)\\s*;\\s*q\\s*=\\s*(0(?!\\.)|0\\.0).*")) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> throw new RestException(SC_NOT_ACCEPTABLE,<a name="line.267"></a>
+<span class="sourceLineNo">268</span> "Unsupported encoding in request header ''Accept-Encoding'': ''{0}''\n\tSupported codings: {1}",<a name="line.268"></a>
+<span class="sourceLineNo">269</span> ae, encoders.getSupportedEncodings()<a name="line.269"></a>
+<span class="sourceLineNo">270</span> );<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span> } else {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> encoder = match.getEncoder();<a name="line.273"></a>
+<span class="sourceLineNo">274</span> String encoding = match.getEncoding().toString();<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> // Some clients don't recognize identity as an encoding, so don't set it.<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (! encoding.equals("identity"))<a name="line.277"></a>
+<span class="sourceLineNo">278</span> setHeader("content-encoding", encoding);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span> os = getOutputStream();<a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (encoder != null) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> final OutputStream os2 = encoder.getOutputStream(os);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> os = new ServletOutputStream(){<a name="line.284"></a>
+<span class="sourceLineNo">285</span> @Override /* OutputStream */<a name="line.285"></a>
+<span class="sourceLineNo">286</span> public final void write(byte[] b, int off, int len) throws IOException {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> os2.write(b, off, len);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> }<a name="line.288"></a>
+<span class="sourceLineNo">289</span> @Override /* OutputStream */<a name="line.289"></a>
+<span class="sourceLineNo">290</span> public final void write(int b) throws IOException {<a name="line.290"></a>
+<span class="sourceLineNo">291</span> os2.write(b);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span> @Override /* OutputStream */<a name="line.293"></a>
+<span class="sourceLineNo">294</span> public final void flush() throws IOException {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> os2.flush();<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> @Override /* OutputStream */<a name="line.297"></a>
+<span class="sourceLineNo">298</span> public final void close() throws IOException {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> os2.close();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span> };<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span> return os;<a name="line.304"></a>
+<span class="sourceLineNo">305</span> }<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span> @Override /* ServletResponse */<a name="line.307"></a>
+<span class="sourceLineNo">308</span> public ServletOutputStream getOutputStream() throws IOException {<a name="line.308"></a>
+<span class="sourceLineNo">309</span> if (os == null)<a name="line.309"></a>
+<span class="sourceLineNo">310</span> os = super.getOutputStream();<a name="line.310"></a>
+<span class="sourceLineNo">311</span> return os;<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span> /**<a name="line.314"></a>
+<span class="sourceLineNo">315</span> * Returns <jk>true</jk> if {@link #getOutputStream()} has been called.<a name="line.315"></a>
+<span class="sourceLineNo">316</span> *<a name="line.316"></a>
+<span class="sourceLineNo">317</span> * @return <jk>true</jk> if {@link #getOutputStream()} has been called.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> */<a name="line.318"></a>
+<span class="sourceLineNo">319</span> public boolean getOutputStreamCalled() {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> return os != null;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> /**<a name="line.323"></a>
+<span class="sourceLineNo">324</span> * Returns the writer to the response body.<a name="line.324"></a>
+<span class="sourceLineNo">325</span> * This methods bypasses any specified encoders and returns a regular unbuffered writer.<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * Use the {@link #getNegotiatedWriter()} method if you want to use the matched encoder (if any).<a name="line.326"></a>
+<span class="sourceLineNo">327</span> */<a name="line.327"></a>
+<span class="sourceLineNo">328</span> @Override /* ServletResponse */<a name="line.328"></a>
+<span class="sourceLineNo">329</span> public PrintWriter getWriter() throws IOException {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> return getWriter(true);<a name="line.330"></a>
+<span class="sourceLineNo">331</span> }<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span> /**<a name="line.333"></a>
+<span class="sourceLineNo">334</span> * Convenience method meant to be used when rendering directly to a browser with no buffering.<a name="line.334"></a>
+<span class="sourceLineNo">335</span> * Sets the header <js>"x-content-type-options=nosniff"</js> so that output is rendered<a name="line.335"></a>
+<span class="sourceLineNo">336</span> * immediately on IE and Chrome without any buffering for content-type sniffing.<a name="line.336"></a>
+<span class="sourceLineNo">337</span> *<a name="line.337"></a>
+<span class="sourceLineNo">338</span> * @param contentType The value to set as the <code>Content-Type</code> on the response.<a name="line.338"></a>
+<span class="sourceLineNo">339</span> * @return The raw writer.<a name="line.339"></a>
+<span class="sourceLineNo">340</span> * @throws IOException<a name="line.340"></a>
+<span class="sourceLineNo">341</span> */<a name="line.341"></a>
+<span class="sourceLineNo">342</span> public PrintWriter getDirectWriter(String contentType) throws IOException {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> setContentType(contentType);<a name="line.343"></a>
+<span class="sourceLineNo">344</span> setHeader("x-content-type-options", "nosniff");<a name="line.344"></a>
+<span class="sourceLineNo">345</span> return getWriter();<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> /**<a name="line.348"></a>
+<span class="sourceLineNo">349</span> * Equivalent to {@link HttpServletResponse#getWriter()}, except<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * wraps the output stream if an {@link Encoder} was found that matched<a name="line.350"></a>
+<span class="sourceLineNo">351</span> * the <code>Accept-Encoding</code> header and sets the <code>Content-Encoding</code><a name="line.351"></a>
+<span class="sourceLineNo">352</span> * header to the appropriate value.<a name="line.352"></a>
+<span class="sourceLineNo">353</span> *<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * @return The negotiated writer.<a name="line.354"></a>
+<span class="sourceLineNo">355</span> * @throws IOException<a name="line.355"></a>
+<span class="sourceLineNo">356</span> */<a name="line.356"></a>
+<span class="sourceLineNo">357</span> public PrintWriter getNegotiatedWriter() throws IOException {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> return getWriter(false);<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> private PrintWriter getWriter(boolean raw) throws IOException {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> // If plain text requested, override it now.<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (request.isPlainText()) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> setHeader("Content-Type", "text/plain");<a name="line.364"></a>
+<span class="sourceLineNo">365</span> }<a name="line.365"></a>
+<span class="sourceLineNo">366</span><a name="line.366"></a>
+<span class="sourceLineNo">367</span> try {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> OutputStream out = (raw ? getOutputStream() : getNegotiatedOutputStream());<a name="line.368"></a>
+<span class="sourceLineNo">369</span> return new PrintWriter(new OutputStreamWriter(out, getCharacterEncoding()));<a name="line.369"></a>
+<span class="sourceLineNo">370</span> } catch (UnsupportedEncodingException e) {<a name="line.370"></a>
+<span class="sourceLineNo">371</span> String ce = getCharacterEncoding();<a name="line.371"></a>
+<span class="sourceLineNo">372</span> setCharacterEncoding("UTF-8");<a name="line.372"></a>
+<span class="sourceLineNo">373</span> throw new RestException(SC_NOT_ACCEPTABLE, "Unsupported charset in request header ''Accept-Charset'': ''{0}''", ce);<a name="line.373"></a>
+<span class="sourceLineNo">374</span> }<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * Returns the <code>Content-Type</code> header stripped of the charset attribute if present.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> *<a name="line.379"></a>
+<span class="sourceLineNo">380</span> * @return The <code>media-type</code> portion of the <code>Content-Type</code> header.<a name="line.380"></a>
+<span class="sourceLineNo">381</span> */<a name="line.381"></a>
+<span class="sourceLineNo">382</span> public MediaType getMediaType() {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> return MediaType.forString(getContentType());<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> /**<a name="line.386"></a>
+<span class="sourceLineNo">387</span> * Redirects to the specified URI.<a name="line.387"></a>
+<span class="sourceLineNo">388</span> * <p><a name="line.388"></a>
+<span class="sourceLineNo">389</span> * Relative URIs are always interpreted as relative to the context root.<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * This is similar to how WAS handles redirect requests, and is different from how Tomcat<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * handles redirect requests.<a name="line.391"></a>
+<span class="sourceLineNo">392</span> */<a name="line.392"></a>
+<span class="sourceLineNo">393</span> @Override /* ServletResponse */<a name="line.393"></a>
+<span class="sourceLineNo">394</span> public void sendRedirect(String uri) throws IOException {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> char c = (uri.length() > 0 ? uri.charAt(0) : 0);<a name="line.395"></a>
+<span class="sourceLineNo">396</span> if (c != '/' && uri.indexOf("://") == -1)<a name="line.396"></a>
+<span class="sourceLineNo">397</span> uri = request.getContextPath() + '/' + uri;<a name="line.397"></a>
+<span class="sourceLineNo">398</span> super.sendRedirect(uri);<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> /**<a name="line.401"></a>
+<span class="sourceLineNo">402</span> * Returns the URL-encoding serializer associated with this response.<a name="line.402"></a>
+<span class="sourceLineNo">403</span> *<a name="line.403"></a>
+<span class="sourceLineNo">404</span> * @return The URL-encoding serializer associated with this response.<a name="line.404"></a>
+<span class="sourceLineNo">405</span> */<a name="line.405"></a>
+<span class="sourceLineNo">406</span> public UrlEncodingSerializer getUrlEncodingSerializer() {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> return urlEncodingSerializer;<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> @Override /* ServletResponse */<a name="line.410"></a>
+<span class="sourceLineNo">411</span> public void setHeader(String name, String value) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> // Jetty doesn't set the content type correctly if set through this method.<a name="line.412"></a>
+<span class="sourceLineNo">413</span> // Tomcat/WAS does.<a name="line.413"></a>
+<span class="sourceLineNo">414</span> if (name.equalsIgnoreCase("Content-Type"))<a name="line.414"></a>
+<span class="sourceLineNo">415</span> super.setContentType(value);<a name="line.415"></a>
+<span class="sourceLineNo">416</span> else<a name="line.416"></a>
+<span class="sourceLineNo">417</span> super.setHeader(name, value);<a name="line.417"></a>
+<span class="sourceLineNo">418</span> }<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span> /**<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * Sets the page title for HTML views.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> * <p><a name="line.422"></a>
+<span class="sourceLineNo">423</span> * This is the programmatic equivalent to the {@link RestResource#pageTitle() @RestResource#pageTitle()}/<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * {@link RestMethod#pageTitle() @RestMethod#pageTitle()} annotations.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * <p><a name="line.425"></a>
+<span class="sourceLineNo">426</span> * This is a shortcut for calling <code>setProperty(<jsf>HTMLDOC_title</jsf>, title);</code><a name="line.426"></a>
+<span class="sourceLineNo">427</span> * <p class='info'><a name="line.427"></a>
+<span class="sourceLineNo">428</span> * <b>Tip:</b> Use {@link StringMessage} to generate a page title with delayed serialization so as not to<a name="line.428"></a>
+<span class="sourceLineNo">429</span> * waste string concatenation cycles on non-HTML views.<a name="line.429"></a>
+<span class="sourceLineNo">430</span> * </p><a name="line.430"></a>
+<span class="sourceLineNo">431</span> *<a name="line.431"></a>
+<span class="sourceLineNo">432</span> * @param title The localized page title to render on the page.<a name="line.432"></a>
+<span class="sourceLineNo">433</span> * Object will be converted to a string using {@link Object#toString()}.<a name="line.433"></a>
+<span class="sourceLineNo">434</span> * @return This object (for method chaining).<a name="line.434"></a>
+<span class="sourceLineNo">435</span> */<a name="line.435"></a>
+<span class="sourceLineNo">436</span> public RestResponse setPageTitle(Object title) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span> return setProperty(HtmlDocSerializerContext.HTMLDOC_title, title);<a name="line.437"></a>
+<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> /**<a name="line.440"></a>
+<span class="sourceLineNo">441</span> * Sets the page text for HTML views.<a name="line.441"></a>
+<span class="sourceLineNo">442</span> * <p><a name="line.442"></a>
+<span class="sourceLineNo">443</span> * This is the programmatic equivalent to the {@link RestResource#pageText() @RestResource#pageText()}/<a name="line.443"></a>
+<span class="sourceLineNo">444</span> * {@link RestMethod#pageText() @RestMethod#pageText()} annotations.<a name="line.444"></a>
+<span class="sourceLineNo">445</span> * <p><a name="line.445"></a>
+<span class="sourceLineNo">446</span> * This is a shortcut for calling <code>setProperty(<jsf>HTMLDOC_text</jsf>, text);</code><a name="line.446"></a>
+<span class="sourceLineNo">447</span> * <p class='info'><a name="line.447"></a>
+<span class="sourceLineNo">448</span> * <b>Tip:</b> Use {@link StringMessage} to generate page text with delayed serialization so as not to<a name="line.448"></a>
+<span class="sourceLineNo">449</span> * waste string concatenation cycles on non-HTML views.<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * </p><a name="line.450"></a>
+<span class="sourceLineNo">451</span> *<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * @param text The localized page text to render on the page.<a name="line.452"></a>
+<span class="sourceLineNo">453</span> * @return This object (for method chaining).<a name="line.453"></a>
+<span class="sourceLineNo">454</span> */<a name="line.454"></a>
+<span class="sourceLineNo">455</span> public RestResponse setPageText(Object text) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> return setProperty(HtmlDocSerializerContext.HTMLDOC_text, text);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span><a name="line.458"></a>
+<span class="sourceLineNo">459</span> /**<a name="line.459"></a>
+<span class="sourceLineNo">460</span> * Sets the page text for HTML views.<a name="line.460"></a>
+<span class="sourceLineNo">461</span> * <p><a name="line.461"></a>
+<span class="sourceLineNo">462</span> * This is the programmatic equivalent to the {@link RestResource#pageLinks() @RestResource#pageLinks()}/<a name="line.462"></a>
+<span class="sourceLineNo">463</span> * {@link RestMethod#pageLinks() @RestMethod#pageLinks()} annotations.<a name="line.463"></a>
+<span class="sourceLineNo">464</span> * <p><a name="line.464"></a>
+<span class="sourceLineNo">465</span> * This is a shortcut for calling <code>setProperty(<jsf>HTMLDOC_links</jsf>, links);</code><a name="line.465"></a>
+<span class="sourceLineNo">466</span> * <p class='info'><a name="line.466"></a>
+<span class="sourceLineNo">467</span> * <b>Tip:</b> Use {@link StringMessage} to generate page links with delayed serialization so as not to<a name="line.467"></a>
+<span class="sourceLineNo">468</span> * waste string concatenation cycles on non-HTML views.<a name="line.468"></a>
+<span class="sourceLineNo">469</span> * </p><a name="line.469"></a>
+<span class="sourceLineNo">470</span> *<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * @param links The localized page links render on the page.<a name="line.471"></a>
+<span class="sourceLineNo">472</span> * @return This object (for method chaining).<a name="line.472"></a>
+<span class="sourceLineNo">473</span> */<a name="line.473"></a>
+<span class="sourceLineNo">474</span> public RestResponse setPageLinks(Object links) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> properties.put(HtmlDocSerializerContext.HTMLDOC_links, links);<a name="line.475"></a>
+<span class="sourceLineNo">476</span> return this;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> }<a name="line.477"></a>
+<span class="sourceLineNo">478</span>}<a name="line.478"></a>
[51/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
Javadoc updates.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/commit/5aed2f48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/tree/5aed2f48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/diff/5aed2f48
Branch: refs/heads/asf-site
Commit: 5aed2f4821973e4408bef69bb81dae6d5f82aeb4
Parents: 8911fe6
Author: JamesBognar <ja...@apache.org>
Authored: Sat Apr 1 19:57:34 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Sat Apr 1 19:57:34 2017 -0400
----------------------------------------------------------------------
content/site/apidocs/allclasses-frame.html | 8 +-
content/site/apidocs/allclasses-noframe.html | 8 +-
content/site/apidocs/constant-values.html | 18 +-
content/site/apidocs/index-all.html | 314 +-
.../apidocs/org/apache/juneau/BeanContext.html | 22 +-
.../apidocs/org/apache/juneau/BeanSession.html | 36 +-
.../apidocs/org/apache/juneau/ClassMeta.html | 350 +-
.../org/apache/juneau/PropertyStore.html | 2 +-
.../apidocs/org/apache/juneau/Writable.html | 2 +-
.../org/apache/juneau/csv/CsvParser.html | 2 +-
.../org/apache/juneau/csv/CsvParserSession.html | 2 +-
.../apache/juneau/csv/CsvSerializerSession.html | 2 +-
.../juneau/dto/jsonschema/package-summary.html | 6 +-
.../org/apache/juneau/dto/swagger/Swagger.html | 128 +-
.../juneau/html/HtmlDocSerializerContext.html | 91 +-
.../juneau/html/HtmlDocSerializerSession.html | 24 +-
.../org/apache/juneau/html/HtmlParser.html | 49 +-
.../apache/juneau/html/HtmlParserSession.html | 2 +-
.../org/apache/juneau/html/HtmlSerializer.html | 6 +-
.../juneau/html/HtmlSerializerSession.html | 2 +-
.../org/apache/juneau/ini/ConfigFile.html | 4 +-
.../org/apache/juneau/ini/ConfigFileFormat.html | 4 +-
.../apache/juneau/ini/ConfigFileWrapped.html | 4 +-
.../org/apache/juneau/ini/ConfigMgr.html | 555 ---
.../org/apache/juneau/ini/ConfigUtils.html | 4 +-
.../org/apache/juneau/ini/package-frame.html | 2 +-
.../org/apache/juneau/ini/package-summary.html | 49 +-
.../org/apache/juneau/ini/package-tree.html | 2 +-
.../apache/juneau/jena/RdfCommonContext.html | 62 +-
.../org/apache/juneau/jena/RdfParser.N3.html | 4 +-
.../apache/juneau/jena/RdfParser.NTriple.html | 4 +-
.../apache/juneau/jena/RdfParser.Turtle.html | 4 +-
.../org/apache/juneau/jena/RdfParser.Xml.html | 4 +-
.../org/apache/juneau/jena/RdfParser.html | 39 +-
.../apache/juneau/jena/RdfParserSession.html | 2 +-
.../juneau/jena/RdfSerializerSession.html | 2 +-
.../org/apache/juneau/jena/package-summary.html | 16 +-
.../org/apache/juneau/jso/JsoParser.html | 2 +-
.../apache/juneau/json/JsonParser.Strict.html | 4 +-
.../org/apache/juneau/json/JsonParser.html | 49 +-
.../apache/juneau/json/JsonParserSession.html | 2 +-
.../juneau/json/JsonSerializerSession.html | 2 +-
.../org/apache/juneau/json/package-summary.html | 16 +-
.../juneau/microservice/Microservice.html | 14 +-
.../apache/juneau/microservice/Resource.html | 2 +-
.../juneau/microservice/ResourceGroup.html | 8 +-
.../juneau/microservice/ResourceJena.html | 6 +-
.../juneau/microservice/package-summary.html | 4 +-
.../microservice/resources/ConfigResource.html | 22 +-
.../resources/DirectoryResource.html | 2 +-
.../resources/LogsResource.FileResource.html | 22 +-
.../microservice/resources/LogsResource.html | 23 +-
.../apache/juneau/msgpack/MsgPackParser.html | 43 +-
.../juneau/msgpack/MsgPackParserSession.html | 2 +-
.../msgpack/MsgPackSerializerSession.html | 2 +-
.../apache/juneau/parser/InputStreamParser.html | 2 +-
.../org/apache/juneau/parser/Parser.html | 114 +-
.../org/apache/juneau/parser/ParserSession.html | 2 +-
.../org/apache/juneau/parser/ReaderParser.html | 2 +-
.../juneau/plaintext/PlainTextParser.html | 2 +-
.../org/apache/juneau/rest/ReaderResource.html | 4 +-
.../org/apache/juneau/rest/RestConfig.html | 206 +-
.../org/apache/juneau/rest/RestContext.html | 214 +-
.../org/apache/juneau/rest/RestRequest.html | 348 +-
.../org/apache/juneau/rest/RestResponse.html | 142 +-
.../apache/juneau/rest/RestServletDefault.html | 19 +-
.../org/apache/juneau/rest/RestUtils.html | 6 +-
.../org/apache/juneau/rest/annotation/Path.html | 13 +-
.../juneau/rest/annotation/RestMethod.html | 130 +-
.../juneau/rest/annotation/RestResource.html | 222 +-
.../org/apache/juneau/rest/client/RestCall.html | 429 +-
.../apache/juneau/rest/client/RestClient.html | 36 +-
.../juneau/rest/client/package-summary.html | 2 +-
.../rest/jena/RestServletJenaDefault.html | 19 +-
.../org/apache/juneau/rest/package-summary.html | 52 +-
.../juneau/serializer/SerializerSession.html | 2 +-
.../juneau/serializer/SerializerWriter.html | 4 +-
.../apache/juneau/serializer/StringObject.html | 411 --
.../juneau/serializer/WriterSerializer.html | 24 +-
.../apache/juneau/serializer/package-frame.html | 1 -
.../juneau/serializer/package-summary.html | 6 -
.../apache/juneau/serializer/package-tree.html | 1 -
.../apache/juneau/svl/vars/ConfigFileVar.html | 2 +-
.../apache/juneau/uon/UonParser.Decoding.html | 4 +-
.../org/apache/juneau/uon/UonParser.html | 65 +-
.../org/apache/juneau/uon/UonParserSession.html | 2 +-
.../apache/juneau/uon/UonSerializerSession.html | 2 +-
.../org/apache/juneau/uon/package-summary.html | 16 +-
.../juneau/urlencoding/UrlEncodingParser.html | 61 +-
.../urlencoding/UrlEncodingParserSession.html | 2 +-
.../UrlEncodingSerializerSession.html | 2 +-
.../juneau/urlencoding/package-summary.html | 16 +-
.../apidocs/org/apache/juneau/utils/Args.html | 8 +-
.../apidocs/org/apache/juneau/utils/IOPipe.html | 4 +-
.../apache/juneau/utils/PojoIntrospector.html | 10 +-
.../juneau/utils/ProcBuilder.Matcher.html | 4 +-
.../org/apache/juneau/utils/ZipFileList.html | 4 +-
.../org/apache/juneau/utils/package-frame.html | 5 +
.../apache/juneau/utils/package-summary.html | 50 +-
.../org/apache/juneau/utils/package-tree.html | 17 +
.../org/apache/juneau/xml/XmlParser.html | 51 +-
.../org/apache/juneau/xml/XmlParserSession.html | 2 +-
.../apache/juneau/xml/XmlSerializerSession.html | 2 +-
.../org/apache/juneau/xml/package-summary.html | 16 +-
content/site/apidocs/overview-summary.html | 197 +-
content/site/apidocs/overview-tree.html | 16 +-
content/site/apidocs/serialized-form.html | 15 +
.../src-html/org/apache/juneau/BeanContext.html | 786 ++--
.../src-html/org/apache/juneau/BeanSession.html | 14 +-
.../src-html/org/apache/juneau/ClassMeta.html | 2943 +++++++-------
.../src-html/org/apache/juneau/ObjectMap.html | 2 +-
.../juneau/PropertyStore.PropertyMap.html | 2 +-
.../org/apache/juneau/PropertyStore.html | 2 +-
.../org/apache/juneau/dto/swagger/Swagger.html | 1743 ++++----
.../apache/juneau/html/HtmlDocSerializer.html | 2 +-
.../juneau/html/HtmlDocSerializerContext.html | 475 ++-
.../juneau/html/HtmlDocSerializerSession.html | 14 +-
.../org/apache/juneau/html/HtmlParser.html | 506 ++-
.../apache/juneau/html/HtmlSerializer.Sq.html | 406 +-
.../juneau/html/HtmlSerializer.SqReadable.html | 406 +-
.../org/apache/juneau/html/HtmlSerializer.html | 406 +-
.../org/apache/juneau/ini/ConfigFile.html | 27 +-
.../org/apache/juneau/ini/ConfigMgr.html | 386 --
.../apache/juneau/jena/RdfCommonContext.html | 1081 +++--
.../org/apache/juneau/jena/RdfParser.N3.html | 611 +--
.../apache/juneau/jena/RdfParser.NTriple.html | 611 +--
.../apache/juneau/jena/RdfParser.Turtle.html | 611 +--
.../org/apache/juneau/jena/RdfParser.Xml.html | 611 +--
.../org/apache/juneau/jena/RdfParser.html | 611 +--
.../apache/juneau/json/JsonParser.Strict.html | 825 ++--
.../org/apache/juneau/json/JsonParser.html | 825 ++--
.../juneau/microservice/Microservice.html | 317 +-
.../apache/juneau/microservice/Resource.html | 2 +-
.../juneau/microservice/ResourceGroup.html | 86 +-
.../juneau/microservice/ResourceJena.html | 30 +-
.../microservice/resources/ConfigResource.html | 359 +-
.../DirectoryResource.FileResource.html | 6 +-
.../resources/DirectoryResource.html | 6 +-
.../resources/LogsResource.FileResource.html | 545 +--
.../microservice/resources/LogsResource.html | 545 +--
.../apache/juneau/msgpack/MsgPackParser.html | 65 +-
.../org/apache/juneau/parser/Parser.html | 327 +-
.../juneau/rest/ReaderResource.Builder.html | 4 +-
.../org/apache/juneau/rest/ReaderResource.html | 4 +-
.../org/apache/juneau/rest/RestConfig.html | 2097 +++++-----
.../org/apache/juneau/rest/RestContext.html | 2384 +++++------
.../org/apache/juneau/rest/RestLogger.NoOp.html | 2 +-
.../apache/juneau/rest/RestLogger.Normal.html | 2 +-
.../org/apache/juneau/rest/RestLogger.html | 2 +-
.../org/apache/juneau/rest/RestRequest.html | 3780 +++++++++---------
.../org/apache/juneau/rest/RestResponse.html | 844 ++--
.../apache/juneau/rest/RestServletDefault.html | 381 +-
.../org/apache/juneau/rest/RestUtils.html | 110 +-
.../org/apache/juneau/rest/annotation/Path.html | 37 +-
.../juneau/rest/annotation/RestMethod.html | 920 ++---
.../juneau/rest/annotation/RestResource.html | 1453 +++----
.../org/apache/juneau/rest/client/RestCall.html | 2731 +++++++------
.../apache/juneau/rest/client/RestClient.html | 1013 ++---
.../rest/jena/RestServletJenaDefault.html | 451 +--
.../rest/remoteable/RemoteableServlet.html | 69 +-
.../apache/juneau/serializer/StringObject.html | 155 -
.../juneau/serializer/WriterSerializer.html | 185 +-
.../apache/juneau/svl/vars/ConfigFileVar.html | 2 +-
.../apache/juneau/uon/UonParser.Decoding.html | 924 ++---
.../org/apache/juneau/uon/UonParser.html | 924 ++---
.../juneau/urlencoding/UrlEncodingParser.html | 873 ++--
.../apache/juneau/utils/PojoIntrospector.html | 196 +-
.../org/apache/juneau/xml/XmlParser.html | 604 ++-
168 files changed, 20414 insertions(+), 20973 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/allclasses-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/allclasses-frame.html b/content/site/apidocs/allclasses-frame.html
index 6b9a562..828673c 100644
--- a/content/site/apidocs/allclasses-frame.html
+++ b/content/site/apidocs/allclasses-frame.html
@@ -15,7 +15,9 @@
<li><a href="org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5" target="classFrame">A</a></li>
<li><a href="org/apache/juneau/dto/html5/Abbr.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Abbr</a></li>
<li><a href="org/apache/juneau/dto/html5/Address.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Address</a></li>
+<li><a href="org/apache/juneau/utils/AList.html" title="class in org.apache.juneau.utils" target="classFrame">AList</a></li>
<li><a href="org/apache/juneau/rest/client/AllowAllRedirects.html" title="class in org.apache.juneau.rest.client" target="classFrame">AllowAllRedirects</a></li>
+<li><a href="org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils" target="classFrame">AMap</a></li>
<li><a href="org/apache/juneau/transform/AnnotationBeanFilterBuilder.html" title="class in org.apache.juneau.transform" target="classFrame">AnnotationBeanFilterBuilder</a></li>
<li><a href="org/apache/juneau/dto/html5/Area.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Area</a></li>
<li><a href="org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils" target="classFrame">Args</a></li>
@@ -23,6 +25,7 @@
<li><a href="org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal" target="classFrame">ArrayUtils</a></li>
<li><a href="org/apache/juneau/dto/html5/Article.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Article</a></li>
<li><a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal" target="classFrame">AsciiSet</a></li>
+<li><a href="org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils" target="classFrame">ASet</a></li>
<li><a href="org/apache/juneau/dto/html5/Aside.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Aside</a></li>
<li><a href="org/apache/juneau/dto/atom/AtomBuilder.html" title="class in org.apache.juneau.dto.atom" target="classFrame">AtomBuilder</a></li>
<li><a href="org/apache/juneau/dto/html5/Audio.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Audio</a></li>
@@ -112,12 +115,12 @@
<li><a href="org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom" target="classFrame">CommonEntry</a></li>
<li><a href="org/apache/juneau/ConfigException.html" title="class in org.apache.juneau" target="classFrame">ConfigException</a></li>
<li><a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFile</a></li>
+<li><a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileBuilder</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini" target="classFrame">ConfigFileFormat</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileImpl</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileListener</a></li>
<li><a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">ConfigFileVar</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileWrapped</a></li>
-<li><a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigMgr</a></li>
<li><a href="org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources" target="classFrame">ConfigResource</a></li>
<li><a href="org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigUtils</a></li>
<li><a href="org/apache/juneau/jena/Constants.html" title="class in org.apache.juneau.jena" target="classFrame">Constants</a></li>
@@ -552,7 +555,8 @@
<li><a href="org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest" target="classFrame">StreamResource</a></li>
<li><a href="org/apache/juneau/rest/StreamResource.Builder.html" title="class in org.apache.juneau.rest" target="classFrame">StreamResource.Builder</a></li>
<li><a href="org/apache/juneau/internal/StringBuilderWriter.html" title="class in org.apache.juneau.internal" target="classFrame">StringBuilderWriter</a></li>
-<li><a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer" target="classFrame">StringObject</a></li>
+<li><a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils" target="classFrame">StringMessage</a></li>
+<li><a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils" target="classFrame">StringObject</a></li>
<li><a href="org/apache/juneau/transform/StringSwap.html" title="class in org.apache.juneau.transform" target="classFrame">StringSwap</a></li>
<li><a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal" target="classFrame">StringUtils</a></li>
<li><a href="org/apache/juneau/dto/html5/Strong.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Strong</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/allclasses-noframe.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/allclasses-noframe.html b/content/site/apidocs/allclasses-noframe.html
index b888141..769d925 100644
--- a/content/site/apidocs/allclasses-noframe.html
+++ b/content/site/apidocs/allclasses-noframe.html
@@ -15,7 +15,9 @@
<li><a href="org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a></li>
<li><a href="org/apache/juneau/dto/html5/Abbr.html" title="class in org.apache.juneau.dto.html5">Abbr</a></li>
<li><a href="org/apache/juneau/dto/html5/Address.html" title="class in org.apache.juneau.dto.html5">Address</a></li>
+<li><a href="org/apache/juneau/utils/AList.html" title="class in org.apache.juneau.utils">AList</a></li>
<li><a href="org/apache/juneau/rest/client/AllowAllRedirects.html" title="class in org.apache.juneau.rest.client">AllowAllRedirects</a></li>
+<li><a href="org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils">AMap</a></li>
<li><a href="org/apache/juneau/transform/AnnotationBeanFilterBuilder.html" title="class in org.apache.juneau.transform">AnnotationBeanFilterBuilder</a></li>
<li><a href="org/apache/juneau/dto/html5/Area.html" title="class in org.apache.juneau.dto.html5">Area</a></li>
<li><a href="org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils">Args</a></li>
@@ -23,6 +25,7 @@
<li><a href="org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal">ArrayUtils</a></li>
<li><a href="org/apache/juneau/dto/html5/Article.html" title="class in org.apache.juneau.dto.html5">Article</a></li>
<li><a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a></li>
+<li><a href="org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils">ASet</a></li>
<li><a href="org/apache/juneau/dto/html5/Aside.html" title="class in org.apache.juneau.dto.html5">Aside</a></li>
<li><a href="org/apache/juneau/dto/atom/AtomBuilder.html" title="class in org.apache.juneau.dto.atom">AtomBuilder</a></li>
<li><a href="org/apache/juneau/dto/html5/Audio.html" title="class in org.apache.juneau.dto.html5">Audio</a></li>
@@ -112,12 +115,12 @@
<li><a href="org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom">CommonEntry</a></li>
<li><a href="org/apache/juneau/ConfigException.html" title="class in org.apache.juneau">ConfigException</a></li>
<li><a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></li>
+<li><a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini">ConfigFileFormat</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a></li>
<li><a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars">ConfigFileVar</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></li>
-<li><a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></li>
<li><a href="org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources">ConfigResource</a></li>
<li><a href="org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini">ConfigUtils</a></li>
<li><a href="org/apache/juneau/jena/Constants.html" title="class in org.apache.juneau.jena">Constants</a></li>
@@ -552,7 +555,8 @@
<li><a href="org/apache/juneau/rest/StreamResource.html" title="class in org.apache.juneau.rest">StreamResource</a></li>
<li><a href="org/apache/juneau/rest/StreamResource.Builder.html" title="class in org.apache.juneau.rest">StreamResource.Builder</a></li>
<li><a href="org/apache/juneau/internal/StringBuilderWriter.html" title="class in org.apache.juneau.internal">StringBuilderWriter</a></li>
-<li><a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></li>
+<li><a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></li>
+<li><a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></li>
<li><a href="org/apache/juneau/transform/StringSwap.html" title="class in org.apache.juneau.transform">StringSwap</a></li>
<li><a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></li>
<li><a href="org/apache/juneau/dto/html5/Strong.html" title="class in org.apache.juneau.dto.html5">Strong</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/constant-values.html b/content/site/apidocs/constant-values.html
index c6a0949..f02ae23 100644
--- a/content/site/apidocs/constant-values.html
+++ b/content/site/apidocs/constant-values.html
@@ -405,33 +405,33 @@
<td class="colLast"><code>"HtmlDocSerializer.cssUrl"</code></td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><a name="org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_description">
-<!-- -->
-</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td><code><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_description">HTMLDOC_description</a></code></td>
-<td class="colLast"><code>"HtmlSerializer.description"</code></td>
-</tr>
-<tr class="altColor">
<td class="colFirst"><a name="org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_links">
<!-- -->
</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_links">HTMLDOC_links</a></code></td>
<td class="colLast"><code>"HtmlDocSerializer.links.map"</code></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a name="org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_links_put">
<!-- -->
</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_links_put">HTMLDOC_links_put</a></code></td>
<td class="colLast"><code>"HtmlDocSerializer.links.map.put"</code></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a name="org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_nowrap">
<!-- -->
</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_nowrap">HTMLDOC_nowrap</a></code></td>
<td class="colLast"><code>"HtmlDocSerializer.nowrap"</code></td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_text">
+<!-- -->
+</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_text">HTMLDOC_text</a></code></td>
+<td class="colLast"><code>"HtmlSerializer.description"</code></td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><a name="org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_title">
<!-- -->
[43/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/jena/RdfParser.Turtle.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfParser.Turtle.html b/content/site/apidocs/org/apache/juneau/jena/RdfParser.Turtle.html
index 808ecef..a6f9460 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfParser.Turtle.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfParser.Turtle.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.jena.<a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class in org.apache.juneau.jena">RdfParser</a></h3>
-<code><a href="../../../../org/apache/juneau/jena/RdfParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></code></li>
+<code><a href="../../../../org/apache/juneau/jena/RdfParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.parser.ReaderParser">
@@ -237,7 +237,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parse
r/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href=".
./../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/jena/RdfParser.Xml.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfParser.Xml.html b/content/site/apidocs/org/apache/juneau/jena/RdfParser.Xml.html
index 84bb6d1..e977092 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfParser.Xml.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfParser.Xml.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.jena.<a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class in org.apache.juneau.jena">RdfParser</a></h3>
-<code><a href="../../../../org/apache/juneau/jena/RdfParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></code></li>
+<code><a href="../../../../org/apache/juneau/jena/RdfParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.parser.ReaderParser">
@@ -237,7 +237,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parse
r/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href=".
./../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/jena/RdfParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfParser.html b/content/site/apidocs/org/apache/juneau/jena/RdfParser.html
index ad6be87..cf74203 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfParser.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfParser.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var methods = {"i0":10,"i1":10,"i2":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -298,13 +298,6 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<div class="block">Workhorse method.</div>
</td>
</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>protected <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></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/jena/RdfParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)</code>
-<div class="block">Implementation method.</div>
-</td>
-</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.parser.ReaderParser">
@@ -318,7 +311,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parse
r/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes-
-">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href=".
./../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
@@ -465,39 +458,13 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
</dl>
</li>
</ul>
-<a name="doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>doParseArgs</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[] <a href="../../../../src-html/org/apache/juneau/jena/RdfParser.html#line.466">doParseArgs</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">Parser</a></code></span></div>
-<div class="block">Implementation method.
- Default implementation throws an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/UnsupportedOperationException.html?is-external=true" title="class or interface in java.lang"><code>UnsupportedOperationException</code></a>.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></code> in class <code><a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The runtime session object returned by <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-"><code>Parser.createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</code></a>.
- If <jk>null</jk>, one will be created using <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-"><code>Parser.createSession(Object)</code></a>.</dd>
-<dd><code>argTypes</code> - Specifies the type of objects to create for each entry in the array.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>An array of parsed objects.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code> - If thrown from underlying stream, or if the input contains a syntax error or is malformed.</dd>
-</dl>
-</li>
-</ul>
<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/jena/RdfParserSession.html" title="class in org.apache.juneau.jena">RdfParserSession</a> <a href="../../../../src-html/org/apache/juneau/jena/RdfParser.html#line.476">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
+<pre>public <a href="../../../../org/apache/juneau/jena/RdfParserSession.html" title="class in org.apache.juneau.jena">RdfParserSession</a> <a href="../../../../src-html/org/apache/juneau/jena/RdfParser.html#line.477">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> op,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> javaMethod,
<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> outer,
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/jena/RdfParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfParserSession.html b/content/site/apidocs/org/apache/juneau/jena/RdfParserSession.html
index 27255ed..9d9877f 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfParserSession.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfParserSession.html
@@ -265,7 +265,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title=
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/jena/RdfSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfSerializerSession.html b/content/site/apidocs/org/apache/juneau/jena/RdfSerializerSession.html
index 191f1b7..62a1ad7 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfSerializerSession.html
@@ -309,7 +309,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/jena/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/package-summary.html b/content/site/apidocs/org/apache/juneau/jena/package-summary.html
index b5fc302..d7e6b1f 100644
--- a/content/site/apidocs/org/apache/juneau/jena/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/jena/package-summary.html
@@ -1284,14 +1284,14 @@
// Consists of an in-memory address book repository.</jc>
<ja>@RestResource</ja>(
messages=<js>"nls/AddressBookResource"</js>,
+ title=<js>"$L{title}"</js>,
+ description=<js>"$L{description}"</js>,
+ pageLinks=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>,
properties={
<ja>@Property</ja>(name=RdfProperties.<jsf>RDF_rdfxml_tab</jsf>, value=<js>"3"</js>),
<ja>@Property</ja>(name=RdfSerializerContext.<jsf>RDF_addRootProperty</jsf>, value=<js>"true"</js>),
<ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
- <ja>@Property</ja>(name=HtmlSerializerContext.<jsf>HTML_uriAnchorText</jsf>, value=<jsf>TO_STRING</jsf>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, value=<js>"$L{title}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"$L{description}"</js>),
- <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>)
+ <ja>@Property</ja>(name=HtmlSerializerContext.<jsf>HTML_uriAnchorText</jsf>, value=<jsf>TO_STRING</jsf>)
},
encoders=GzipEncoder.<jk>class</jk>
)
@@ -1321,8 +1321,8 @@
<p class='bcode'>
<jc>// GET person request handler</jc>
<ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/people/{id}/*"</js>, rc={200,404})
- <jk>public</jk> Person getPerson(RestRequest req, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
- properties.put(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, req.getPathInfo());
+ <jk>public</jk> Person getPerson(RestRequest req, RestResponse res, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
+ res.setPageTitle(req.getPathInfo());
<jk>return</jk> findPerson(id);
}
@@ -1384,8 +1384,8 @@
<ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>)
}
)
- <jk>public</jk> Person getPerson(RestRequest req, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
- properties.put(HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, req.getPathInfo());
+ <jk>public</jk> Person getPerson(RestRequest req, RestResponse res, <ja>@Path</ja> <jk>int</jk> id) throws Exception {
+ res.setPageTitle(req.getPathInfo());
<jk>return</jk> findPerson(id);
}
</p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/jso/JsoParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jso/JsoParser.html b/content/site/apidocs/org/apache/juneau/jso/JsoParser.html
index 3c9ce8d..1b7c340 100644
--- a/content/site/apidocs/org/apache/juneau/jso/JsoParser.html
+++ b/content/site/apidocs/org/apache/juneau/jso/JsoParser.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" ti
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lan
g.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parse
r/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a h
ref="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-ja
va.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#p
arseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/json/JsonParser.Strict.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonParser.Strict.html b/content/site/apidocs/org/apache/juneau/json/JsonParser.Strict.html
index 8d4024f..49acfb9 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonParser.Strict.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonParser.Strict.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/json/JsonParser.html" title="clas
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.json.<a href="../../../../org/apache/juneau/json/JsonParser.html" title="class in org.apache.juneau.json">JsonParser</a></h3>
-<code><a href="../../../../org/apache/juneau/json/JsonParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/json/JsonParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/json/JsonParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/json/JsonParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a>, <a href="../../../../org/apache/juneau/json/JsonParser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/json/JsonParser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.l
ang.reflect.Type-">doParseIntoMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/json/JsonParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/json/JsonParser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/json/JsonParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/json/JsonParser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/json/JsonParser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.parser.ReaderParser">
@@ -236,7 +236,7 @@ extends <a href="../../../../org/apache/juneau/json/JsonParser.html" title="clas
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.
ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.
apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/json/JsonParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonParser.html b/content/site/apidocs/org/apache/juneau/json/JsonParser.html
index 43b3dad..33e7341 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonParser.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonParser.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -306,13 +306,6 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
</td>
</tr>
<tr id="i3" class="rowColor">
-<td class="colFirst"><code>protected <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></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/json/JsonParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)</code>
-<div class="block">Implementation method.</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
<td class="colFirst"><code>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/json/JsonParser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> c,
@@ -320,7 +313,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<div class="block">Implementation method.</div>
</td>
</tr>
-<tr id="i5" class="rowColor">
+<tr id="i4" class="altColor">
<td class="colFirst"><code>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/json/JsonParser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
@@ -342,7 +335,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.
ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-jav
a.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.
apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
@@ -446,7 +439,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/json/JsonParserSession.html" title="class in org.apache.juneau.json">JsonParserSession</a> <a href="../../../../src-html/org/apache/juneau/json/JsonParser.html#line.810">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
+<pre>public <a href="../../../../org/apache/juneau/json/JsonParserSession.html" title="class in org.apache.juneau.json">JsonParserSession</a> <a href="../../../../src-html/org/apache/juneau/json/JsonParser.html#line.766">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input,
<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> op,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> javaMethod,
<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> outer,
@@ -484,7 +477,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>doParse</h4>
-<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/json/JsonParser.html#line.815">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/json/JsonParser.html#line.771">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> type)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">Parser</a></code></span></div>
@@ -513,7 +506,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<ul class="blockList">
<li class="blockList">
<h4>doParseIntoMap</h4>
-<pre>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> <a href="../../../../src-html/org/apache/juneau/json/JsonParser.html#line.826">doParseIntoMap</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <K,V> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> <a href="../../../../src-html/org/apache/juneau/json/JsonParser.html#line.782">doParseIntoMap</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V> m,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> keyType,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> valueType)
@@ -540,10 +533,10 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<a name="doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">
<!-- -->
</a>
-<ul class="blockList">
+<ul class="blockListLast">
<li class="blockList">
<h4>doParseIntoCollection</h4>
-<pre>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> <a href="../../../../src-html/org/apache/juneau/json/JsonParser.html#line.835">doParseIntoCollection</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
+<pre>protected <E> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> <a href="../../../../src-html/org/apache/juneau/json/JsonParser.html#line.791">doParseIntoCollection</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><E> c,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> elementType)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -565,32 +558,6 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
</dl>
</li>
</ul>
-<a name="doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>doParseArgs</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>[] <a href="../../../../src-html/org/apache/juneau/json/JsonParser.html#line.844">doParseArgs</a>(<a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a> session,
- <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] argTypes)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">Parser</a></code></span></div>
-<div class="block">Implementation method.
- Default implementation throws an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/UnsupportedOperationException.html?is-external=true" title="class or interface in java.lang"><code>UnsupportedOperationException</code></a>.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a></code> in class <code><a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The runtime session object returned by <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-"><code>Parser.createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</code></a>.
- If <jk>null</jk>, one will be created using <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-"><code>Parser.createSession(Object)</code></a>.</dd>
-<dd><code>argTypes</code> - Specifies the type of objects to create for each entry in the array.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>An array of parsed objects.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code> - If thrown from underlying stream, or if the input contains a syntax error or is malformed.</dd>
-</dl>
-</li>
-</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/json/JsonParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonParserSession.html b/content/site/apidocs/org/apache/juneau/json/JsonParserSession.html
index c52cd42..c06b2bc 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonParserSession.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonParserSession.html
@@ -209,7 +209,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title=
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
[03/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/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 614eedb..f3b0a35 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
@@ -58,478 +58,500 @@
<span class="sourceLineNo">050</span> * <li><js>""</js> - Auto-detect.<a name="line.50"></a>
<span class="sourceLineNo">051</span> * <br>The method name is determined based on the Java method name.<a name="line.51"></a>
<span class="sourceLineNo">052</span> * <br>For example, if the method is <code>doPost(...)</code>, then the method name is automatically detected as <js>"POST"</js>.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <li><js>"PROXY"</js> - Remote-proxy interface.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * <br>This denotes a Java method that returns an object (usually an interface, often annotated with the {@link Remoteable @Remoteable} annotation)<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * to be used as a remote proxy using <code>RestClient.getRemoteableProxy(Class<T> interfaceClass, String url)</code>.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <br>This allows you to construct client-side interface proxies using REST as a transport medium.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <br>Conceptually, this is simply a fancy <code>POST</code> against the url <js>"/{path}/{javaMethodName}"</js> where the arguments<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * are marshalled from the client to the server as an HTTP body containing an array of objects,<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * passed to the method as arguments, and then the resulting object is marshalled back to the client.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <li>Anything else - Overloaded non-HTTP-standard names that are passed in through a <code>&amp;method=methodName</code> URL parameter.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * </ul><a name="line.61"></a>
-<span class="sourceLineNo">062</span> */<a name="line.62"></a>
-<span class="sourceLineNo">063</span> String name() default "";<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span> /**<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * Optional path pattern for the specified method.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * <p><a name="line.67"></a>
-<span class="sourceLineNo">068</span> * Appending <js>"/*"</js> to the end of the path pattern will make it match any remainder too.<br><a name="line.68"></a>
-<span class="sourceLineNo">069</span> * Not appending <js>"/*"</js> to the end of the pattern will cause a 404 (Not found) error to occur<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * if the exact pattern is not found.<a name="line.70"></a>
-<span class="sourceLineNo">071</span> */<a name="line.71"></a>
-<span class="sourceLineNo">072</span> String path() default "/*";<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> /**<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * URL path pattern priority.<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * <p><a name="line.76"></a>
-<span class="sourceLineNo">077</span> * To force path patterns to be checked before other path patterns, use a higher priority number.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * <p><a name="line.78"></a>
-<span class="sourceLineNo">079</span> * By default, it's <code>0</code>, which means it will use an internal heuristic to<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * determine a best match.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> */<a name="line.81"></a>
-<span class="sourceLineNo">082</span> int priority() default 0;<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> /**<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * Method guards.<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * <p><a name="line.86"></a>
-<span class="sourceLineNo">087</span> * Associates one or more {@link RestGuard RestGuards} with a method call.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * These guards get called immediately before execution of the REST method.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * <p><a name="line.89"></a>
-<span class="sourceLineNo">090</span> * Typically, guards will be used for permissions checking on the user making the request,<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * but it can also be used for other purposes like pre-call validation of a request.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> */<a name="line.92"></a>
-<span class="sourceLineNo">093</span> Class<? extends RestGuard>[] guards() default {};<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> * Method response converters.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * <p><a name="line.97"></a>
-<span class="sourceLineNo">098</span> * Associates one or more {@link RestConverter RestConverters} with a method call.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * These converters get called immediately after execution of the REST method in the same<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * order specified in the annotation.<a name="line.100"></a>
+<span class="sourceLineNo">053</span> * <br>Otherwise, defaults to <js>"GET"</js>.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <li><js>"PROXY"</js> - Remote-proxy interface.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * <br>This denotes a Java method that returns an object (usually an interface, often annotated with the {@link Remoteable @Remoteable} annotation)<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * to be used as a remote proxy using <code>RestClient.getRemoteableProxy(Class<T> interfaceClass, String url)</code>.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <br>This allows you to construct client-side interface proxies using REST as a transport medium.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * <br>Conceptually, this is simply a fancy <code>POST</code> against the url <js>"/{path}/{javaMethodName}"</js> where the arguments<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * are marshalled from the client to the server as an HTTP body containing an array of objects,<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * passed to the method as arguments, and then the resulting object is marshalled back to the client.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <li>Anything else - Overloaded non-HTTP-standard names that are passed in through a <code>&amp;method=methodName</code> URL parameter.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * </ul><a name="line.62"></a>
+<span class="sourceLineNo">063</span> */<a name="line.63"></a>
+<span class="sourceLineNo">064</span> String name() default "";<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * Optional path pattern for the specified method.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <p><a name="line.68"></a>
+<span class="sourceLineNo">069</span> * Appending <js>"/*"</js> to the end of the path pattern will make it match any remainder too.<br><a name="line.69"></a>
+<span class="sourceLineNo">070</span> * Not appending <js>"/*"</js> to the end of the pattern will cause a 404 (Not found) error to occur<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * if the exact pattern is not found.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <p><a name="line.72"></a>
+<span class="sourceLineNo">073</span> * The path can contain variables that get resolved to {@link Path @Path} parameters:<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * <p class='bcode'><a name="line.74"></a>
+<span class="sourceLineNo">075</span> * <jc>// Example 1</jc><a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)<a name="line.76"></a>
+<span class="sourceLineNo">077</span> *<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <jc>// Example 2</jc><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{0}/{1}/{2}/*"</js>)<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * </p><a name="line.80"></a>
+<span class="sourceLineNo">081</span> * <p><a name="line.81"></a>
+<span class="sourceLineNo">082</span> * Refer to {@link Path @Path} on how path variables get resolved.<a name="line.82"></a>
+<span class="sourceLineNo">083</span> */<a name="line.83"></a>
+<span class="sourceLineNo">084</span> String path() default "/*";<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> /**<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * URL path pattern priority.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <p><a name="line.88"></a>
+<span class="sourceLineNo">089</span> * To force path patterns to be checked before other path patterns, use a higher priority number.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * <p><a name="line.90"></a>
+<span class="sourceLineNo">091</span> * By default, it's <code>0</code>, which means it will use an internal heuristic to<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * determine a best match.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> */<a name="line.93"></a>
+<span class="sourceLineNo">094</span> int priority() default 0;<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span> /**<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * Method guards.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * <p><a name="line.98"></a>
+<span class="sourceLineNo">099</span> * Associates one or more {@link RestGuard RestGuards} with a method call.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * These guards get called immediately before execution of the REST method.<a name="line.100"></a>
<span class="sourceLineNo">101</span> * <p><a name="line.101"></a>
-<span class="sourceLineNo">102</span> * Can be used for performing post-processing on the response object before serialization.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * <p><a name="line.103"></a>
-<span class="sourceLineNo">104</span> * Default converters are available in the <a class='doclink' href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package.<a name="line.104"></a>
-<span class="sourceLineNo">105</span> */<a name="line.105"></a>
-<span class="sourceLineNo">106</span> Class<? extends RestConverter>[] converters() default {};<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> /**<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * Method matchers.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * <p><a name="line.110"></a>
-<span class="sourceLineNo">111</span> * Associates one more more {@link RestMatcher RestMatchers} with this method.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * <p><a name="line.112"></a>
-<span class="sourceLineNo">113</span> * Matchers are used to allow multiple Java methods to handle requests assigned to the same<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * URL path pattern, but differing based on some request attribute, such as a specific header value.<a name="line.114"></a>
+<span class="sourceLineNo">102</span> * Typically, guards will be used for permissions checking on the user making the request,<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * but it can also be used for other purposes like pre-call validation of a request.<a name="line.103"></a>
+<span class="sourceLineNo">104</span> */<a name="line.104"></a>
+<span class="sourceLineNo">105</span> Class<? extends RestGuard>[] guards() default {};<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * Method response converters.<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <p><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * Associates one or more {@link RestConverter RestConverters} with a method call.<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * These converters get called immediately after execution of the REST method in the same<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * order specified in the annotation.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * <p><a name="line.113"></a>
+<span class="sourceLineNo">114</span> * Can be used for performing post-processing on the response object before serialization.<a name="line.114"></a>
<span class="sourceLineNo">115</span> * <p><a name="line.115"></a>
-<span class="sourceLineNo">116</span> * See {@link RestMatcher} for details.<a name="line.116"></a>
+<span class="sourceLineNo">116</span> * Default converters are available in the <a class='doclink' href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package.<a name="line.116"></a>
<span class="sourceLineNo">117</span> */<a name="line.117"></a>
-<span class="sourceLineNo">118</span> Class<? extends RestMatcher>[] matchers() default {};<a name="line.118"></a>
+<span class="sourceLineNo">118</span> Class<? extends RestConverter>[] converters() default {};<a name="line.118"></a>
<span class="sourceLineNo">119</span><a name="line.119"></a>
<span class="sourceLineNo">120</span> /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * Overrides the list of serializers assigned at the method level.<a name="line.121"></a>
+<span class="sourceLineNo">121</span> * Method matchers.<a name="line.121"></a>
<span class="sourceLineNo">122</span> * <p><a name="line.122"></a>
-<span class="sourceLineNo">123</span> * Use this annotation when the list of serializers assigned to a method differs from the list of serializers assigned at the servlet level.<a name="line.123"></a>
+<span class="sourceLineNo">123</span> * Associates one more more {@link RestMatcher RestMatchers} with this method.<a name="line.123"></a>
<span class="sourceLineNo">124</span> * <p><a name="line.124"></a>
-<span class="sourceLineNo">125</span> * To append to the list of serializers assigned at the servlet level, use <code>serializersInherit=<jsf>SERIALIZERS</jsf></code>.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> *<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * <p class='bcode'><a name="line.127"></a>
-<span class="sourceLineNo">128</span> * <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> *<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * <ja>@RestMethod</ja>(<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * name=<js>"GET"</js>,<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * path=<js>"/foo"</js>,<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * serializers=MySpecialSerializer.<jk>class</jk>,<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * serializersInherit=<jsf>SERIALIZERS</jsf><a name="line.134"></a>
-<span class="sourceLineNo">135</span> * )<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * <jk>public</jk> Object doGetWithSpecialAcceptType() {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * <jc>// Handle request for special Accept type</jc><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> * </p><a name="line.140"></a>
-<span class="sourceLineNo">141</span> */<a name="line.141"></a>
-<span class="sourceLineNo">142</span> Class<? extends Serializer>[] serializers() default {};<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> * Used in conjunction with {@link #serializers()} to identify what class-level settings are inherited by the method serializer group.<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * <p><a name="line.146"></a>
-<span class="sourceLineNo">147</span> * Possible values:<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * <ul><a name="line.148"></a>
-<span class="sourceLineNo">149</span> * <li>{@link Inherit#SERIALIZERS} - Inherit class-level serializers.<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * <li>{@link Inherit#PROPERTIES} - Inherit class-level properties.<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * <li>{@link Inherit#TRANSFORMS} - Inherit class-level transforms.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * </ul><a name="line.152"></a>
-<span class="sourceLineNo">153</span> * <p><a name="line.153"></a>
-<span class="sourceLineNo">154</span> * For example, to inherit all serializers, properties, and transforms from the servlet class:<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * </p><a name="line.155"></a>
-<span class="sourceLineNo">156</span> * <p class='bcode'><a name="line.156"></a>
-<span class="sourceLineNo">157</span> * <ja>@RestMethod</ja>(<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * path=<js>"/foo"</js>,<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * serializers=MySpecialSerializer.<jk>class</jk>,<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * serializersInherit={<jsf>SERIALIZERS</jsf>,<jsf>PROPERTIES</jsf>,<jsf>TRANSFORMS</jsf>}<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * )<a name="line.161"></a>
-<span class="sourceLineNo">162</span> * </p><a name="line.162"></a>
-<span class="sourceLineNo">163</span> */<a name="line.163"></a>
-<span class="sourceLineNo">164</span> Inherit[] serializersInherit() default {};<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>
-<span class="sourceLineNo">167</span> * Overrides the list of parsers assigned at the method level.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * <p><a name="line.168"></a>
-<span class="sourceLineNo">169</span> * Use this annotation when the list of parsers assigned to a method differs from the list of parsers assigned at the servlet level.<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * <p><a name="line.170"></a>
-<span class="sourceLineNo">171</span> * To append to the list of serializers assigned at the servlet level, use <code>serializersInherit=<jsf>SERIALIZERS</jsf></code>.<a name="line.171"></a>
-<span class="sourceLineNo">172</span> *<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * <p class='bcode'><a name="line.173"></a>
-<span class="sourceLineNo">174</span> * <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> *<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * <ja>@RestMethod</ja>(<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * name=<js>"PUT"</js>,<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * path=<js>"/foo"</js>,<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * parsers=MySpecialParser.<jk>class</jk>,<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * parsersInherit=<jsf>PARSERS</jsf><a name="line.180"></a>
-<span class="sourceLineNo">181</span> * )<a name="line.181"></a>
-<span class="sourceLineNo">182</span> * <jk>public</jk> Object doGetWithSpecialAcceptType() {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * <jc>// Handle request for special Accept type</jc><a name="line.183"></a>
-<span class="sourceLineNo">184</span> * }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * </p><a name="line.186"></a>
-<span class="sourceLineNo">187</span> */<a name="line.187"></a>
-<span class="sourceLineNo">188</span> Class<? extends Parser>[] parsers() default {};<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> /**<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * Used in conjunction with {@link #parsers()} to identify what class-level settings are inherited by the method parser group.<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * <p><a name="line.192"></a>
-<span class="sourceLineNo">193</span> * Possible values:<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * <ul><a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <li>{@link Inherit#PARSERS} - Inherit class-level parsers.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * <li>{@link Inherit#PROPERTIES} - Inherit class-level properties.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * <li>{@link Inherit#TRANSFORMS} - Inherit class-level transforms.<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * </ul><a name="line.198"></a>
-<span class="sourceLineNo">199</span> * <p><a name="line.199"></a>
-<span class="sourceLineNo">200</span> * For example, to inherit all parsers, properties, and transforms from the servlet class:<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * <p class='bcode'><a name="line.201"></a>
-<span class="sourceLineNo">202</span> * <ja>@RestMethod</ja>(<a name="line.202"></a>
-<span class="sourceLineNo">203</span> * path=<js>"/foo"</js>,<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * parsers=MySpecialParser.<jk>class</jk>,<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * parsersInherit={<jsf>PARSERS</jsf>,<jsf>PROPERTIES</jsf>,<jsf>TRANSFORMS</jsf>}<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * )<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * </p><a name="line.207"></a>
-<span class="sourceLineNo">208</span> */<a name="line.208"></a>
-<span class="sourceLineNo">209</span> Inherit[] parsersInherit() default {};<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> /**<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * Appends to the list of {@link Encoder encoders} specified on the servlet.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * <p><a name="line.213"></a>
-<span class="sourceLineNo">214</span> * Use this annotation when the list of encoders assigned to a method differs from the list of encoders assigned at the servlet level.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * <p><a name="line.215"></a>
-<span class="sourceLineNo">216</span> * These can be used to enable various kinds of compression (e.g. <js>"gzip"</js>) on requests and responses.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> *<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * <p class='bcode'><a name="line.218"></a>
-<span class="sourceLineNo">219</span> * <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> *<a name="line.220"></a>
-<span class="sourceLineNo">221</span> * <ja>@RestMethod</ja>(<a name="line.221"></a>
-<span class="sourceLineNo">222</span> * name=<js>"PUT"</js>,<a name="line.222"></a>
-<span class="sourceLineNo">223</span> * path=<js>"/foo"</js>,<a name="line.223"></a>
-<span class="sourceLineNo">224</span> * encoders={GzipEncoder.<jk>class</jk>}<a name="line.224"></a>
-<span class="sourceLineNo">225</span> * )<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * <jk>public</jk> Object doGetWithSpecialEncoding() {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * <jc>// Handle request with special encoding</jc><a name="line.227"></a>
-<span class="sourceLineNo">228</span> * }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> * }<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * </p><a name="line.230"></a>
-<span class="sourceLineNo">231</span> * <p><a name="line.231"></a>
-<span class="sourceLineNo">232</span> * If you want to OVERRIDE the set of encoders specified by the servlet, combine this annotation with <code><ja>@RestMethod</ja>(inheritEncoders=<jk>false</jk>)</code>.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> */<a name="line.233"></a>
-<span class="sourceLineNo">234</span> Class<? extends Encoder>[] encoders() default {};<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> /**<a name="line.236"></a>
-<span class="sourceLineNo">237</span> * Specifies whether the method should inherit encoders from the servlet.<a name="line.237"></a>
-<span class="sourceLineNo">238</span> */<a name="line.238"></a>
-<span class="sourceLineNo">239</span> boolean inheritEncoders() default true;<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> /**<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * Same as {@link RestResource#properties()}, except defines property values by default when this method is called.<a name="line.242"></a>
+<span class="sourceLineNo">125</span> * Matchers are used to allow multiple Java methods to handle requests assigned to the same<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * URL path pattern, but differing based on some request attribute, such as a specific header value.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * <p><a name="line.127"></a>
+<span class="sourceLineNo">128</span> * See {@link RestMatcher} for details.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> Class<? extends RestMatcher>[] matchers() default {};<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * Overrides the list of serializers assigned at the method level.<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * <p><a name="line.134"></a>
+<span class="sourceLineNo">135</span> * Use this annotation when the list of serializers assigned to a method differs from the list of serializers assigned at the servlet level.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * <p><a name="line.136"></a>
+<span class="sourceLineNo">137</span> * To append to the list of serializers assigned at the servlet level, use <code>serializersInherit=<jsf>SERIALIZERS</jsf></code>.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> *<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * <p class='bcode'><a name="line.139"></a>
+<span class="sourceLineNo">140</span> * <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> *<a name="line.141"></a>
+<span class="sourceLineNo">142</span> * <ja>@RestMethod</ja>(<a name="line.142"></a>
+<span class="sourceLineNo">143</span> * name=<js>"GET"</js>,<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * path=<js>"/foo"</js>,<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * serializers=MySpecialSerializer.<jk>class</jk>,<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * serializersInherit=<jsf>SERIALIZERS</jsf><a name="line.146"></a>
+<span class="sourceLineNo">147</span> * )<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <jk>public</jk> Object doGetWithSpecialAcceptType() {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * <jc>// Handle request for special Accept type</jc><a name="line.149"></a>
+<span class="sourceLineNo">150</span> * }<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * }<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * </p><a name="line.152"></a>
+<span class="sourceLineNo">153</span> */<a name="line.153"></a>
+<span class="sourceLineNo">154</span> Class<? extends Serializer>[] serializers() default {};<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> * Used in conjunction with {@link #serializers()} to identify what class-level settings are inherited by the method serializer group.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * <p><a name="line.158"></a>
+<span class="sourceLineNo">159</span> * Possible values:<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * <ul><a name="line.160"></a>
+<span class="sourceLineNo">161</span> * <li>{@link Inherit#SERIALIZERS} - Inherit class-level serializers.<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * <li>{@link Inherit#PROPERTIES} - Inherit class-level properties.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * <li>{@link Inherit#TRANSFORMS} - Inherit class-level transforms.<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * </ul><a name="line.164"></a>
+<span class="sourceLineNo">165</span> * <p><a name="line.165"></a>
+<span class="sourceLineNo">166</span> * For example, to inherit all serializers, properties, and transforms from the servlet class:<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * </p><a name="line.167"></a>
+<span class="sourceLineNo">168</span> * <p class='bcode'><a name="line.168"></a>
+<span class="sourceLineNo">169</span> * <ja>@RestMethod</ja>(<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * path=<js>"/foo"</js>,<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * serializers=MySpecialSerializer.<jk>class</jk>,<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * serializersInherit={<jsf>SERIALIZERS</jsf>,<jsf>PROPERTIES</jsf>,<jsf>TRANSFORMS</jsf>}<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * )<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * </p><a name="line.174"></a>
+<span class="sourceLineNo">175</span> */<a name="line.175"></a>
+<span class="sourceLineNo">176</span> Inherit[] serializersInherit() default {};<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * Overrides the list of parsers assigned at the method level.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * <p><a name="line.180"></a>
+<span class="sourceLineNo">181</span> * Use this annotation when the list of parsers assigned to a method differs from the list of parsers assigned at the servlet level.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * <p><a name="line.182"></a>
+<span class="sourceLineNo">183</span> * To append to the list of serializers assigned at the servlet level, use <code>serializersInherit=<jsf>SERIALIZERS</jsf></code>.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> *<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * <p class='bcode'><a name="line.185"></a>
+<span class="sourceLineNo">186</span> * <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> *<a name="line.187"></a>
+<span class="sourceLineNo">188</span> * <ja>@RestMethod</ja>(<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * name=<js>"PUT"</js>,<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * path=<js>"/foo"</js>,<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * parsers=MySpecialParser.<jk>class</jk>,<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * parsersInherit=<jsf>PARSERS</jsf><a name="line.192"></a>
+<span class="sourceLineNo">193</span> * )<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * <jk>public</jk> Object doGetWithSpecialAcceptType() {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * <jc>// Handle request for special Accept type</jc><a name="line.195"></a>
+<span class="sourceLineNo">196</span> * }<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * }<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * </p><a name="line.198"></a>
+<span class="sourceLineNo">199</span> */<a name="line.199"></a>
+<span class="sourceLineNo">200</span> Class<? extends Parser>[] parsers() default {};<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> /**<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * Used in conjunction with {@link #parsers()} to identify what class-level settings are inherited by the method parser group.<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * <p><a name="line.204"></a>
+<span class="sourceLineNo">205</span> * Possible values:<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * <ul><a name="line.206"></a>
+<span class="sourceLineNo">207</span> * <li>{@link Inherit#PARSERS} - Inherit class-level parsers.<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * <li>{@link Inherit#PROPERTIES} - Inherit class-level properties.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * <li>{@link Inherit#TRANSFORMS} - Inherit class-level transforms.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * </ul><a name="line.210"></a>
+<span class="sourceLineNo">211</span> * <p><a name="line.211"></a>
+<span class="sourceLineNo">212</span> * For example, to inherit all parsers, properties, and transforms from the servlet class:<a name="line.212"></a>
+<span class="sourceLineNo">213</span> * <p class='bcode'><a name="line.213"></a>
+<span class="sourceLineNo">214</span> * <ja>@RestMethod</ja>(<a name="line.214"></a>
+<span class="sourceLineNo">215</span> * path=<js>"/foo"</js>,<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * parsers=MySpecialParser.<jk>class</jk>,<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * parsersInherit={<jsf>PARSERS</jsf>,<jsf>PROPERTIES</jsf>,<jsf>TRANSFORMS</jsf>}<a name="line.217"></a>
+<span class="sourceLineNo">218</span> * )<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * </p><a name="line.219"></a>
+<span class="sourceLineNo">220</span> */<a name="line.220"></a>
+<span class="sourceLineNo">221</span> Inherit[] parsersInherit() default {};<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span> /**<a name="line.223"></a>
+<span class="sourceLineNo">224</span> * Appends to the list of {@link Encoder encoders} specified on the servlet.<a name="line.224"></a>
+<span class="sourceLineNo">225</span> * <p><a name="line.225"></a>
+<span class="sourceLineNo">226</span> * Use this annotation when the list of encoders assigned to a method differs from the list of encoders assigned at the servlet level.<a name="line.226"></a>
+<span class="sourceLineNo">227</span> * <p><a name="line.227"></a>
+<span class="sourceLineNo">228</span> * These can be used to enable various kinds of compression (e.g. <js>"gzip"</js>) on requests and responses.<a name="line.228"></a>
+<span class="sourceLineNo">229</span> *<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * <p class='bcode'><a name="line.230"></a>
+<span class="sourceLineNo">231</span> * <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> *<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * <ja>@RestMethod</ja>(<a name="line.233"></a>
+<span class="sourceLineNo">234</span> * name=<js>"PUT"</js>,<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * path=<js>"/foo"</js>,<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * encoders={GzipEncoder.<jk>class</jk>}<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * )<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * <jk>public</jk> Object doGetWithSpecialEncoding() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * <jc>// Handle request with special encoding</jc><a name="line.239"></a>
+<span class="sourceLineNo">240</span> * }<a name="line.240"></a>
+<span class="sourceLineNo">241</span> * }<a name="line.241"></a>
+<span class="sourceLineNo">242</span> * </p><a name="line.242"></a>
<span class="sourceLineNo">243</span> * <p><a name="line.243"></a>
-<span class="sourceLineNo">244</span> * This is equivalent to simply calling <code>res.addProperties()</code> in the Java method, but is provided for convenience.<a name="line.244"></a>
+<span class="sourceLineNo">244</span> * If you want to OVERRIDE the set of encoders specified by the servlet, combine this annotation with <code><ja>@RestMethod</ja>(inheritEncoders=<jk>false</jk>)</code>.<a name="line.244"></a>
<span class="sourceLineNo">245</span> */<a name="line.245"></a>
-<span class="sourceLineNo">246</span> Property[] properties() default {};<a name="line.246"></a>
+<span class="sourceLineNo">246</span> Class<? extends Encoder>[] encoders() default {};<a name="line.246"></a>
<span class="sourceLineNo">247</span><a name="line.247"></a>
<span class="sourceLineNo">248</span> /**<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * Appends the specified bean filters to all serializers and parsers used by this method.<a name="line.249"></a>
+<span class="sourceLineNo">249</span> * Specifies whether the method should inherit encoders from the servlet.<a name="line.249"></a>
<span class="sourceLineNo">250</span> */<a name="line.250"></a>
-<span class="sourceLineNo">251</span> Class<?>[] beanFilters() default {};<a name="line.251"></a>
+<span class="sourceLineNo">251</span> boolean inheritEncoders() default true;<a name="line.251"></a>
<span class="sourceLineNo">252</span><a name="line.252"></a>
<span class="sourceLineNo">253</span> /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * Appends the specified POJO swaps to all serializers and parsers used by this method.<a name="line.254"></a>
-<span class="sourceLineNo">255</span> */<a name="line.255"></a>
-<span class="sourceLineNo">256</span> Class<?>[] pojoSwaps() default {};<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span> /**<a name="line.258"></a>
-<span class="sourceLineNo">259</span> * Specifies default values for request headers.<a name="line.259"></a>
-<span class="sourceLineNo">260</span> * <p><a name="line.260"></a>
-<span class="sourceLineNo">261</span> * Strings are of the format <js>"Header-Name: header-value"</js>.<a name="line.261"></a>
-<span class="sourceLineNo">262</span> * <p><a name="line.262"></a>
-<span class="sourceLineNo">263</span> * Affects values returned by {@link RestRequest#getHeader(String)} when the header is not present on the request.<a name="line.263"></a>
-<span class="sourceLineNo">264</span> * <p><a name="line.264"></a>
-<span class="sourceLineNo">265</span> * The most useful reason for this annotation is to provide a default <code>Accept</code> header when one is not specified<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * so that a particular default {@link Serializer} is picked.<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * <p><a name="line.267"></a>
-<span class="sourceLineNo">268</span> * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * <p><a name="line.269"></a>
-<span class="sourceLineNo">270</span> * Header values specified at the method level override header values specified at the servlet level.<a name="line.270"></a>
-<span class="sourceLineNo">271</span> *<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * <h5 class='section'>Example:</h5><a name="line.272"></a>
-<span class="sourceLineNo">273</span> * <p class='bcode'><a name="line.273"></a>
-<span class="sourceLineNo">274</span> * <jc>// Assume "text/json" Accept value when Accept not specified</jc><a name="line.274"></a>
-<span class="sourceLineNo">275</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/*"</js>, defaultRequestHeaders={<js>"Accept: text/json"</js>})<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * <jk>public</jk> String doGet() {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> * ...<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> * </p><a name="line.279"></a>
-<span class="sourceLineNo">280</span> */<a name="line.280"></a>
-<span class="sourceLineNo">281</span> String[] defaultRequestHeaders() default {};<a name="line.281"></a>
-<span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span> /**<a name="line.283"></a>
-<span class="sourceLineNo">284</span> * Optional summary for the exposed API.<a name="line.284"></a>
-<span class="sourceLineNo">285</span> * <p><a name="line.285"></a>
-<span class="sourceLineNo">286</span> * This summary is used in the following locations:<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * <ul class='spaced-list'><a name="line.287"></a>
-<span class="sourceLineNo">288</span> * <li>The value returned by {@link RestRequest#getMethodSummary()}.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * <li>The <js>"$R{methodSummary}"</js> variable.<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * <li>The summary of the method in the Swagger page.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * </ul><a name="line.291"></a>
-<span class="sourceLineNo">292</span> * <p><a name="line.292"></a>
-<span class="sourceLineNo">293</span> * The default value pulls the description from the <code>(className.?)[javaMethodName].summary</code> entry in the servlet resource bundle.<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * (e.g. <js>"MyClass.myMethod.summary = foo"</js> or <js>"myMethod.summary = foo"</js>).<a name="line.294"></a>
-<span class="sourceLineNo">295</span> * <p><a name="line.295"></a>
-<span class="sourceLineNo">296</span> * This field value can contain variables (e.g. "$L{my.localized.variable}").<a name="line.296"></a>
+<span class="sourceLineNo">254</span> * Same as {@link RestResource#properties()}, except defines property values by default when this method is called.<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * <p><a name="line.255"></a>
+<span class="sourceLineNo">256</span> * This is equivalent to simply calling <code>res.addProperties()</code> in the Java method, but is provided for convenience.<a name="line.256"></a>
+<span class="sourceLineNo">257</span> */<a name="line.257"></a>
+<span class="sourceLineNo">258</span> Property[] properties() default {};<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span> /**<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * Appends the specified bean filters to all serializers and parsers used by this method.<a name="line.261"></a>
+<span class="sourceLineNo">262</span> */<a name="line.262"></a>
+<span class="sourceLineNo">263</span> Class<?>[] beanFilters() default {};<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span> /**<a name="line.265"></a>
+<span class="sourceLineNo">266</span> * Appends the specified POJO swaps to all serializers and parsers used by this method.<a name="line.266"></a>
+<span class="sourceLineNo">267</span> */<a name="line.267"></a>
+<span class="sourceLineNo">268</span> Class<?>[] pojoSwaps() default {};<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> /**<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * Specifies default values for request headers.<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * <p><a name="line.272"></a>
+<span class="sourceLineNo">273</span> * Strings are of the format <js>"Header-Name: header-value"</js>.<a name="line.273"></a>
+<span class="sourceLineNo">274</span> * <p><a name="line.274"></a>
+<span class="sourceLineNo">275</span> * Affects values returned by {@link RestRequest#getHeader(String)} when the header is not present on the request.<a name="line.275"></a>
+<span class="sourceLineNo">276</span> * <p><a name="line.276"></a>
+<span class="sourceLineNo">277</span> * The most useful reason for this annotation is to provide a default <code>Accept</code> header when one is not specified<a name="line.277"></a>
+<span class="sourceLineNo">278</span> * so that a particular default {@link Serializer} is picked.<a name="line.278"></a>
+<span class="sourceLineNo">279</span> * <p><a name="line.279"></a>
+<span class="sourceLineNo">280</span> * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).<a name="line.280"></a>
+<span class="sourceLineNo">281</span> * <p><a name="line.281"></a>
+<span class="sourceLineNo">282</span> * Header values specified at the method level override header values specified at the servlet level.<a name="line.282"></a>
+<span class="sourceLineNo">283</span> *<a name="line.283"></a>
+<span class="sourceLineNo">284</span> * <h5 class='section'>Example:</h5><a name="line.284"></a>
+<span class="sourceLineNo">285</span> * <p class='bcode'><a name="line.285"></a>
+<span class="sourceLineNo">286</span> * <jc>// Assume "text/json" Accept value when Accept not specified</jc><a name="line.286"></a>
+<span class="sourceLineNo">287</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/*"</js>, defaultRequestHeaders={<js>"Accept: text/json"</js>})<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * <jk>public</jk> String doGet() {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> * ...<a name="line.289"></a>
+<span class="sourceLineNo">290</span> * }<a name="line.290"></a>
+<span class="sourceLineNo">291</span> * </p><a name="line.291"></a>
+<span class="sourceLineNo">292</span> */<a name="line.292"></a>
+<span class="sourceLineNo">293</span> String[] defaultRequestHeaders() default {};<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> /**<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * Optional summary for the exposed API.<a name="line.296"></a>
<span class="sourceLineNo">297</span> * <p><a name="line.297"></a>
-<span class="sourceLineNo">298</span> * Corresponds to the swagger field <code>/paths/{path}/{method}/summary</code>.<a name="line.298"></a>
-<span class="sourceLineNo">299</span> */<a name="line.299"></a>
-<span class="sourceLineNo">300</span> String summary() default "";<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> /**<a name="line.302"></a>
-<span class="sourceLineNo">303</span> * Optional description for the exposed API.<a name="line.303"></a>
+<span class="sourceLineNo">298</span> * This summary is used in the following locations:<a name="line.298"></a>
+<span class="sourceLineNo">299</span> * <ul class='spaced-list'><a name="line.299"></a>
+<span class="sourceLineNo">300</span> * <li>The value returned by {@link RestRequest#getMethodSummary()}.<a name="line.300"></a>
+<span class="sourceLineNo">301</span> * <li>The <js>"$R{methodSummary}"</js> variable.<a name="line.301"></a>
+<span class="sourceLineNo">302</span> * <li>The summary of the method in the Swagger page.<a name="line.302"></a>
+<span class="sourceLineNo">303</span> * </ul><a name="line.303"></a>
<span class="sourceLineNo">304</span> * <p><a name="line.304"></a>
-<span class="sourceLineNo">305</span> * This description is used in the following locations:<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * <ul class='spaced-list'><a name="line.306"></a>
-<span class="sourceLineNo">307</span> * <li>The value returned by {@link RestRequest#getMethodDescription()}.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * <li>The <js>"$R{methodDescription}"</js> variable.<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * <li>The description of the method in the Swagger page.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * </ul><a name="line.310"></a>
-<span class="sourceLineNo">311</span> * <p><a name="line.311"></a>
-<span class="sourceLineNo">312</span> * The default value pulls the description from the <code>(className.?)[javaMethodName].description</code> entry in the servlet resource bundle.<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * (e.g. <js>"MyClass.myMethod.description = foo"</js> or <js>"myMethod.description = foo"</js>).<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * <p><a name="line.314"></a>
-<span class="sourceLineNo">315</span> * This field value can contain variables (e.g. "$L{my.localized.variable}").<a name="line.315"></a>
+<span class="sourceLineNo">305</span> * The default value pulls the description from the <code>(className.?)[javaMethodName].summary</code> entry in the servlet resource bundle.<a name="line.305"></a>
+<span class="sourceLineNo">306</span> * (e.g. <js>"MyClass.myMethod.summary = foo"</js> or <js>"myMethod.summary = foo"</js>).<a name="line.306"></a>
+<span class="sourceLineNo">307</span> * <p><a name="line.307"></a>
+<span class="sourceLineNo">308</span> * This field value can contain variables (e.g. "$L{my.localized.variable}").<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * <p><a name="line.309"></a>
+<span class="sourceLineNo">310</span> * Corresponds to the swagger field <code>/paths/{path}/{method}/summary</code>.<a name="line.310"></a>
+<span class="sourceLineNo">311</span> */<a name="line.311"></a>
+<span class="sourceLineNo">312</span> String summary() default "";<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span> /**<a name="line.314"></a>
+<span class="sourceLineNo">315</span> * Optional description for the exposed API.<a name="line.315"></a>
<span class="sourceLineNo">316</span> * <p><a name="line.316"></a>
-<span class="sourceLineNo">317</span> * Corresponds to the swagger field <code>/paths/{path}/{method}/description</code>.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> */<a name="line.318"></a>
-<span class="sourceLineNo">319</span> String description() default "";<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span> /**<a name="line.321"></a>
-<span class="sourceLineNo">322</span> * Optional external documentation information for the exposed API.<a name="line.322"></a>
+<span class="sourceLineNo">317</span> * This description is used in the following locations:<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * <ul class='spaced-list'><a name="line.318"></a>
+<span class="sourceLineNo">319</span> * <li>The value returned by {@link RestRequest#getMethodDescription()}.<a name="line.319"></a>
+<span class="sourceLineNo">320</span> * <li>The <js>"$R{methodDescription}"</js> variable.<a name="line.320"></a>
+<span class="sourceLineNo">321</span> * <li>The description of the method in the Swagger page.<a name="line.321"></a>
+<span class="sourceLineNo">322</span> * </ul><a name="line.322"></a>
<span class="sourceLineNo">323</span> * <p><a name="line.323"></a>
-<span class="sourceLineNo">324</span> * Used to populate the Swagger external documentation field.<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * <p><a name="line.325"></a>
-<span class="sourceLineNo">326</span> * A simplified JSON string with the following fields:<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * <p class='bcode'><a name="line.327"></a>
-<span class="sourceLineNo">328</span> * {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> * description: string,<a name="line.329"></a>
-<span class="sourceLineNo">330</span> * url: string<a name="line.330"></a>
-<span class="sourceLineNo">331</span> * }<a name="line.331"></a>
-<span class="sourceLineNo">332</span> * </p><a name="line.332"></a>
-<span class="sourceLineNo">333</span> * <p><a name="line.333"></a>
-<span class="sourceLineNo">334</span> * The default value pulls the description from the <code>(className.?)[javaMethodName].externalDocs</code> entry in the servlet resource bundle.<a name="line.334"></a>
-<span class="sourceLineNo">335</span> * (e.g. <js>"MyClass.myMethod.externalDocs = {url:'http://juneau.apache.org'}"</js> or <js>"myMethod.externalDocs = {url:'http://juneau.apache.org'}"</js>).<a name="line.335"></a>
-<span class="sourceLineNo">336</span> *<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * <h5 class='section'>Example:</h5><a name="line.337"></a>
-<span class="sourceLineNo">338</span> * <p class='bcode'><a name="line.338"></a>
-<span class="sourceLineNo">339</span> * <ja>@RestMethod</ja>(externalDocs=<js>"{url:'http://juneau.apache.org'}"</js>)<a name="line.339"></a>
-<span class="sourceLineNo">340</span> * </p><a name="line.340"></a>
-<span class="sourceLineNo">341</span> * <p><a name="line.341"></a>
-<span class="sourceLineNo">342</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.342"></a>
-<span class="sourceLineNo">343</span> * <p><a name="line.343"></a>
-<span class="sourceLineNo">344</span> * Corresponds to the swagger field <code>/paths/{path}/{method}/externalDocs</code>.<a name="line.344"></a>
-<span class="sourceLineNo">345</span> */<a name="line.345"></a>
-<span class="sourceLineNo">346</span> String externalDocs() default "";<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span> /**<a name="line.348"></a>
-<span class="sourceLineNo">349</span> * Optional tagging information for the exposed API.<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * <p><a name="line.350"></a>
-<span class="sourceLineNo">351</span> * Used to populate the Swagger tags field.<a name="line.351"></a>
-<span class="sourceLineNo">352</span> * <p><a name="line.352"></a>
-<span class="sourceLineNo">353</span> * A comma-delimited list of tags for API documentation control.<a name="line.353"></a>
-<span class="sourceLineNo">354</span> * Tags can be used for logical grouping of operations by resources or any other qualifier.<a name="line.354"></a>
+<span class="sourceLineNo">324</span> * The default value pulls the description from the <code>(className.?)[javaMethodName].description</code> entry in the servlet resource bundle.<a name="line.324"></a>
+<span class="sourceLineNo">325</span> * (e.g. <js>"MyClass.myMethod.description = foo"</js> or <js>"myMethod.description = foo"</js>).<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * <p><a name="line.326"></a>
+<span class="sourceLineNo">327</span> * This field value can contain variables (e.g. "$L{my.localized.variable}").<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * <p><a name="line.328"></a>
+<span class="sourceLineNo">329</span> * Corresponds to the swagger field <code>/paths/{path}/{method}/description</code>.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> */<a name="line.330"></a>
+<span class="sourceLineNo">331</span> String description() default "";<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span> /**<a name="line.333"></a>
+<span class="sourceLineNo">334</span> * Optional external documentation information for the exposed API.<a name="line.334"></a>
+<span class="sourceLineNo">335</span> * <p><a name="line.335"></a>
+<span class="sourceLineNo">336</span> * Used to populate the Swagger external documentation field.<a name="line.336"></a>
+<span class="sourceLineNo">337</span> * <p><a name="line.337"></a>
+<span class="sourceLineNo">338</span> * A simplified JSON string with the following fields:<a name="line.338"></a>
+<span class="sourceLineNo">339</span> * <p class='bcode'><a name="line.339"></a>
+<span class="sourceLineNo">340</span> * {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> * description: string,<a name="line.341"></a>
+<span class="sourceLineNo">342</span> * url: string<a name="line.342"></a>
+<span class="sourceLineNo">343</span> * }<a name="line.343"></a>
+<span class="sourceLineNo">344</span> * </p><a name="line.344"></a>
+<span class="sourceLineNo">345</span> * <p><a name="line.345"></a>
+<span class="sourceLineNo">346</span> * The default value pulls the description from the <code>(className.?)[javaMethodName].externalDocs</code> entry in the servlet resource bundle.<a name="line.346"></a>
+<span class="sourceLineNo">347</span> * (e.g. <js>"MyClass.myMethod.externalDocs = {url:'http://juneau.apache.org'}"</js> or <js>"myMethod.externalDocs = {url:'http://juneau.apache.org'}"</js>).<a name="line.347"></a>
+<span class="sourceLineNo">348</span> *<a name="line.348"></a>
+<span class="sourceLineNo">349</span> * <h5 class='section'>Example:</h5><a name="line.349"></a>
+<span class="sourceLineNo">350</span> * <p class='bcode'><a name="line.350"></a>
+<span class="sourceLineNo">351</span> * <ja>@RestMethod</ja>(externalDocs=<js>"{url:'http://juneau.apache.org'}"</js>)<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * </p><a name="line.352"></a>
+<span class="sourceLineNo">353</span> * <p><a name="line.353"></a>
+<span class="sourceLineNo">354</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.354"></a>
<span class="sourceLineNo">355</span> * <p><a name="line.355"></a>
-<span class="sourceLineNo">356</span> * The default value pulls the description from the <code>(className.?)[javaMethodName].tags</code> entry in the servlet resource bundle.<a name="line.356"></a>
-<span class="sourceLineNo">357</span> * (e.g. <js>"MyClass.myMethod.tags = foo,bar"</js> or <js>"myMethod.tags = foo,bar"</js>).<a name="line.357"></a>
-<span class="sourceLineNo">358</span> *<a name="line.358"></a>
-<span class="sourceLineNo">359</span> * <h5 class='section'>Example:</h5><a name="line.359"></a>
-<span class="sourceLineNo">360</span> * <p class='bcode'><a name="line.360"></a>
-<span class="sourceLineNo">361</span> * <ja>@RestMethod</ja>(tags=<js>"foo,bar"</js>)<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * </p><a name="line.362"></a>
-<span class="sourceLineNo">363</span> * <p><a name="line.363"></a>
-<span class="sourceLineNo">364</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.364"></a>
-<span class="sourceLineNo">365</span> * <p><a name="line.365"></a>
-<span class="sourceLineNo">366</span> * Corresponds to the swagger field <code>/paths/{path}/{method}/tags</code>.<a name="line.366"></a>
-<span class="sourceLineNo">367</span> */<a name="line.367"></a>
-<span class="sourceLineNo">368</span> String tags() default "";<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> /**<a name="line.370"></a>
-<span class="sourceLineNo">371</span> * Optional deprecated flag for the exposed API.<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * <p><a name="line.372"></a>
-<span class="sourceLineNo">373</span> * Used to populate the Swagger deprecated field.<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * <p><a name="line.374"></a>
-<span class="sourceLineNo">375</span> * The default value pulls the description from the <code>(className.?)[javaMethodName].deprecated</code> entry in the servlet resource bundle.<a name="line.375"></a>
-<span class="sourceLineNo">376</span> * (e.g. <js>"MyClass.myMethod.deprecated = true"</js> or <js>"myMethod.deprecated = foo,bar"</js>).<a name="line.376"></a>
-<span class="sourceLineNo">377</span> *<a name="line.377"></a>
-<span class="sourceLineNo">378</span> * <h5 class='section'>Example:</h5><a name="line.378"></a>
-<span class="sourceLineNo">379</span> * <p class='bcode'><a name="line.379"></a>
-<span class="sourceLineNo">380</span> * <ja>@RestMethod</ja>(deprecated=<jk>true</jk>)<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * </p><a name="line.381"></a>
-<span class="sourceLineNo">382</span> * <p><a name="line.382"></a>
-<span class="sourceLineNo">383</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.383"></a>
+<span class="sourceLineNo">356</span> * Corresponds to the swagger field <code>/paths/{path}/{method}/externalDocs</code>.<a name="line.356"></a>
+<span class="sourceLineNo">357</span> */<a name="line.357"></a>
+<span class="sourceLineNo">358</span> String externalDocs() default "";<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> /**<a name="line.360"></a>
+<span class="sourceLineNo">361</span> * Optional tagging information for the exposed API.<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * <p><a name="line.362"></a>
+<span class="sourceLineNo">363</span> * Used to populate the Swagger tags field.<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * <p><a name="line.364"></a>
+<span class="sourceLineNo">365</span> * A comma-delimited list of tags for API documentation control.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * Tags can be used for logical grouping of operations by resources or any other qualifier.<a name="line.366"></a>
+<span class="sourceLineNo">367</span> * <p><a name="line.367"></a>
+<span class="sourceLineNo">368</span> * The default value pulls the description from the <code>(className.?)[javaMethodName].tags</code> entry in the servlet resource bundle.<a name="line.368"></a>
+<span class="sourceLineNo">369</span> * (e.g. <js>"MyClass.myMethod.tags = foo,bar"</js> or <js>"myMethod.tags = foo,bar"</js>).<a name="line.369"></a>
+<span class="sourceLineNo">370</span> *<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * <h5 class='section'>Example:</h5><a name="line.371"></a>
+<span class="sourceLineNo">372</span> * <p class='bcode'><a name="line.372"></a>
+<span class="sourceLineNo">373</span> * <ja>@RestMethod</ja>(tags=<js>"foo,bar"</js>)<a name="line.373"></a>
+<span class="sourceLineNo">374</span> * </p><a name="line.374"></a>
+<span class="sourceLineNo">375</span> * <p><a name="line.375"></a>
+<span class="sourceLineNo">376</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.376"></a>
+<span class="sourceLineNo">377</span> * <p><a name="line.377"></a>
+<span class="sourceLineNo">378</span> * Corresponds to the swagger field <code>/paths/{path}/{method}/tags</code>.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> String tags() default "";<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span> /**<a name="line.382"></a>
+<span class="sourceLineNo">383</span> * Optional deprecated flag for the exposed API.<a name="line.383"></a>
<span class="sourceLineNo">384</span> * <p><a name="line.384"></a>
-<span class="sourceLineNo">385</span> * Corresponds to the swagger field <code>/paths/{path}/{method}/deprecated</code>.<a name="line.385"></a>
-<span class="sourceLineNo">386</span> */<a name="line.386"></a>
-<span class="sourceLineNo">387</span> boolean deprecated() default false;<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> /**<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * Optional parameter descriptions.<a name="line.390"></a>
-<span class="sourceLineNo">391</span> * <p><a name="line.391"></a>
-<span class="sourceLineNo">392</span> * This annotation is provided for documentation purposes and is used to populate the method <js>"parameters"</js> column<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * on the Swagger page.<a name="line.393"></a>
-<span class="sourceLineNo">394</span> *<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * <h5 class='section'>Example:</h5><a name="line.395"></a>
-<span class="sourceLineNo">396</span> * <p class='bcode'><a name="line.396"></a>
-<span class="sourceLineNo">397</span> * <ja>@RestMethod</ja>(<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * name=<js>"POST"</js>, path=<js>"/{a}"</js>,<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * description=<js>"This is my method."</js>,<a name="line.399"></a>
-<span class="sourceLineNo">400</span> * parameters={<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"a"</js>, description=<js>"The 'a' attribute"</js>),<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * <ja>@Parameter</ja>(in=<js>"query"</js>, name=<js>"b"</js>, description=<js>"The 'b' parameter"</js>, required=<jk>true</jk>),<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * <ja>@Parameter</ja>(in=<js>"body"</js>, description=<js>"The HTTP content"</js>),<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * <ja>@Parameter</ja>(in=<js>"header"</js>, name=<js>"D"</js>, description=<js>"The 'D' header"</js>),<a name="line.404"></a>
-<span class="sourceLineNo">405</span> * }<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * )<a name="line.406"></a>
-<span class="sourceLineNo">407</span> * </p><a name="line.407"></a>
-<span class="sourceLineNo">408</span> * This is functionally equivalent to specifying the following keys in the resource bundle for the class, except in this case<a name="line.408"></a>
-<span class="sourceLineNo">409</span> * the strings are internationalized.<a name="line.409"></a>
-<span class="sourceLineNo">410</span> * <p class='bcode'><a name="line.410"></a>
-<span class="sourceLineNo">411</span> * <jk>MyClass.myMethod.description</jk> = <js>This is my method.</js><a name="line.411"></a>
-<span class="sourceLineNo">412</span> * <jk>MyClass.myMethod.req.path.a.description</jk> = <js>The 'a' attribute</js><a name="line.412"></a>
-<span class="sourceLineNo">413</span> * <jk>MyClass.myMethod.req.query.b.description</jk> = <js>The 'b' parameter</js><a name="line.413"></a>
-<span class="sourceLineNo">414</span> * <jk>MyClass.myMethod.req.body.description</jk> = <js>The HTTP content</js><a name="line.414"></a>
-<span class="sourceLineNo">415</span> * <jk>MyClass.myMethod.req.header.d.description</jk> = <js>The 'D' header</js><a name="line.415"></a>
-<span class="sourceLineNo">416</span> * <p><a name="line.416"></a>
-<span class="sourceLineNo">417</span> * As a general rule, use annotations when you don't care about internationalization (i.e. you only want to support English),<a name="line.417"></a>
-<span class="sourceLineNo">418</span> * and use resource bundles if you need to support localization.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * <p><a name="line.419"></a>
-<span class="sourceLineNo">420</span> * These annotations can contain variables (e.g. "$L{my.localized.variable}").<a name="line.420"></a>
-<span class="sourceLineNo">421</span> * <p><a name="line.421"></a>
-<span class="sourceLineNo">422</span> * Corresponds to the swagger field <code>/paths/{path}/{method}/parameters</code>.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> */<a name="line.423"></a>
-<span class="sourceLineNo">424</span> Parameter[] parameters() default {};<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span> /**<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * Optional output description.<a name="line.427"></a>
+<span class="sourceLineNo">385</span> * Used to populate the Swagger deprecated field.<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * <p><a name="line.386"></a>
+<span class="sourceLineNo">387</span> * The default value pulls the description from the <code>(className.?)[javaMethodName].deprecated</code> entry in the servlet resource bundle.<a name="line.387"></a>
+<span class="sourceLineNo">388</span> * (e.g. <js>"MyClass.myMethod.deprecated = true"</js> or <js>"myMethod.deprecated = foo,bar"</js>).<a name="line.388"></a>
+<span class="sourceLineNo">389</span> *<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * <h5 class='section'>Example:</h5><a name="line.390"></a>
+<span class="sourceLineNo">391</span> * <p class='bcode'><a name="line.391"></a>
+<span class="sourceLineNo">392</span> * <ja>@RestMethod</ja>(deprecated=<jk>true</jk>)<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * </p><a name="line.393"></a>
+<span class="sourceLineNo">394</span> * <p><a name="line.394"></a>
+<span class="sourceLineNo">395</span> * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.395"></a>
+<span class="sourceLineNo">396</span> * <p><a name="line.396"></a>
+<span class="sourceLineNo">397</span> * Corresponds to the swagger field <code>/paths/{path}/{method}/deprecated</code>.<a name="line.397"></a>
+<span class="sourceLineNo">398</span> */<a name="line.398"></a>
+<span class="sourceLineNo">399</span> boolean deprecated() default false;<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> /**<a name="line.401"></a>
+<span class="sourceLineNo">402</span> * Optional parameter descriptions.<a name="line.402"></a>
+<span class="sourceLineNo">403</span> * <p><a name="line.403"></a>
+<span class="sourceLineNo">404</span> * This annotation is provided for documentation purposes and is used to populate the method <js>"parameters"</js> column<a name="line.404"></a>
+<span class="sourceLineNo">405</span> * on the Swagger page.<a name="line.405"></a>
+<span class="sourceLineNo">406</span> *<a name="line.406"></a>
+<span class="sourceLineNo">407</span> * <h5 class='section'>Example:</h5><a name="line.407"></a>
+<span class="sourceLineNo">408</span> * <p class='bcode'><a name="line.408"></a>
+<span class="sourceLineNo">409</span> * <ja>@RestMethod</ja>(<a name="line.409"></a>
+<span class="sourceLineNo">410</span> * name=<js>"POST"</js>, path=<js>"/{a}"</js>,<a name="line.410"></a>
+<span class="sourceLineNo">411</span> * description=<js>"This is my method."</js>,<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * parameters={<a name="line.412"></a>
+<span class="sourceLineNo">413</span> * <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"a"</js>, description=<js>"The 'a' attribute"</js>),<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * <ja>@Parameter</ja>(in=<js>"query"</js>, name=<js>"b"</js>, description=<js>"The 'b' parameter"</js>, required=<jk>true</jk>),<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * <ja>@Parameter</ja>(in=<js>"body"</js>, description=<js>"The HTTP content"</js>),<a name="line.415"></a>
+<span class="sourceLineNo">416</span> * <ja>@Parameter</ja>(in=<js>"header"</js>, name=<js>"D"</js>, description=<js>"The 'D' header"</js>),<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * }<a name="line.417"></a>
+<span class="sourceLineNo">418</span> * )<a name="line.418"></a>
+<span class="sourceLineNo">419</span> * </p><a name="line.419"></a>
+<span class="sourceLineNo">420</span> * This is functionally equivalent to specifying the following keys in the resource bundle for the class, except in this case<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * the strings are internationalized.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> * <p class='bcode'><a name="line.422"></a>
+<span class="sourceLineNo">423</span> * <jk>MyClass.myMethod.description</jk> = <js>This is my method.</js><a name="line.423"></a>
+<span class="sourceLineNo">424</span> * <jk>MyClass.myMethod.req.path.a.description</jk> = <js>The 'a' attribute</js><a name="line.424"></a>
+<span class="sourceLineNo">425</span> * <jk>MyClass.myMethod.req.query.b.description</jk> = <js>The 'b' parameter</js><a name="line.425"></a>
+<span class="sourceLineNo">426</span> * <jk>MyClass.myMethod.req.body.description</jk> = <js>The HTTP content</js><a name="line.426"></a>
+<span class="sourceLineNo">427</span> * <jk>MyClass.myMethod.req.header.d.description</jk> = <js>The 'D' header</js><a name="line.427"></a>
<span class="sourceLineNo">428</span> * <p><a name="line.428"></a>
-<span class="sourceLineNo">429</span> * This annotation is provided for documentation purposes and is used to populate the method <js>"responses"</js> column<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * on the Swagger page.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> *<a name="line.431"></a>
-<span class="sourceLineNo">432</span> * <h5 class='section'>Example:</h5><a name="line.432"></a>
-<span class="sourceLineNo">433</span> * <p class='bcode'><a name="line.433"></a>
-<span class="sourceLineNo">434</span> * <ja>@RestMethod</ja>(<a name="line.434"></a>
-<span class="sourceLineNo">435</span> * name=<js>"GET"</js>, path=<js>"/"</js>,<a name="line.435"></a>
-<span class="sourceLineNo">436</span> * responses={<a name="line.436"></a>
-<span class="sourceLineNo">437</span> * <ja>@Response</ja>(200),<a name="line.437"></a>
-<span class="sourceLineNo">438</span> * <ja>@Response</ja>(<a name="line.438"></a>
-<span class="sourceLineNo">439</span> * value=302,<a name="line.439"></a>
-<span class="sourceLineNo">440</span> * description=<js>"Thing wasn't found here"</js>,<a name="line.440"></a>
-<span class="sourceLineNo">441</span> * headers={<a name="line.441"></a>
-<span class="sourceLineNo">442</span> * <ja>@Parameter</ja>(name=<js>"Location"</js>, description=<js>"The place to find the thing"</js>)<a name="line.442"></a>
-<span class="sourceLineNo">443</span> * }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> * )<a name="line.444"></a>
-<span class="sourceLineNo">445</span> * }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * )<a name="line.446"></a>
-<span class="sourceLineNo">447</span> * </p><a name="line.447"></a>
-<span class="sourceLineNo">448</span> * This is functionally equivalent to specifying the following keys in the resource bundle for the class, except in this case<a name="line.448"></a>
-<span class="sourceLineNo">449</span> * the strings are internationalized.<a name="line.449"></a>
-<span class="sourceLineNo">450</span> * <p class='bcode'><a name="line.450"></a>
-<span class="sourceLineNo">451</span> * <jk>MyClass.myMethod.res.200.description</jk> = <js>OK</js><a name="line.451"></a>
-<span class="sourceLineNo">452</span> * <jk>MyClass.myMethod.res.302.description</jk> = <js>Thing wasn't found here</js><a name="line.452"></a>
-<span class="sourceLineNo">453</span> * <jk>MyClass.myMethod.res.302.header.Location.description</jk> = <js>The place to find the thing</js><a name="line.453"></a>
-<span class="sourceLineNo">454</span> * <p><a name="line.454"></a>
-<span class="sourceLineNo">455</span> * As a general rule, use annotations when you don't care about internationalization (i.e. you only want to support English),<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * and use resource bundles if you need to support localization.<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * <p><a name="line.457"></a>
-<span class="sourceLineNo">458</span> * These annotations can contain variables (e.g. "$L{my.localized.variable}").<a name="line.458"></a>
-<span class="sourceLineNo">459</span> */<a name="line.459"></a>
-<span class="sourceLineNo">460</span> Response[] responses() default {};<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span> /**<a name="line.462"></a>
-<span class="sourceLineNo">463</span> * Specifies whether this method can be called based on the client version.<a name="line.463"></a>
-<span class="sourceLineNo">464</span> * <p><a name="line.464"></a>
-<span class="sourceLineNo">465</span> * The client version is identified via the HTTP request header identified by {@link RestResource#clientVersionHeader()} which<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * by default is <js>"X-Client-Version"</js>.<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * <p><a name="line.467"></a>
-<span class="sourceLineNo">468</span> * This is a specialized kind of {@link RestMatcher} that allows you to invoke different Java methods for the same method/path based<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * on the client version.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * <p><a name="line.470"></a>
-<span class="sourceLineNo">471</span> * The format of the client version range is similar to that of OSGi versions.<a name="line.471"></a>
-<span class="sourceLineNo">472</span> * <p><a name="line.472"></a>
-<span class="sourceLineNo">473</span> * In the following example, the Java methods are mapped to the same HTTP method and URL <js>"/foobar"</js>.<a name="line.473"></a>
-<span class="sourceLineNo">474</span> * <p class='bcode'><a name="line.474"></a>
-<span class="sourceLineNo">475</span> * <jc>// Call this method if X-Client-Version is at least 2.0.<a name="line.475"></a>
-<span class="sourceLineNo">476</span> * // Note that this also matches 2.0.1.</jc><a name="line.476"></a>
-<span class="sourceLineNo">477</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)<a name="line.477"></a>
-<span class="sourceLineNo">478</span> * <jk>public</jk> Object method1() {<a name="line.478"></a>
-<span class="sourceLineNo">479</span> * ...<a name="line.479"></a>
-<span class="sourceLineNo">480</span> * }<a name="line.480"></a>
-<span class="sourceLineNo">481</span> *<a name="line.481"></a>
-<span class="sourceLineNo">482</span> * <jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc><a name="line.482"></a>
-<span class="sourceLineNo">483</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * <jk>public</jk> Object method2() {<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * ...<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * }<a name="line.486"></a>
-<span class="sourceLineNo">487</span> *<a name="line.487"></a>
-<span class="sourceLineNo">488</span> * <jc>// Call this method if X-Client-Version is less than 1.1.</jc><a name="line.488"></a>
-<span class="sourceLineNo">489</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)<a name="line.489"><
<TRUNCATED>
[29/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
index 85032d7..5afcc2f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
@@ -1134,397 +1134,409 @@
<span class="sourceLineNo">1126</span> if (o instanceof ClassMeta)<a name="line.1126"></a>
<span class="sourceLineNo">1127</span> return (ClassMeta)o;<a name="line.1127"></a>
<span class="sourceLineNo">1128</span><a name="line.1128"></a>
-<span class="sourceLineNo">1129</span> Class c = null;<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span> if (o instanceof Class) {<a name="line.1130"></a>
-<span class="sourceLineNo">1131</span> c = (Class)o;<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span> } else if (o instanceof ParameterizedType) {<a name="line.1132"></a>
-<span class="sourceLineNo">1133</span> // A parameter (e.g. <String>.<a name="line.1133"></a>
-<span class="sourceLineNo">1134</span> c = (Class<?>)((ParameterizedType)o).getRawType();<a name="line.1134"></a>
-<span class="sourceLineNo">1135</span> } else if (o instanceof GenericArrayType) {<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span> // An array parameter (e.g. <byte[]>.<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span> GenericArrayType gat = (GenericArrayType)o;<a name="line.1137"></a>
-<span class="sourceLineNo">1138</span> Type gatct = gat.getGenericComponentType();<a name="line.1138"></a>
-<span class="sourceLineNo">1139</span> if (gatct instanceof Class) {<a name="line.1139"></a>
-<span class="sourceLineNo">1140</span> Class gatctc = (Class)gatct;<a name="line.1140"></a>
-<span class="sourceLineNo">1141</span> c = Array.newInstance(gatctc, 0).getClass();<a name="line.1141"></a>
-<span class="sourceLineNo">1142</span> } else if (gatct instanceof ParameterizedType) {<a name="line.1142"></a>
-<span class="sourceLineNo">1143</span> Class gatctc = (Class<?>)((ParameterizedType)gatct).getRawType();<a name="line.1143"></a>
-<span class="sourceLineNo">1144</span> c = Array.newInstance(gatctc, 0).getClass();<a name="line.1144"></a>
-<span class="sourceLineNo">1145</span> } else {<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span> return null;<a name="line.1146"></a>
-<span class="sourceLineNo">1147</span> }<a name="line.1147"></a>
-<span class="sourceLineNo">1148</span> } else if (o instanceof TypeVariable) {<a name="line.1148"></a>
-<span class="sourceLineNo">1149</span> if (typeVarImpls != null) {<a name="line.1149"></a>
-<span class="sourceLineNo">1150</span> TypeVariable t = (TypeVariable) o;<a name="line.1150"></a>
-<span class="sourceLineNo">1151</span> String varName = t.getName();<a name="line.1151"></a>
-<span class="sourceLineNo">1152</span> int varIndex = -1;<a name="line.1152"></a>
-<span class="sourceLineNo">1153</span> Class gc = (Class)t.getGenericDeclaration();<a name="line.1153"></a>
-<span class="sourceLineNo">1154</span> TypeVariable[] tv = gc.getTypeParameters();<a name="line.1154"></a>
-<span class="sourceLineNo">1155</span> for (int i = 0; i < tv.length; i++) {<a name="line.1155"></a>
-<span class="sourceLineNo">1156</span> if (tv[i].getName().equals(varName)) {<a name="line.1156"></a>
-<span class="sourceLineNo">1157</span> varIndex = i;<a name="line.1157"></a>
-<span class="sourceLineNo">1158</span> }<a name="line.1158"></a>
-<span class="sourceLineNo">1159</span> }<a name="line.1159"></a>
-<span class="sourceLineNo">1160</span> if (varIndex != -1) {<a name="line.1160"></a>
-<span class="sourceLineNo">1161</span><a name="line.1161"></a>
-<span class="sourceLineNo">1162</span> // If we couldn't find a type variable implementation, that means<a name="line.1162"></a>
-<span class="sourceLineNo">1163</span> // the type was defined at runtime (e.g. Bean b = new Bean<Foo>();)<a name="line.1163"></a>
-<span class="sourceLineNo">1164</span> // in which case the type is lost through erasure.<a name="line.1164"></a>
-<span class="sourceLineNo">1165</span> // Assume java.lang.Object as the type.<a name="line.1165"></a>
-<span class="sourceLineNo">1166</span> if (! typeVarImpls.containsKey(gc))<a name="line.1166"></a>
-<span class="sourceLineNo">1167</span> return object();<a name="line.1167"></a>
-<span class="sourceLineNo">1168</span><a name="line.1168"></a>
-<span class="sourceLineNo">1169</span> return getClassMeta(typeVarImpls.get(gc)[varIndex]);<a name="line.1169"></a>
-<span class="sourceLineNo">1170</span> }<a name="line.1170"></a>
-<span class="sourceLineNo">1171</span> }<a name="line.1171"></a>
-<span class="sourceLineNo">1172</span> // We don't know the bounded type, so just resolve to Object.<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span> return object();<a name="line.1173"></a>
-<span class="sourceLineNo">1174</span> } else {<a name="line.1174"></a>
-<span class="sourceLineNo">1175</span> // This can happen when trying to resolve the "E getFirst()" method on LinkedList, whose type is a TypeVariable<a name="line.1175"></a>
-<span class="sourceLineNo">1176</span> // These should just resolve to Object.<a name="line.1176"></a>
-<span class="sourceLineNo">1177</span> return object();<a name="line.1177"></a>
-<span class="sourceLineNo">1178</span> }<a name="line.1178"></a>
-<span class="sourceLineNo">1179</span><a name="line.1179"></a>
-<span class="sourceLineNo">1180</span> ClassMeta rawType = getClassMeta(c);<a name="line.1180"></a>
-<span class="sourceLineNo">1181</span><a name="line.1181"></a>
-<span class="sourceLineNo">1182</span> // If this is a Map or Collection, and the parameter types aren't part<a name="line.1182"></a>
-<span class="sourceLineNo">1183</span> // of the class definition itself (e.g. class AddressBook extends List<Person>),<a name="line.1183"></a>
-<span class="sourceLineNo">1184</span> // then we need to figure out the parameters.<a name="line.1184"></a>
-<span class="sourceLineNo">1185</span> if (rawType.isMap() || rawType.isCollection()) {<a name="line.1185"></a>
-<span class="sourceLineNo">1186</span> ClassMeta[] params = findParameters(o, c);<a name="line.1186"></a>
-<span class="sourceLineNo">1187</span> if (params == null)<a name="line.1187"></a>
-<span class="sourceLineNo">1188</span> return rawType;<a name="line.1188"></a>
-<span class="sourceLineNo">1189</span> if (rawType.isMap()) {<a name="line.1189"></a>
-<span class="sourceLineNo">1190</span> if (params.length != 2)<a name="line.1190"></a>
-<span class="sourceLineNo">1191</span> return rawType;<a name="line.1191"></a>
-<span class="sourceLineNo">1192</span> if (params[0].isObject() && params[1].isObject())<a name="line.1192"></a>
-<span class="sourceLineNo">1193</span> return rawType;<a name="line.1193"></a>
-<span class="sourceLineNo">1194</span> return new ClassMeta(rawType, params[0], params[1], null);<a name="line.1194"></a>
-<span class="sourceLineNo">1195</span> }<a name="line.1195"></a>
-<span class="sourceLineNo">1196</span> if (rawType.isCollection()) {<a name="line.1196"></a>
-<span class="sourceLineNo">1197</span> if (params.length != 1)<a name="line.1197"></a>
-<span class="sourceLineNo">1198</span> return rawType;<a name="line.1198"></a>
-<span class="sourceLineNo">1199</span> if (params[0].isObject())<a name="line.1199"></a>
-<span class="sourceLineNo">1200</span> return rawType;<a name="line.1200"></a>
-<span class="sourceLineNo">1201</span> return new ClassMeta(rawType, null, null, params[0]);<a name="line.1201"></a>
-<span class="sourceLineNo">1202</span> }<a name="line.1202"></a>
-<span class="sourceLineNo">1203</span> }<a name="line.1203"></a>
-<span class="sourceLineNo">1204</span><a name="line.1204"></a>
-<span class="sourceLineNo">1205</span> return rawType;<a name="line.1205"></a>
-<span class="sourceLineNo">1206</span> }<a name="line.1206"></a>
-<span class="sourceLineNo">1207</span><a name="line.1207"></a>
-<span class="sourceLineNo">1208</span> final ClassMeta[] findParameters(Type o, Class c) {<a name="line.1208"></a>
-<span class="sourceLineNo">1209</span> if (o == null)<a name="line.1209"></a>
-<span class="sourceLineNo">1210</span> o = c;<a name="line.1210"></a>
-<span class="sourceLineNo">1211</span><a name="line.1211"></a>
-<span class="sourceLineNo">1212</span> // Loop until we find a ParameterizedType<a name="line.1212"></a>
-<span class="sourceLineNo">1213</span> if (! (o instanceof ParameterizedType)) {<a name="line.1213"></a>
-<span class="sourceLineNo">1214</span> loop: do {<a name="line.1214"></a>
-<span class="sourceLineNo">1215</span> o = c.getGenericSuperclass();<a name="line.1215"></a>
-<span class="sourceLineNo">1216</span> if (o instanceof ParameterizedType)<a name="line.1216"></a>
-<span class="sourceLineNo">1217</span> break loop;<a name="line.1217"></a>
-<span class="sourceLineNo">1218</span> for (Type t : c.getGenericInterfaces()) {<a name="line.1218"></a>
-<span class="sourceLineNo">1219</span> o = t;<a name="line.1219"></a>
-<span class="sourceLineNo">1220</span> if (o instanceof ParameterizedType)<a name="line.1220"></a>
-<span class="sourceLineNo">1221</span> break loop;<a name="line.1221"></a>
-<span class="sourceLineNo">1222</span> }<a name="line.1222"></a>
-<span class="sourceLineNo">1223</span> c = c.getSuperclass();<a name="line.1223"></a>
-<span class="sourceLineNo">1224</span> } while (c != null);<a name="line.1224"></a>
-<span class="sourceLineNo">1225</span> }<a name="line.1225"></a>
-<span class="sourceLineNo">1226</span><a name="line.1226"></a>
-<span class="sourceLineNo">1227</span> if (o instanceof ParameterizedType) {<a name="line.1227"></a>
-<span class="sourceLineNo">1228</span> ParameterizedType pt = (ParameterizedType)o;<a name="line.1228"></a>
-<span class="sourceLineNo">1229</span> if (! pt.getRawType().equals(Enum.class)) {<a name="line.1229"></a>
-<span class="sourceLineNo">1230</span> List<ClassMeta<?>> l = new LinkedList<ClassMeta<?>>();<a name="line.1230"></a>
-<span class="sourceLineNo">1231</span> for (Type pt2 : pt.getActualTypeArguments()) {<a name="line.1231"></a>
-<span class="sourceLineNo">1232</span> if (pt2 instanceof WildcardType || pt2 instanceof TypeVariable)<a name="line.1232"></a>
-<span class="sourceLineNo">1233</span> return null;<a name="line.1233"></a>
-<span class="sourceLineNo">1234</span> l.add(resolveClassMeta(pt2, null));<a name="line.1234"></a>
-<span class="sourceLineNo">1235</span> }<a name="line.1235"></a>
-<span class="sourceLineNo">1236</span> if (l.isEmpty())<a name="line.1236"></a>
-<span class="sourceLineNo">1237</span> return null;<a name="line.1237"></a>
-<span class="sourceLineNo">1238</span> return l.toArray(new ClassMeta[l.size()]);<a name="line.1238"></a>
-<span class="sourceLineNo">1239</span> }<a name="line.1239"></a>
-<span class="sourceLineNo">1240</span> }<a name="line.1240"></a>
-<span class="sourceLineNo">1241</span><a name="line.1241"></a>
-<span class="sourceLineNo">1242</span> return null;<a name="line.1242"></a>
-<span class="sourceLineNo">1243</span> }<a name="line.1243"></a>
-<span class="sourceLineNo">1244</span><a name="line.1244"></a>
-<span class="sourceLineNo">1245</span> /**<a name="line.1245"></a>
-<span class="sourceLineNo">1246</span> * Shortcut for calling {@code getClassMeta(o.getClass())}.<a name="line.1246"></a>
-<span class="sourceLineNo">1247</span> *<a name="line.1247"></a>
-<span class="sourceLineNo">1248</span> * @param <T> The class of the object being passed in.<a name="line.1248"></a>
-<span class="sourceLineNo">1249</span> * @param o The class to find the class type for.<a name="line.1249"></a>
-<span class="sourceLineNo">1250</span> * @return The ClassMeta object, or <jk>null</jk> if {@code o} is <jk>null</jk>.<a name="line.1250"></a>
-<span class="sourceLineNo">1251</span> */<a name="line.1251"></a>
-<span class="sourceLineNo">1252</span> public final <T> ClassMeta<T> getClassMetaForObject(T o) {<a name="line.1252"></a>
-<span class="sourceLineNo">1253</span> if (o == null)<a name="line.1253"></a>
-<span class="sourceLineNo">1254</span> return null;<a name="line.1254"></a>
-<span class="sourceLineNo">1255</span> return (ClassMeta<T>)getClassMeta(o.getClass());<a name="line.1255"></a>
-<span class="sourceLineNo">1256</span> }<a name="line.1256"></a>
-<span class="sourceLineNo">1257</span><a name="line.1257"></a>
-<span class="sourceLineNo">1258</span><a name="line.1258"></a>
-<span class="sourceLineNo">1259</span> /**<a name="line.1259"></a>
-<span class="sourceLineNo">1260</span> * Used for determining the class type on a method or field where a {@code @BeanProperty} annotation<a name="line.1260"></a>
-<span class="sourceLineNo">1261</span> * may be present.<a name="line.1261"></a>
-<span class="sourceLineNo">1262</span> *<a name="line.1262"></a>
-<span class="sourceLineNo">1263</span> * @param <T> The class type we're wrapping.<a name="line.1263"></a>
-<span class="sourceLineNo">1264</span> * @param p The property annotation on the type if there is one.<a name="line.1264"></a>
-<span class="sourceLineNo">1265</span> * @param t The type.<a name="line.1265"></a>
-<span class="sourceLineNo">1266</span> * @param typeVarImpls Contains known resolved type parameters on the specified class so<a name="line.1266"></a>
-<span class="sourceLineNo">1267</span> * that we can result {@code ParameterizedTypes} and {@code TypeVariables}.<br><a name="line.1267"></a>
-<span class="sourceLineNo">1268</span> * Can be <jk>null</jk> if the information is not known.<a name="line.1268"></a>
-<span class="sourceLineNo">1269</span> * @return The new {@code ClassMeta} object wrapped around the {@code Type} object.<a name="line.1269"></a>
-<span class="sourceLineNo">1270</span> */<a name="line.1270"></a>
-<span class="sourceLineNo">1271</span> protected final <T> ClassMeta<T> resolveClassMeta(BeanProperty p, Type t, Map<Class<?>,Class<?>[]> typeVarImpls) {<a name="line.1271"></a>
-<span class="sourceLineNo">1272</span> ClassMeta<T> cm = resolveClassMeta(t, typeVarImpls);<a name="line.1272"></a>
-<span class="sourceLineNo">1273</span> ClassMeta<T> cm2 = cm;<a name="line.1273"></a>
-<span class="sourceLineNo">1274</span> if (p != null) {<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span><a name="line.1275"></a>
-<span class="sourceLineNo">1276</span> if (p.type() != Object.class)<a name="line.1276"></a>
-<span class="sourceLineNo">1277</span> cm2 = resolveClassMeta(p.type(), typeVarImpls);<a name="line.1277"></a>
-<span class="sourceLineNo">1278</span><a name="line.1278"></a>
-<span class="sourceLineNo">1279</span> if (cm2.isMap()) {<a name="line.1279"></a>
-<span class="sourceLineNo">1280</span> Class<?>[] pParams = (p.params().length == 0 ? new Class[]{Object.class, Object.class} : p.params());<a name="line.1280"></a>
-<span class="sourceLineNo">1281</span> if (pParams.length != 2)<a name="line.1281"></a>
-<span class="sourceLineNo">1282</span> throw new RuntimeException("Invalid number of parameters specified for Map (must be 2): " + pParams.length);<a name="line.1282"></a>
-<span class="sourceLineNo">1283</span> ClassMeta<?> keyType = resolveType(pParams[0], cm2.getKeyType(), cm.getKeyType());<a name="line.1283"></a>
-<span class="sourceLineNo">1284</span> ClassMeta<?> valueType = resolveType(pParams[1], cm2.getValueType(), cm.getValueType());<a name="line.1284"></a>
-<span class="sourceLineNo">1285</span> if (keyType.isObject() && valueType.isObject())<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span> return cm2;<a name="line.1286"></a>
-<span class="sourceLineNo">1287</span> return new ClassMeta<T>(cm2, keyType, valueType, null);<a name="line.1287"></a>
-<span class="sourceLineNo">1288</span> }<a name="line.1288"></a>
-<span class="sourceLineNo">1289</span><a name="line.1289"></a>
-<span class="sourceLineNo">1290</span> if (cm2.isCollection()) {<a name="line.1290"></a>
-<span class="sourceLineNo">1291</span> Class<?>[] pParams = (p.params().length == 0 ? new Class[]{Object.class} : p.params());<a name="line.1291"></a>
-<span class="sourceLineNo">1292</span> if (pParams.length != 1)<a name="line.1292"></a>
-<span class="sourceLineNo">1293</span> throw new RuntimeException("Invalid number of parameters specified for Collection (must be 1): " + pParams.length);<a name="line.1293"></a>
-<span class="sourceLineNo">1294</span> ClassMeta<?> elementType = resolveType(pParams[0], cm2.getElementType(), cm.getElementType());<a name="line.1294"></a>
-<span class="sourceLineNo">1295</span> if (elementType.isObject())<a name="line.1295"></a>
-<span class="sourceLineNo">1296</span> return cm2;<a name="line.1296"></a>
-<span class="sourceLineNo">1297</span> return new ClassMeta<T>(cm2, null, null, elementType);<a name="line.1297"></a>
-<span class="sourceLineNo">1298</span> }<a name="line.1298"></a>
-<span class="sourceLineNo">1299</span><a name="line.1299"></a>
-<span class="sourceLineNo">1300</span> return cm2;<a name="line.1300"></a>
-<span class="sourceLineNo">1301</span> }<a name="line.1301"></a>
-<span class="sourceLineNo">1302</span><a name="line.1302"></a>
-<span class="sourceLineNo">1303</span> return cm;<a name="line.1303"></a>
-<span class="sourceLineNo">1304</span> }<a name="line.1304"></a>
-<span class="sourceLineNo">1305</span><a name="line.1305"></a>
-<span class="sourceLineNo">1306</span> private ClassMeta<?> resolveType(Type...t) {<a name="line.1306"></a>
-<span class="sourceLineNo">1307</span> for (Type tt : t) {<a name="line.1307"></a>
-<span class="sourceLineNo">1308</span> if (tt != null) {<a name="line.1308"></a>
-<span class="sourceLineNo">1309</span> ClassMeta<?> cm = getClassMeta(tt);<a name="line.1309"></a>
-<span class="sourceLineNo">1310</span> if (tt != cmObject)<a name="line.1310"></a>
-<span class="sourceLineNo">1311</span> return cm;<a name="line.1311"></a>
-<span class="sourceLineNo">1312</span> }<a name="line.1312"></a>
+<span class="sourceLineNo">1129</span> Class c = resolve(o, typeVarImpls);<a name="line.1129"></a>
+<span class="sourceLineNo">1130</span><a name="line.1130"></a>
+<span class="sourceLineNo">1131</span> // This can happen when trying to resolve the "E getFirst()" method on LinkedList, whose type is a TypeVariable<a name="line.1131"></a>
+<span class="sourceLineNo">1132</span> // These should just resolve to Object.<a name="line.1132"></a>
+<span class="sourceLineNo">1133</span> if (c == null)<a name="line.1133"></a>
+<span class="sourceLineNo">1134</span> return object();<a name="line.1134"></a>
+<span class="sourceLineNo">1135</span><a name="line.1135"></a>
+<span class="sourceLineNo">1136</span> ClassMeta rawType = getClassMeta(c);<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span><a name="line.1137"></a>
+<span class="sourceLineNo">1138</span> // If this is a Map or Collection, and the parameter types aren't part<a name="line.1138"></a>
+<span class="sourceLineNo">1139</span> // of the class definition itself (e.g. class AddressBook extends List<Person>),<a name="line.1139"></a>
+<span class="sourceLineNo">1140</span> // then we need to figure out the parameters.<a name="line.1140"></a>
+<span class="sourceLineNo">1141</span> if (rawType.isMap() || rawType.isCollection()) {<a name="line.1141"></a>
+<span class="sourceLineNo">1142</span> ClassMeta[] params = findParameters(o, c);<a name="line.1142"></a>
+<span class="sourceLineNo">1143</span> if (params == null)<a name="line.1143"></a>
+<span class="sourceLineNo">1144</span> return rawType;<a name="line.1144"></a>
+<span class="sourceLineNo">1145</span> if (rawType.isMap()) {<a name="line.1145"></a>
+<span class="sourceLineNo">1146</span> if (params.length != 2)<a name="line.1146"></a>
+<span class="sourceLineNo">1147</span> return rawType;<a name="line.1147"></a>
+<span class="sourceLineNo">1148</span> if (params[0].isObject() && params[1].isObject())<a name="line.1148"></a>
+<span class="sourceLineNo">1149</span> return rawType;<a name="line.1149"></a>
+<span class="sourceLineNo">1150</span> return new ClassMeta(rawType, params[0], params[1], null);<a name="line.1150"></a>
+<span class="sourceLineNo">1151</span> }<a name="line.1151"></a>
+<span class="sourceLineNo">1152</span> if (rawType.isCollection()) {<a name="line.1152"></a>
+<span class="sourceLineNo">1153</span> if (params.length != 1)<a name="line.1153"></a>
+<span class="sourceLineNo">1154</span> return rawType;<a name="line.1154"></a>
+<span class="sourceLineNo">1155</span> if (params[0].isObject())<a name="line.1155"></a>
+<span class="sourceLineNo">1156</span> return rawType;<a name="line.1156"></a>
+<span class="sourceLineNo">1157</span> return new ClassMeta(rawType, null, null, params[0]);<a name="line.1157"></a>
+<span class="sourceLineNo">1158</span> }<a name="line.1158"></a>
+<span class="sourceLineNo">1159</span> }<a name="line.1159"></a>
+<span class="sourceLineNo">1160</span><a name="line.1160"></a>
+<span class="sourceLineNo">1161</span> return rawType;<a name="line.1161"></a>
+<span class="sourceLineNo">1162</span> }<a name="line.1162"></a>
+<span class="sourceLineNo">1163</span><a name="line.1163"></a>
+<span class="sourceLineNo">1164</span> /** <a name="line.1164"></a>
+<span class="sourceLineNo">1165</span> * Convert a Type to a Class if possible.<a name="line.1165"></a>
+<span class="sourceLineNo">1166</span> * Return null if not possible.<a name="line.1166"></a>
+<span class="sourceLineNo">1167</span> */<a name="line.1167"></a>
+<span class="sourceLineNo">1168</span> final Class resolve(Type t, Map<Class<?>,Class<?>[]> typeVarImpls) {<a name="line.1168"></a>
+<span class="sourceLineNo">1169</span><a name="line.1169"></a>
+<span class="sourceLineNo">1170</span> if (t instanceof Class)<a name="line.1170"></a>
+<span class="sourceLineNo">1171</span> return (Class)t;<a name="line.1171"></a>
+<span class="sourceLineNo">1172</span><a name="line.1172"></a>
+<span class="sourceLineNo">1173</span> if (t instanceof ParameterizedType)<a name="line.1173"></a>
+<span class="sourceLineNo">1174</span> // A parameter (e.g. <String>.<a name="line.1174"></a>
+<span class="sourceLineNo">1175</span> return (Class)((ParameterizedType)t).getRawType();<a name="line.1175"></a>
+<span class="sourceLineNo">1176</span><a name="line.1176"></a>
+<span class="sourceLineNo">1177</span> if (t instanceof GenericArrayType) {<a name="line.1177"></a>
+<span class="sourceLineNo">1178</span> // An array parameter (e.g. <byte[]>).<a name="line.1178"></a>
+<span class="sourceLineNo">1179</span> Type gatct = ((GenericArrayType)t).getGenericComponentType();<a name="line.1179"></a>
+<span class="sourceLineNo">1180</span><a name="line.1180"></a>
+<span class="sourceLineNo">1181</span> if (gatct instanceof Class)<a name="line.1181"></a>
+<span class="sourceLineNo">1182</span> return Array.newInstance((Class)gatct, 0).getClass();<a name="line.1182"></a>
+<span class="sourceLineNo">1183</span><a name="line.1183"></a>
+<span class="sourceLineNo">1184</span> if (gatct instanceof ParameterizedType)<a name="line.1184"></a>
+<span class="sourceLineNo">1185</span> return Array.newInstance((Class)((ParameterizedType)gatct).getRawType(), 0).getClass();<a name="line.1185"></a>
+<span class="sourceLineNo">1186</span><a name="line.1186"></a>
+<span class="sourceLineNo">1187</span> if (gatct instanceof GenericArrayType)<a name="line.1187"></a>
+<span class="sourceLineNo">1188</span> return Array.newInstance(resolve(gatct, typeVarImpls), 0).getClass();<a name="line.1188"></a>
+<span class="sourceLineNo">1189</span><a name="line.1189"></a>
+<span class="sourceLineNo">1190</span> return null;<a name="line.1190"></a>
+<span class="sourceLineNo">1191</span><a name="line.1191"></a>
+<span class="sourceLineNo">1192</span> } else if (t instanceof TypeVariable) {<a name="line.1192"></a>
+<span class="sourceLineNo">1193</span> if (typeVarImpls != null) {<a name="line.1193"></a>
+<span class="sourceLineNo">1194</span> TypeVariable tv = (TypeVariable)t;<a name="line.1194"></a>
+<span class="sourceLineNo">1195</span> String varName = tv.getName();<a name="line.1195"></a>
+<span class="sourceLineNo">1196</span> int varIndex = -1;<a name="line.1196"></a>
+<span class="sourceLineNo">1197</span> Class gc = (Class)tv.getGenericDeclaration();<a name="line.1197"></a>
+<span class="sourceLineNo">1198</span> TypeVariable[] tvv = gc.getTypeParameters();<a name="line.1198"></a>
+<span class="sourceLineNo">1199</span> for (int i = 0; i < tvv.length; i++) {<a name="line.1199"></a>
+<span class="sourceLineNo">1200</span> if (tvv[i].getName().equals(varName)) {<a name="line.1200"></a>
+<span class="sourceLineNo">1201</span> varIndex = i;<a name="line.1201"></a>
+<span class="sourceLineNo">1202</span> }<a name="line.1202"></a>
+<span class="sourceLineNo">1203</span> }<a name="line.1203"></a>
+<span class="sourceLineNo">1204</span> if (varIndex != -1) {<a name="line.1204"></a>
+<span class="sourceLineNo">1205</span><a name="line.1205"></a>
+<span class="sourceLineNo">1206</span> // If we couldn't find a type variable implementation, that means<a name="line.1206"></a>
+<span class="sourceLineNo">1207</span> // the type was defined at runtime (e.g. Bean b = new Bean<Foo>();)<a name="line.1207"></a>
+<span class="sourceLineNo">1208</span> // in which case the type is lost through erasure.<a name="line.1208"></a>
+<span class="sourceLineNo">1209</span> // Assume java.lang.Object as the type.<a name="line.1209"></a>
+<span class="sourceLineNo">1210</span> if (! typeVarImpls.containsKey(gc))<a name="line.1210"></a>
+<span class="sourceLineNo">1211</span> return null;<a name="line.1211"></a>
+<span class="sourceLineNo">1212</span><a name="line.1212"></a>
+<span class="sourceLineNo">1213</span> return typeVarImpls.get(gc)[varIndex];<a name="line.1213"></a>
+<span class="sourceLineNo">1214</span> }<a name="line.1214"></a>
+<span class="sourceLineNo">1215</span> }<a name="line.1215"></a>
+<span class="sourceLineNo">1216</span> }<a name="line.1216"></a>
+<span class="sourceLineNo">1217</span> return null;<a name="line.1217"></a>
+<span class="sourceLineNo">1218</span> }<a name="line.1218"></a>
+<span class="sourceLineNo">1219</span><a name="line.1219"></a>
+<span class="sourceLineNo">1220</span> final ClassMeta[] findParameters(Type o, Class c) {<a name="line.1220"></a>
+<span class="sourceLineNo">1221</span> if (o == null)<a name="line.1221"></a>
+<span class="sourceLineNo">1222</span> o = c;<a name="line.1222"></a>
+<span class="sourceLineNo">1223</span><a name="line.1223"></a>
+<span class="sourceLineNo">1224</span> // Loop until we find a ParameterizedType<a name="line.1224"></a>
+<span class="sourceLineNo">1225</span> if (! (o instanceof ParameterizedType)) {<a name="line.1225"></a>
+<span class="sourceLineNo">1226</span> loop: do {<a name="line.1226"></a>
+<span class="sourceLineNo">1227</span> o = c.getGenericSuperclass();<a name="line.1227"></a>
+<span class="sourceLineNo">1228</span> if (o instanceof ParameterizedType)<a name="line.1228"></a>
+<span class="sourceLineNo">1229</span> break loop;<a name="line.1229"></a>
+<span class="sourceLineNo">1230</span> for (Type t : c.getGenericInterfaces()) {<a name="line.1230"></a>
+<span class="sourceLineNo">1231</span> o = t;<a name="line.1231"></a>
+<span class="sourceLineNo">1232</span> if (o instanceof ParameterizedType)<a name="line.1232"></a>
+<span class="sourceLineNo">1233</span> break loop;<a name="line.1233"></a>
+<span class="sourceLineNo">1234</span> }<a name="line.1234"></a>
+<span class="sourceLineNo">1235</span> c = c.getSuperclass();<a name="line.1235"></a>
+<span class="sourceLineNo">1236</span> } while (c != null);<a name="line.1236"></a>
+<span class="sourceLineNo">1237</span> }<a name="line.1237"></a>
+<span class="sourceLineNo">1238</span><a name="line.1238"></a>
+<span class="sourceLineNo">1239</span> if (o instanceof ParameterizedType) {<a name="line.1239"></a>
+<span class="sourceLineNo">1240</span> ParameterizedType pt = (ParameterizedType)o;<a name="line.1240"></a>
+<span class="sourceLineNo">1241</span> if (! pt.getRawType().equals(Enum.class)) {<a name="line.1241"></a>
+<span class="sourceLineNo">1242</span> List<ClassMeta<?>> l = new LinkedList<ClassMeta<?>>();<a name="line.1242"></a>
+<span class="sourceLineNo">1243</span> for (Type pt2 : pt.getActualTypeArguments()) {<a name="line.1243"></a>
+<span class="sourceLineNo">1244</span> if (pt2 instanceof WildcardType || pt2 instanceof TypeVariable)<a name="line.1244"></a>
+<span class="sourceLineNo">1245</span> return null;<a name="line.1245"></a>
+<span class="sourceLineNo">1246</span> l.add(resolveClassMeta(pt2, null));<a name="line.1246"></a>
+<span class="sourceLineNo">1247</span> }<a name="line.1247"></a>
+<span class="sourceLineNo">1248</span> if (l.isEmpty())<a name="line.1248"></a>
+<span class="sourceLineNo">1249</span> return null;<a name="line.1249"></a>
+<span class="sourceLineNo">1250</span> return l.toArray(new ClassMeta[l.size()]);<a name="line.1250"></a>
+<span class="sourceLineNo">1251</span> }<a name="line.1251"></a>
+<span class="sourceLineNo">1252</span> }<a name="line.1252"></a>
+<span class="sourceLineNo">1253</span><a name="line.1253"></a>
+<span class="sourceLineNo">1254</span> return null;<a name="line.1254"></a>
+<span class="sourceLineNo">1255</span> }<a name="line.1255"></a>
+<span class="sourceLineNo">1256</span><a name="line.1256"></a>
+<span class="sourceLineNo">1257</span> /**<a name="line.1257"></a>
+<span class="sourceLineNo">1258</span> * Shortcut for calling {@code getClassMeta(o.getClass())}.<a name="line.1258"></a>
+<span class="sourceLineNo">1259</span> *<a name="line.1259"></a>
+<span class="sourceLineNo">1260</span> * @param <T> The class of the object being passed in.<a name="line.1260"></a>
+<span class="sourceLineNo">1261</span> * @param o The class to find the class type for.<a name="line.1261"></a>
+<span class="sourceLineNo">1262</span> * @return The ClassMeta object, or <jk>null</jk> if {@code o} is <jk>null</jk>.<a name="line.1262"></a>
+<span class="sourceLineNo">1263</span> */<a name="line.1263"></a>
+<span class="sourceLineNo">1264</span> public final <T> ClassMeta<T> getClassMetaForObject(T o) {<a name="line.1264"></a>
+<span class="sourceLineNo">1265</span> if (o == null)<a name="line.1265"></a>
+<span class="sourceLineNo">1266</span> return null;<a name="line.1266"></a>
+<span class="sourceLineNo">1267</span> return (ClassMeta<T>)getClassMeta(o.getClass());<a name="line.1267"></a>
+<span class="sourceLineNo">1268</span> }<a name="line.1268"></a>
+<span class="sourceLineNo">1269</span><a name="line.1269"></a>
+<span class="sourceLineNo">1270</span><a name="line.1270"></a>
+<span class="sourceLineNo">1271</span> /**<a name="line.1271"></a>
+<span class="sourceLineNo">1272</span> * Used for determining the class type on a method or field where a {@code @BeanProperty} annotation<a name="line.1272"></a>
+<span class="sourceLineNo">1273</span> * may be present.<a name="line.1273"></a>
+<span class="sourceLineNo">1274</span> *<a name="line.1274"></a>
+<span class="sourceLineNo">1275</span> * @param <T> The class type we're wrapping.<a name="line.1275"></a>
+<span class="sourceLineNo">1276</span> * @param p The property annotation on the type if there is one.<a name="line.1276"></a>
+<span class="sourceLineNo">1277</span> * @param t The type.<a name="line.1277"></a>
+<span class="sourceLineNo">1278</span> * @param typeVarImpls Contains known resolved type parameters on the specified class so<a name="line.1278"></a>
+<span class="sourceLineNo">1279</span> * that we can result {@code ParameterizedTypes} and {@code TypeVariables}.<br><a name="line.1279"></a>
+<span class="sourceLineNo">1280</span> * Can be <jk>null</jk> if the information is not known.<a name="line.1280"></a>
+<span class="sourceLineNo">1281</span> * @return The new {@code ClassMeta} object wrapped around the {@code Type} object.<a name="line.1281"></a>
+<span class="sourceLineNo">1282</span> */<a name="line.1282"></a>
+<span class="sourceLineNo">1283</span> protected final <T> ClassMeta<T> resolveClassMeta(BeanProperty p, Type t, Map<Class<?>,Class<?>[]> typeVarImpls) {<a name="line.1283"></a>
+<span class="sourceLineNo">1284</span> ClassMeta<T> cm = resolveClassMeta(t, typeVarImpls);<a name="line.1284"></a>
+<span class="sourceLineNo">1285</span> ClassMeta<T> cm2 = cm;<a name="line.1285"></a>
+<span class="sourceLineNo">1286</span> if (p != null) {<a name="line.1286"></a>
+<span class="sourceLineNo">1287</span><a name="line.1287"></a>
+<span class="sourceLineNo">1288</span> if (p.type() != Object.class)<a name="line.1288"></a>
+<span class="sourceLineNo">1289</span> cm2 = resolveClassMeta(p.type(), typeVarImpls);<a name="line.1289"></a>
+<span class="sourceLineNo">1290</span><a name="line.1290"></a>
+<span class="sourceLineNo">1291</span> if (cm2.isMap()) {<a name="line.1291"></a>
+<span class="sourceLineNo">1292</span> Class<?>[] pParams = (p.params().length == 0 ? new Class[]{Object.class, Object.class} : p.params());<a name="line.1292"></a>
+<span class="sourceLineNo">1293</span> if (pParams.length != 2)<a name="line.1293"></a>
+<span class="sourceLineNo">1294</span> throw new RuntimeException("Invalid number of parameters specified for Map (must be 2): " + pParams.length);<a name="line.1294"></a>
+<span class="sourceLineNo">1295</span> ClassMeta<?> keyType = resolveType(pParams[0], cm2.getKeyType(), cm.getKeyType());<a name="line.1295"></a>
+<span class="sourceLineNo">1296</span> ClassMeta<?> valueType = resolveType(pParams[1], cm2.getValueType(), cm.getValueType());<a name="line.1296"></a>
+<span class="sourceLineNo">1297</span> if (keyType.isObject() && valueType.isObject())<a name="line.1297"></a>
+<span class="sourceLineNo">1298</span> return cm2;<a name="line.1298"></a>
+<span class="sourceLineNo">1299</span> return new ClassMeta<T>(cm2, keyType, valueType, null);<a name="line.1299"></a>
+<span class="sourceLineNo">1300</span> }<a name="line.1300"></a>
+<span class="sourceLineNo">1301</span><a name="line.1301"></a>
+<span class="sourceLineNo">1302</span> if (cm2.isCollection()) {<a name="line.1302"></a>
+<span class="sourceLineNo">1303</span> Class<?>[] pParams = (p.params().length == 0 ? new Class[]{Object.class} : p.params());<a name="line.1303"></a>
+<span class="sourceLineNo">1304</span> if (pParams.length != 1)<a name="line.1304"></a>
+<span class="sourceLineNo">1305</span> throw new RuntimeException("Invalid number of parameters specified for Collection (must be 1): " + pParams.length);<a name="line.1305"></a>
+<span class="sourceLineNo">1306</span> ClassMeta<?> elementType = resolveType(pParams[0], cm2.getElementType(), cm.getElementType());<a name="line.1306"></a>
+<span class="sourceLineNo">1307</span> if (elementType.isObject())<a name="line.1307"></a>
+<span class="sourceLineNo">1308</span> return cm2;<a name="line.1308"></a>
+<span class="sourceLineNo">1309</span> return new ClassMeta<T>(cm2, null, null, elementType);<a name="line.1309"></a>
+<span class="sourceLineNo">1310</span> }<a name="line.1310"></a>
+<span class="sourceLineNo">1311</span><a name="line.1311"></a>
+<span class="sourceLineNo">1312</span> return cm2;<a name="line.1312"></a>
<span class="sourceLineNo">1313</span> }<a name="line.1313"></a>
-<span class="sourceLineNo">1314</span> return cmObject;<a name="line.1314"></a>
-<span class="sourceLineNo">1315</span> }<a name="line.1315"></a>
-<span class="sourceLineNo">1316</span><a name="line.1316"></a>
-<span class="sourceLineNo">1317</span> /**<a name="line.1317"></a>
-<span class="sourceLineNo">1318</span> * Returns the {@link PojoSwap} associated with the specified class, or <jk>null</jk> if there is no<a name="line.1318"></a>
-<span class="sourceLineNo">1319</span> * pojo swap associated with the class.<a name="line.1319"></a>
-<span class="sourceLineNo">1320</span> *<a name="line.1320"></a>
-<span class="sourceLineNo">1321</span> * @param <T> The class associated with the swap.<a name="line.1321"></a>
-<span class="sourceLineNo">1322</span> * @param c The class associated with the swap.<a name="line.1322"></a>
-<span class="sourceLineNo">1323</span> * @return The swap associated with the class, or null if there is no association.<a name="line.1323"></a>
-<span class="sourceLineNo">1324</span> */<a name="line.1324"></a>
-<span class="sourceLineNo">1325</span> private final <T> PojoSwap findPojoSwap(Class<T> c) {<a name="line.1325"></a>
-<span class="sourceLineNo">1326</span> // Note: On first<a name="line.1326"></a>
-<span class="sourceLineNo">1327</span> if (c != null)<a name="line.1327"></a>
-<span class="sourceLineNo">1328</span> for (PojoSwap f : pojoSwaps)<a name="line.1328"></a>
-<span class="sourceLineNo">1329</span> if (isParentClass(f.getNormalClass(), c))<a name="line.1329"></a>
-<span class="sourceLineNo">1330</span> return f;<a name="line.1330"></a>
-<span class="sourceLineNo">1331</span> return null;<a name="line.1331"></a>
-<span class="sourceLineNo">1332</span> }<a name="line.1332"></a>
-<span class="sourceLineNo">1333</span><a name="line.1333"></a>
-<span class="sourceLineNo">1334</span> /**<a name="line.1334"></a>
-<span class="sourceLineNo">1335</span> * Checks whether a class has a {@link PojoSwap} associated with it in this bean context.<a name="line.1335"></a>
-<span class="sourceLineNo">1336</span> * @param c The class to check.<a name="line.1336"></a>
-<span class="sourceLineNo">1337</span> * @return <jk>true</jk> if the specified class or one of its subclasses has a {@link PojoSwap} associated with it.<a name="line.1337"></a>
-<span class="sourceLineNo">1338</span> */<a name="line.1338"></a>
-<span class="sourceLineNo">1339</span> private final PojoSwap[] findChildPojoSwaps(Class<?> c) {<a name="line.1339"></a>
-<span class="sourceLineNo">1340</span> if (c == null || pojoSwaps.length == 0)<a name="line.1340"></a>
-<span class="sourceLineNo">1341</span> return null;<a name="line.1341"></a>
-<span class="sourceLineNo">1342</span> List<PojoSwap> l = null;<a name="line.1342"></a>
-<span class="sourceLineNo">1343</span> for (PojoSwap f : pojoSwaps) {<a name="line.1343"></a>
-<span class="sourceLineNo">1344</span> if (isParentClass(c, f.getNormalClass())) {<a name="line.1344"></a>
-<span class="sourceLineNo">1345</span> if (l == null)<a name="line.1345"></a>
-<span class="sourceLineNo">1346</span> l = new ArrayList<PojoSwap>();<a name="line.1346"></a>
-<span class="sourceLineNo">1347</span> l.add(f);<a name="line.1347"></a>
-<span class="sourceLineNo">1348</span> }<a name="line.1348"></a>
-<span class="sourceLineNo">1349</span> }<a name="line.1349"></a>
-<span class="sourceLineNo">1350</span> return l == null ? null : l.toArray(new PojoSwap[l.size()]);<a name="line.1350"></a>
-<span class="sourceLineNo">1351</span> }<a name="line.1351"></a>
-<span class="sourceLineNo">1352</span><a name="line.1352"></a>
-<span class="sourceLineNo">1353</span> /**<a name="line.1353"></a>
-<span class="sourceLineNo">1354</span> * Returns the {@link BeanFilter} associated with the specified class, or <jk>null</jk> if there is no<a name="line.1354"></a>
-<span class="sourceLineNo">1355</span> * bean filter associated with the class.<a name="line.1355"></a>
-<span class="sourceLineNo">1356</span> *<a name="line.1356"></a>
-<span class="sourceLineNo">1357</span> * @param <T> The class associated with the bean filter.<a name="line.1357"></a>
-<span class="sourceLineNo">1358</span> * @param c The class associated with the bean filter.<a name="line.1358"></a>
-<span class="sourceLineNo">1359</span> * @return The bean filter associated with the class, or null if there is no association.<a name="line.1359"></a>
-<span class="sourceLineNo">1360</span> */<a name="line.1360"></a>
-<span class="sourceLineNo">1361</span> private final <T> BeanFilter findBeanFilter(Class<T> c) {<a name="line.1361"></a>
-<span class="sourceLineNo">1362</span> if (c != null)<a name="line.1362"></a>
-<span class="sourceLineNo">1363</span> for (BeanFilter f : beanFilters)<a name="line.1363"></a>
-<span class="sourceLineNo">1364</span> if (isParentClass(f.getBeanClass(), c))<a name="line.1364"></a>
-<span class="sourceLineNo">1365</span> return f;<a name="line.1365"></a>
-<span class="sourceLineNo">1366</span> return null;<a name="line.1366"></a>
-<span class="sourceLineNo">1367</span> }<a name="line.1367"></a>
-<span class="sourceLineNo">1368</span><a name="line.1368"></a>
-<span class="sourceLineNo">1369</span> /**<a name="line.1369"></a>
-<span class="sourceLineNo">1370</span> * Returns the type property name as defined by {@link BeanContext#BEAN_beanTypePropertyName}.<a name="line.1370"></a>
-<span class="sourceLineNo">1371</span> *<a name="line.1371"></a>
-<span class="sourceLineNo">1372</span> * @return The type property name. Never <jk>null</jk>.<a name="line.1372"></a>
-<span class="sourceLineNo">1373</span> */<a name="line.1373"></a>
-<span class="sourceLineNo">1374</span> protected final String getBeanTypePropertyName() {<a name="line.1374"></a>
-<span class="sourceLineNo">1375</span> return beanTypePropertyName;<a name="line.1375"></a>
-<span class="sourceLineNo">1376</span> }<a name="line.1376"></a>
-<span class="sourceLineNo">1377</span><a name="line.1377"></a>
-<span class="sourceLineNo">1378</span> /**<a name="line.1378"></a>
-<span class="sourceLineNo">1379</span> * Returns the bean registry defined in this bean context defined by {@link BeanContext#BEAN_beanDictionary}.<a name="line.1379"></a>
-<span class="sourceLineNo">1380</span> *<a name="line.1380"></a>
-<span class="sourceLineNo">1381</span> * @return The bean registry defined in this bean context. Never <jk>null</jk>.<a name="line.1381"></a>
-<span class="sourceLineNo">1382</span> */<a name="line.1382"></a>
-<span class="sourceLineNo">1383</span> protected final BeanRegistry getBeanRegistry() {<a name="line.1383"></a>
-<span class="sourceLineNo">1384</span> return beanRegistry;<a name="line.1384"></a>
-<span class="sourceLineNo">1385</span> }<a name="line.1385"></a>
-<span class="sourceLineNo">1386</span><a name="line.1386"></a>
-<span class="sourceLineNo">1387</span> /**<a name="line.1387"></a>
-<span class="sourceLineNo">1388</span> * Gets the no-arg constructor for the specified class.<a name="line.1388"></a>
-<span class="sourceLineNo">1389</span> *<a name="line.1389"></a>
-<span class="sourceLineNo">1390</span> * @param <T> The class to check.<a name="line.1390"></a>
-<span class="sourceLineNo">1391</span> * @param c The class to check.<a name="line.1391"></a>
-<span class="sourceLineNo">1392</span> * @param v The minimum visibility for the constructor.<a name="line.1392"></a>
-<span class="sourceLineNo">1393</span> * @return The no arg constructor, or <jk>null</jk> if the class has no no-arg constructor.<a name="line.1393"></a>
+<span class="sourceLineNo">1314</span><a name="line.1314"></a>
+<span class="sourceLineNo">1315</span> return cm;<a name="line.1315"></a>
+<span class="sourceLineNo">1316</span> }<a name="line.1316"></a>
+<span class="sourceLineNo">1317</span><a name="line.1317"></a>
+<span class="sourceLineNo">1318</span> private ClassMeta<?> resolveType(Type...t) {<a name="line.1318"></a>
+<span class="sourceLineNo">1319</span> for (Type tt : t) {<a name="line.1319"></a>
+<span class="sourceLineNo">1320</span> if (tt != null) {<a name="line.1320"></a>
+<span class="sourceLineNo">1321</span> ClassMeta<?> cm = getClassMeta(tt);<a name="line.1321"></a>
+<span class="sourceLineNo">1322</span> if (tt != cmObject)<a name="line.1322"></a>
+<span class="sourceLineNo">1323</span> return cm;<a name="line.1323"></a>
+<span class="sourceLineNo">1324</span> }<a name="line.1324"></a>
+<span class="sourceLineNo">1325</span> }<a name="line.1325"></a>
+<span class="sourceLineNo">1326</span> return cmObject;<a name="line.1326"></a>
+<span class="sourceLineNo">1327</span> }<a name="line.1327"></a>
+<span class="sourceLineNo">1328</span><a name="line.1328"></a>
+<span class="sourceLineNo">1329</span> /**<a name="line.1329"></a>
+<span class="sourceLineNo">1330</span> * Returns the {@link PojoSwap} associated with the specified class, or <jk>null</jk> if there is no<a name="line.1330"></a>
+<span class="sourceLineNo">1331</span> * pojo swap associated with the class.<a name="line.1331"></a>
+<span class="sourceLineNo">1332</span> *<a name="line.1332"></a>
+<span class="sourceLineNo">1333</span> * @param <T> The class associated with the swap.<a name="line.1333"></a>
+<span class="sourceLineNo">1334</span> * @param c The class associated with the swap.<a name="line.1334"></a>
+<span class="sourceLineNo">1335</span> * @return The swap associated with the class, or null if there is no association.<a name="line.1335"></a>
+<span class="sourceLineNo">1336</span> */<a name="line.1336"></a>
+<span class="sourceLineNo">1337</span> private final <T> PojoSwap findPojoSwap(Class<T> c) {<a name="line.1337"></a>
+<span class="sourceLineNo">1338</span> // Note: On first<a name="line.1338"></a>
+<span class="sourceLineNo">1339</span> if (c != null)<a name="line.1339"></a>
+<span class="sourceLineNo">1340</span> for (PojoSwap f : pojoSwaps)<a name="line.1340"></a>
+<span class="sourceLineNo">1341</span> if (isParentClass(f.getNormalClass(), c))<a name="line.1341"></a>
+<span class="sourceLineNo">1342</span> return f;<a name="line.1342"></a>
+<span class="sourceLineNo">1343</span> return null;<a name="line.1343"></a>
+<span class="sourceLineNo">1344</span> }<a name="line.1344"></a>
+<span class="sourceLineNo">1345</span><a name="line.1345"></a>
+<span class="sourceLineNo">1346</span> /**<a name="line.1346"></a>
+<span class="sourceLineNo">1347</span> * Checks whether a class has a {@link PojoSwap} associated with it in this bean context.<a name="line.1347"></a>
+<span class="sourceLineNo">1348</span> * @param c The class to check.<a name="line.1348"></a>
+<span class="sourceLineNo">1349</span> * @return <jk>true</jk> if the specified class or one of its subclasses has a {@link PojoSwap} associated with it.<a name="line.1349"></a>
+<span class="sourceLineNo">1350</span> */<a name="line.1350"></a>
+<span class="sourceLineNo">1351</span> private final PojoSwap[] findChildPojoSwaps(Class<?> c) {<a name="line.1351"></a>
+<span class="sourceLineNo">1352</span> if (c == null || pojoSwaps.length == 0)<a name="line.1352"></a>
+<span class="sourceLineNo">1353</span> return null;<a name="line.1353"></a>
+<span class="sourceLineNo">1354</span> List<PojoSwap> l = null;<a name="line.1354"></a>
+<span class="sourceLineNo">1355</span> for (PojoSwap f : pojoSwaps) {<a name="line.1355"></a>
+<span class="sourceLineNo">1356</span> if (isParentClass(c, f.getNormalClass())) {<a name="line.1356"></a>
+<span class="sourceLineNo">1357</span> if (l == null)<a name="line.1357"></a>
+<span class="sourceLineNo">1358</span> l = new ArrayList<PojoSwap>();<a name="line.1358"></a>
+<span class="sourceLineNo">1359</span> l.add(f);<a name="line.1359"></a>
+<span class="sourceLineNo">1360</span> }<a name="line.1360"></a>
+<span class="sourceLineNo">1361</span> }<a name="line.1361"></a>
+<span class="sourceLineNo">1362</span> return l == null ? null : l.toArray(new PojoSwap[l.size()]);<a name="line.1362"></a>
+<span class="sourceLineNo">1363</span> }<a name="line.1363"></a>
+<span class="sourceLineNo">1364</span><a name="line.1364"></a>
+<span class="sourceLineNo">1365</span> /**<a name="line.1365"></a>
+<span class="sourceLineNo">1366</span> * Returns the {@link BeanFilter} associated with the specified class, or <jk>null</jk> if there is no<a name="line.1366"></a>
+<span class="sourceLineNo">1367</span> * bean filter associated with the class.<a name="line.1367"></a>
+<span class="sourceLineNo">1368</span> *<a name="line.1368"></a>
+<span class="sourceLineNo">1369</span> * @param <T> The class associated with the bean filter.<a name="line.1369"></a>
+<span class="sourceLineNo">1370</span> * @param c The class associated with the bean filter.<a name="line.1370"></a>
+<span class="sourceLineNo">1371</span> * @return The bean filter associated with the class, or null if there is no association.<a name="line.1371"></a>
+<span class="sourceLineNo">1372</span> */<a name="line.1372"></a>
+<span class="sourceLineNo">1373</span> private final <T> BeanFilter findBeanFilter(Class<T> c) {<a name="line.1373"></a>
+<span class="sourceLineNo">1374</span> if (c != null)<a name="line.1374"></a>
+<span class="sourceLineNo">1375</span> for (BeanFilter f : beanFilters)<a name="line.1375"></a>
+<span class="sourceLineNo">1376</span> if (isParentClass(f.getBeanClass(), c))<a name="line.1376"></a>
+<span class="sourceLineNo">1377</span> return f;<a name="line.1377"></a>
+<span class="sourceLineNo">1378</span> return null;<a name="line.1378"></a>
+<span class="sourceLineNo">1379</span> }<a name="line.1379"></a>
+<span class="sourceLineNo">1380</span><a name="line.1380"></a>
+<span class="sourceLineNo">1381</span> /**<a name="line.1381"></a>
+<span class="sourceLineNo">1382</span> * Returns the type property name as defined by {@link BeanContext#BEAN_beanTypePropertyName}.<a name="line.1382"></a>
+<span class="sourceLineNo">1383</span> *<a name="line.1383"></a>
+<span class="sourceLineNo">1384</span> * @return The type property name. Never <jk>null</jk>.<a name="line.1384"></a>
+<span class="sourceLineNo">1385</span> */<a name="line.1385"></a>
+<span class="sourceLineNo">1386</span> protected final String getBeanTypePropertyName() {<a name="line.1386"></a>
+<span class="sourceLineNo">1387</span> return beanTypePropertyName;<a name="line.1387"></a>
+<span class="sourceLineNo">1388</span> }<a name="line.1388"></a>
+<span class="sourceLineNo">1389</span><a name="line.1389"></a>
+<span class="sourceLineNo">1390</span> /**<a name="line.1390"></a>
+<span class="sourceLineNo">1391</span> * Returns the bean registry defined in this bean context defined by {@link BeanContext#BEAN_beanDictionary}.<a name="line.1391"></a>
+<span class="sourceLineNo">1392</span> *<a name="line.1392"></a>
+<span class="sourceLineNo">1393</span> * @return The bean registry defined in this bean context. Never <jk>null</jk>.<a name="line.1393"></a>
<span class="sourceLineNo">1394</span> */<a name="line.1394"></a>
-<span class="sourceLineNo">1395</span> protected final <T> Constructor<? extends T> getImplClassConstructor(Class<T> c, Visibility v) {<a name="line.1395"></a>
-<span class="sourceLineNo">1396</span> if (implClasses.isEmpty())<a name="line.1396"></a>
-<span class="sourceLineNo">1397</span> return null;<a name="line.1397"></a>
-<span class="sourceLineNo">1398</span> Class cc = c;<a name="line.1398"></a>
-<span class="sourceLineNo">1399</span> while (cc != null) {<a name="line.1399"></a>
-<span class="sourceLineNo">1400</span> Class implClass = implClasses.get(cc);<a name="line.1400"></a>
-<span class="sourceLineNo">1401</span> if (implClass != null)<a name="line.1401"></a>
-<span class="sourceLineNo">1402</span> return findNoArgConstructor(implClass, v);<a name="line.1402"></a>
-<span class="sourceLineNo">1403</span> for (Class ic : cc.getInterfaces()) {<a name="line.1403"></a>
-<span class="sourceLineNo">1404</span> implClass = implClasses.get(ic);<a name="line.1404"></a>
-<span class="sourceLineNo">1405</span> if (implClass != null)<a name="line.1405"></a>
-<span class="sourceLineNo">1406</span> return findNoArgConstructor(implClass, v);<a name="line.1406"></a>
-<span class="sourceLineNo">1407</span> }<a name="line.1407"></a>
-<span class="sourceLineNo">1408</span> cc = cc.getSuperclass();<a name="line.1408"></a>
-<span class="sourceLineNo">1409</span> }<a name="line.1409"></a>
-<span class="sourceLineNo">1410</span> return null;<a name="line.1410"></a>
-<span class="sourceLineNo">1411</span> }<a name="line.1411"></a>
-<span class="sourceLineNo">1412</span><a name="line.1412"></a>
-<span class="sourceLineNo">1413</span> private final <T> Class<? extends T> findImplClass(Class<T> c) {<a name="line.1413"></a>
-<span class="sourceLineNo">1414</span> if (implClasses.isEmpty())<a name="line.1414"></a>
-<span class="sourceLineNo">1415</span> return null;<a name="line.1415"></a>
-<span class="sourceLineNo">1416</span> Class cc = c;<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span> while (cc != null) {<a name="line.1417"></a>
-<span class="sourceLineNo">1418</span> Class implClass = implClasses.get(cc);<a name="line.1418"></a>
-<span class="sourceLineNo">1419</span> if (implClass != null)<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span> return implClass;<a name="line.1420"></a>
-<span class="sourceLineNo">1421</span> for (Class ic : cc.getInterfaces()) {<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span> implClass = implClasses.get(ic);<a name="line.1422"></a>
-<span class="sourceLineNo">1423</span> if (implClass != null)<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span> return implClass;<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span> }<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span> cc = cc.getSuperclass();<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span> }<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> return null;<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> }<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span><a name="line.1430"></a>
-<span class="sourceLineNo">1431</span> /**<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span> * Returns a reusable {@link ClassMeta} representation for the class <code>Object</code>.<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span> * <p><a name="line.1433"></a>
-<span class="sourceLineNo">1434</span> * This <code>ClassMeta</code> is often used to represent "any object type" when an object type<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> * is not known.<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span> * <p><a name="line.1436"></a>
-<span class="sourceLineNo">1437</span> * This method is identical to calling <code>getClassMeta(Object.<jk>class</jk>)</code> but uses<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span> * a cached copy to avoid a hashmap lookup.<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span> *<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span> * @return The {@link ClassMeta} object associated with the <code>Object</code> class.<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span> */<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span> protected final ClassMeta<Object> object() {<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span> return cmObject;<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span> }<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span><a name="line.1445"></a>
-<span class="sourceLineNo">1446</span> /**<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span> * Returns a reusable {@link ClassMeta} representation for the class <code>String</code>.<a name="line.1447"></a>
+<span class="sourceLineNo">1395</span> protected final BeanRegistry getBeanRegistry() {<a name="line.1395"></a>
+<span class="sourceLineNo">1396</span> return beanRegistry;<a name="line.1396"></a>
+<span class="sourceLineNo">1397</span> }<a name="line.1397"></a>
+<span class="sourceLineNo">1398</span><a name="line.1398"></a>
+<span class="sourceLineNo">1399</span> /**<a name="line.1399"></a>
+<span class="sourceLineNo">1400</span> * Gets the no-arg constructor for the specified class.<a name="line.1400"></a>
+<span class="sourceLineNo">1401</span> *<a name="line.1401"></a>
+<span class="sourceLineNo">1402</span> * @param <T> The class to check.<a name="line.1402"></a>
+<span class="sourceLineNo">1403</span> * @param c The class to check.<a name="line.1403"></a>
+<span class="sourceLineNo">1404</span> * @param v The minimum visibility for the constructor.<a name="line.1404"></a>
+<span class="sourceLineNo">1405</span> * @return The no arg constructor, or <jk>null</jk> if the class has no no-arg constructor.<a name="line.1405"></a>
+<span class="sourceLineNo">1406</span> */<a name="line.1406"></a>
+<span class="sourceLineNo">1407</span> protected final <T> Constructor<? extends T> getImplClassConstructor(Class<T> c, Visibility v) {<a name="line.1407"></a>
+<span class="sourceLineNo">1408</span> if (implClasses.isEmpty())<a name="line.1408"></a>
+<span class="sourceLineNo">1409</span> return null;<a name="line.1409"></a>
+<span class="sourceLineNo">1410</span> Class cc = c;<a name="line.1410"></a>
+<span class="sourceLineNo">1411</span> while (cc != null) {<a name="line.1411"></a>
+<span class="sourceLineNo">1412</span> Class implClass = implClasses.get(cc);<a name="line.1412"></a>
+<span class="sourceLineNo">1413</span> if (implClass != null)<a name="line.1413"></a>
+<span class="sourceLineNo">1414</span> return findNoArgConstructor(implClass, v);<a name="line.1414"></a>
+<span class="sourceLineNo">1415</span> for (Class ic : cc.getInterfaces()) {<a name="line.1415"></a>
+<span class="sourceLineNo">1416</span> implClass = implClasses.get(ic);<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span> if (implClass != null)<a name="line.1417"></a>
+<span class="sourceLineNo">1418</span> return findNoArgConstructor(implClass, v);<a name="line.1418"></a>
+<span class="sourceLineNo">1419</span> }<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span> cc = cc.getSuperclass();<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span> }<a name="line.1421"></a>
+<span class="sourceLineNo">1422</span> return null;<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span> }<a name="line.1423"></a>
+<span class="sourceLineNo">1424</span><a name="line.1424"></a>
+<span class="sourceLineNo">1425</span> private final <T> Class<? extends T> findImplClass(Class<T> c) {<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span> if (implClasses.isEmpty())<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span> return null;<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span> Class cc = c;<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span> while (cc != null) {<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span> Class implClass = implClasses.get(cc);<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span> if (implClass != null)<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span> return implClass;<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span> for (Class ic : cc.getInterfaces()) {<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span> implClass = implClasses.get(ic);<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span> if (implClass != null)<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span> return implClass;<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span> }<a name="line.1437"></a>
+<span class="sourceLineNo">1438</span> cc = cc.getSuperclass();<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span> }<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span> return null;<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span> }<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span><a name="line.1442"></a>
+<span class="sourceLineNo">1443</span> /**<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span> * Returns a reusable {@link ClassMeta} representation for the class <code>Object</code>.<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span> * <p><a name="line.1445"></a>
+<span class="sourceLineNo">1446</span> * This <code>ClassMeta</code> is often used to represent "any object type" when an object type<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span> * is not known.<a name="line.1447"></a>
<span class="sourceLineNo">1448</span> * <p><a name="line.1448"></a>
-<span class="sourceLineNo">1449</span> * This <code>ClassMeta</code> is often used to represent key types in maps.<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span> * <p><a name="line.1450"></a>
-<span class="sourceLineNo">1451</span> * This method is identical to calling <code>getClassMeta(String.<jk>class</jk>)</code> but uses<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span> * a cached copy to avoid a hashmap lookup.<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span> *<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span> * @return The {@link ClassMeta} object associated with the <code>String</code> class.<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span> */<a name="line.1455"></a>
-<span class="sourceLineNo">1456</span> protected final ClassMeta<String> string() {<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span> return cmString;<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span> }<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span><a name="line.1459"></a>
-<span class="sourceLineNo">1460</span> /**<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span> * Returns a reusable {@link ClassMeta} representation for the class <code>Class</code>.<a name="line.1461"></a>
+<span class="sourceLineNo">1449</span> * This method is identical to calling <code>getClassMeta(Object.<jk>class</jk>)</code> but uses<a name="line.1449"></a>
+<span class="sourceLineNo">1450</span> * a cached copy to avoid a hashmap lookup.<a name="line.1450"></a>
+<span class="sourceLineNo">1451</span> *<a name="line.1451"></a>
+<span class="sourceLineNo">1452</span> * @return The {@link ClassMeta} object associated with the <code>Object</code> class.<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span> */<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span> protected final ClassMeta<Object> object() {<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span> return cmObject;<a name="line.1455"></a>
+<span class="sourceLineNo">1456</span> }<a name="line.1456"></a>
+<span class="sourceLineNo">1457</span><a name="line.1457"></a>
+<span class="sourceLineNo">1458</span> /**<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span> * Returns a reusable {@link ClassMeta} representation for the class <code>String</code>.<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span> * <p><a name="line.1460"></a>
+<span class="sourceLineNo">1461</span> * This <code>ClassMeta</code> is often used to represent key types in maps.<a name="line.1461"></a>
<span class="sourceLineNo">1462</span> * <p><a name="line.1462"></a>
-<span class="sourceLineNo">1463</span> * This <code>ClassMeta</code> is often used to represent key types in maps.<a name="line.1463"></a>
-<span class="sourceLineNo">1464</span> * <p><a name="line.1464"></a>
-<span class="sourceLineNo">1465</span> * This method is identical to calling <code>getClassMeta(Class.<jk>class</jk>)</code> but uses<a name="line.1465"></a>
-<span class="sourceLineNo">1466</span> * a cached copy to avoid a hashmap lookup.<a name="line.1466"></a>
-<span class="sourceLineNo">1467</span> *<a name="line.1467"></a>
-<span class="sourceLineNo">1468</span> * @return The {@link ClassMeta} object associated with the <code>String</code> class.<a name="line.1468"></a>
-<span class="sourceLineNo">1469</span> */<a name="line.1469"></a>
-<span class="sourceLineNo">1470</span> protected final ClassMeta<Class> _class() {<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span> return cmClass;<a name="line.1471"></a>
-<span class="sourceLineNo">1472</span> }<a name="line.1472"></a>
-<span class="sourceLineNo">1473</span><a name="line.1473"></a>
-<span class="sourceLineNo">1474</span> @Override /* Object */<a name="line.1474"></a>
-<span class="sourceLineNo">1475</span> public int hashCode() {<a name="line.1475"></a>
-<span class="sourceLineNo">1476</span> return hashCode;<a name="line.1476"></a>
-<span class="sourceLineNo">1477</span> }<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span><a name="line.1478"></a>
-<span class="sourceLineNo">1479</span> @Override /* Object */<a name="line.1479"></a>
-<span class="sourceLineNo">1480</span> public boolean equals(Object o) {<a name="line.1480"></a>
-<span class="sourceLineNo">1481</span> if (this == o)<a name="line.1481"></a>
-<span class="sourceLineNo">1482</span> return true;<a name="line.1482"></a>
-<span class="sourceLineNo">1483</span> if (o instanceof BeanContext)<a name="line.1483"></a>
-<span class="sourceLineNo">1484</span> return ((BeanContext)o).hashCode == hashCode;<a name="line.1484"></a>
-<span class="sourceLineNo">1485</span> return false;<a name="line.1485"></a>
-<span class="sourceLineNo">1486</span> }<a name="line.1486"></a>
-<span class="sourceLineNo">1487</span><a name="line.1487"></a>
-<span class="sourceLineNo">1488</span> @Override /* Context */<a name="line.1488"></a>
-<span class="sourceLineNo">1489</span> public ObjectMap asMap() {<a name="line.1489"></a>
-<span class="sourceLineNo">1490</span> return super.asMap()<a name="line.1490"></a>
-<span class="sourceLineNo">1491</span> .append("BeanContext", new ObjectMap()<a name="line.1491"></a>
-<span class="sourceLineNo">1492</span> .append("id", System.identityHashCode(this))<a name="line.1492"></a>
-<span class="sourceLineNo">1493</span> .append("beansRequireDefaultConstructor", beansRequireDefaultConstructor)<a name="line.1493"></a>
-<span class="sourceLineNo">1494</span> .append("beansRequireSerializable", beansRequireSerializable)<a name="line.1494"></a>
-<span class="sourceLineNo">1495</span> .append("beansRequireSettersForGetters", beansRequireSettersForGetters)<a name="line.1495"></a>
-<span class="sourceLineNo">1496</span> .append("beansRequireSomeProperties", beansRequireSomeProperties)<a name="line.1496"></a>
-<span class="sourceLineNo">1497</span> .append("beanMapPutReturnsOldValue", beanMapPutReturnsOldValue)<a name="line.1497"></a>
-<span class="sourceLineNo">1498</span> .append("beanConstructorVisibility", beanConstructorVisibility)<a name="line.1498"></a>
-<span class="sourceLineNo">1499</span> .append("beanClassVisibility", beanClassVisibility)<a name="line.1499"></a>
-<span class="sourceLineNo">1500</span> .append("beanMethodVisibility", beanMethodVisibility)<a name="line.1500"></a>
-<span class="sourceLineNo">1501</span> .append("beanFieldVisibility", beanFieldVisibility)<a name="line.1501"></a>
-<span class="sourceLineNo">1502</span> .append("useInterfaceProxies", useInterfaceProxies)<a name="line.1502"></a>
-<span class="sourceLineNo">1503</span> .append("ignoreUnknownBeanProperties", ignoreUnknownBeanProperties)<a name="line.1503"></a>
-<span class="sourceLineNo">1504</span> .append("ignoreUnknownNullBeanProperties", ignoreUnknownNullBeanProperties)<a name="line.1504"></a>
-<span class="sourceLineNo">1505</span> .append("ignorePropertiesWithoutSetters", ignorePropertiesWithoutSetters)<a name="line.1505"></a>
-<span class="sourceLineNo">1506</span> .append("ignoreInvocationExceptionsOnGetters", ignoreInvocationExceptionsOnGetters)<a name="line.1506"></a>
-<span class="sourceLineNo">1507</span> .append("ignoreInvocationExceptionsOnSetters", ignoreInvocationExceptionsOnSetters)<a name="line.1507"></a>
-<span class="sourceLineNo">1508</span> .append("useJavaBeanIntrospector", useJavaBeanIntrospector)<a name="line.1508"></a>
-<span class="sourceLineNo">1509</span> .append("beanFilters", beanFilters)<a name="line.1509"></a>
-<span class="sourceLineNo">1510</span> .append("pojoSwaps", pojoSwaps)<a name="line.1510"></a>
-<span class="sourceLineNo">1511</span> .append("notBeanClasses", notBeanClasses)<a name="line.1511"></a>
-<span class="sourceLineNo">1512</span> .append("implClasses", implClasses)<a name="line.1512"></a>
-<span class="sourceLineNo">1513</span> .append("sortProperties", sortProperties)<a name="line.1513"></a>
-<span class="sourceLineNo">1514</span> .append("locale", locale)<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span> .append("timeZone", timeZone)<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span> .append("mediaType", mediaType)<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span> );<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span> }<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>}<a name="line.1519"></a>
+<span class="sourceLineNo">1463</span> * This method is identical to calling <code>getClassMeta(String.<jk>class</jk>)</code> but uses<a name="line.1463"></a>
+<span class="sourceLineNo">1464</span> * a cached copy to avoid a hashmap lookup.<a name="line.1464"></a>
+<span class="sourceLineNo">1465</span> *<a name="line.1465"></a>
+<span class="sourceLineNo">1466</span> * @return The {@link ClassMeta} object associated with the <code>String</code> class.<a name="line.1466"></a>
+<span class="sourceLineNo">1467</span> */<a name="line.1467"></a>
+<span class="sourceLineNo">1468</span> protected final ClassMeta<String> string() {<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span> return cmString;<a name="line.1469"></a>
+<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
+<span class="sourceLineNo">1471</span><a name="line.1471"></a>
+<span class="sourceLineNo">1472</span> /**<a name="line.1472"></a>
+<span class="sourceLineNo">1473</span> * Returns a reusable {@link ClassMeta} representation for the class <code>Class</code>.<a name="line.1473"></a>
+<span class="sourceLineNo">1474</span> * <p><a name="line.1474"></a>
+<span class="sourceLineNo">1475</span> * This <code>ClassMeta</code> is often used to represent key types in maps.<a name="line.1475"></a>
+<span class="sourceLineNo">1476</span> * <p><a name="line.1476"></a>
+<span class="sourceLineNo">1477</span> * This method is identical to calling <code>getClassMeta(Class.<jk>class</jk>)</code> but uses<a name="line.1477"></a>
+<span class="sourceLineNo">1478</span> * a cached copy to avoid a hashmap lookup.<a name="line.1478"></a>
+<span class="sourceLineNo">1479</span> *<a name="line.1479"></a>
+<span class="sourceLineNo">1480</span> * @return The {@link ClassMeta} object associated with the <code>String</code> class.<a name="line.1480"></a>
+<span class="sourceLineNo">1481</span> */<a name="line.1481"></a>
+<span class="sourceLineNo">1482</span> protected final ClassMeta<Class> _class() {<a name="line.1482"></a>
+<span class="sourceLineNo">1483</span> return cmClass;<a name="line.1483"></a>
+<span class="sourceLineNo">1484</span> }<a name="line.1484"></a>
+<span class="sourceLineNo">1485</span><a name="line.1485"></a>
+<span class="sourceLineNo">1486</span> @Override /* Object */<a name="line.1486"></a>
+<span class="sourceLineNo">1487</span> public int hashCode() {<a name="line.1487"></a>
+<span class="sourceLineNo">1488</span> return hashCode;<a name="line.1488"></a>
+<span class="sourceLineNo">1489</span> }<a name="line.1489"></a>
+<span class="sourceLineNo">1490</span><a name="line.1490"></a>
+<span class="sourceLineNo">1491</span> @Override /* Object */<a name="line.1491"></a>
+<span class="sourceLineNo">1492</span> public boolean equals(Object o) {<a name="line.1492"></a>
+<span class="sourceLineNo">1493</span> if (this == o)<a name="line.1493"></a>
+<span class="sourceLineNo">1494</span> return true;<a name="line.1494"></a>
+<span class="sourceLineNo">1495</span> if (o instanceof BeanContext)<a name="line.1495"></a>
+<span class="sourceLineNo">1496</span> return ((BeanContext)o).hashCode == hashCode;<a name="line.1496"></a>
+<span class="sourceLineNo">1497</span> return false;<a name="line.1497"></a>
+<span class="sourceLineNo">1498</span> }<a name="line.1498"></a>
+<span class="sourceLineNo">1499</span><a name="line.1499"></a>
+<span class="sourceLineNo">1500</span> @Override /* Context */<a name="line.1500"></a>
+<span class="sourceLineNo">1501</span> public ObjectMap asMap() {<a name="line.1501"></a>
+<span class="sourceLineNo">1502</span> return super.asMap()<a name="line.1502"></a>
+<span class="sourceLineNo">1503</span> .append("BeanContext", new ObjectMap()<a name="line.1503"></a>
+<span class="sourceLineNo">1504</span> .append("id", System.identityHashCode(this))<a name="line.1504"></a>
+<span class="sourceLineNo">1505</span> .append("beansRequireDefaultConstructor", beansRequireDefaultConstructor)<a name="line.1505"></a>
+<span class="sourceLineNo">1506</span> .append("beansRequireSerializable", beansRequireSerializable)<a name="line.1506"></a>
+<span class="sourceLineNo">1507</span> .append("beansRequireSettersForGetters", beansRequireSettersForGetters)<a name="line.1507"></a>
+<span class="sourceLineNo">1508</span> .append("beansRequireSomeProperties", beansRequireSomeProperties)<a name="line.1508"></a>
+<span class="sourceLineNo">1509</span> .append("beanMapPutReturnsOldValue", beanMapPutReturnsOldValue)<a name="line.1509"></a>
+<span class="sourceLineNo">1510</span> .append("beanConstructorVisibility", beanConstructorVisibility)<a name="line.1510"></a>
+<span class="sourceLineNo">1511</span> .append("beanClassVisibility", beanClassVisibility)<a name="line.1511"></a>
+<span class="sourceLineNo">1512</span> .append("beanMethodVisibility", beanMethodVisibility)<a name="line.1512"></a>
+<span class="sourceLineNo">1513</span> .append("beanFieldVisibility", beanFieldVisibility)<a name="line.1513"></a>
+<span class="sourceLineNo">1514</span> .append("useInterfaceProxies", useInterfaceProxies)<a name="line.1514"></a>
+<span class="sourceLineNo">1515</span> .append("ignoreUnknownBeanProperties", ignoreUnknownBeanProperties)<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span> .append("ignoreUnknownNullBeanProperties", ignoreUnknownNullBeanProperties)<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span> .append("ignorePropertiesWithoutSetters", ignorePropertiesWithoutSetters)<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span> .append("ignoreInvocationExceptionsOnGetters", ignoreInvocationExceptionsOnGetters)<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span> .append("ignoreInvocationExceptionsOnSetters", ignoreInvocationExceptionsOnSetters)<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span> .append("useJavaBeanIntrospector", useJavaBeanIntrospector)<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span> .append("beanFilters", beanFilters)<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span> .append("pojoSwaps", pojoSwaps)<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span> .append("notBeanClasses", notBeanClasses)<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span> .append("implClasses", implClasses)<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span> .append("sortProperties", sortProperties)<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span> .append("locale", locale)<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span> .append("timeZone", timeZone)<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span> .append("mediaType", mediaType)<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span> );<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span> }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>}<a name="line.1531"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html b/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
index 6627ff9..3e34acd 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
@@ -604,7 +604,7 @@
<span class="sourceLineNo">596</span> public final Object toArray(ClassMeta<?> type, Collection<?> list) {<a name="line.596"></a>
<span class="sourceLineNo">597</span> if (list == null)<a name="line.597"></a>
<span class="sourceLineNo">598</span> return null;<a name="line.598"></a>
-<span class="sourceLineNo">599</span> ClassMeta<?> componentType = type.getElementType();<a name="line.599"></a>
+<span class="sourceLineNo">599</span> ClassMeta<?> componentType = type.isArgs() ? object() : type.getElementType();<a name="line.599"></a>
<span class="sourceLineNo">600</span> Object array = Array.newInstance(componentType.getInnerClass(), list.size());<a name="line.600"></a>
<span class="sourceLineNo">601</span> int i = 0;<a name="line.601"></a>
<span class="sourceLineNo">602</span> for (Object o : list) {<a name="line.602"></a>
@@ -851,18 +851,18 @@
<span class="sourceLineNo">843</span> }<a name="line.843"></a>
<span class="sourceLineNo">844</span><a name="line.844"></a>
<span class="sourceLineNo">845</span> /**<a name="line.845"></a>
-<span class="sourceLineNo">846</span> * Given an array of {@link Type} objects, returns an array of corresponding {@link ClassMeta} objects.<a name="line.846"></a>
-<span class="sourceLineNo">847</span> * Constructs a new array on each call.<a name="line.847"></a>
+<span class="sourceLineNo">846</span> * Given an array of {@link Type} objects, returns a {@link ClassMeta} representing those arguments.<a name="line.846"></a>
+<span class="sourceLineNo">847</span> * Constructs a new meta on each call.<a name="line.847"></a>
<span class="sourceLineNo">848</span> *<a name="line.848"></a>
<span class="sourceLineNo">849</span> * @param classes The array of classes to get class metas for.<a name="line.849"></a>
-<span class="sourceLineNo">850</span> * @return An array of {@link ClassMeta} objects corresponding to the classes. Never <jk>null</jk>.<a name="line.850"></a>
+<span class="sourceLineNo">850</span> * @return The args {@link ClassMeta} object corresponding to the classes. Never <jk>null</jk>.<a name="line.850"></a>
<span class="sourceLineNo">851</span> */<a name="line.851"></a>
-<span class="sourceLineNo">852</span> public final ClassMeta<?>[] getClassMetas(Type[] classes) {<a name="line.852"></a>
+<span class="sourceLineNo">852</span> public final ClassMeta<Object[]> getArgsClassMeta(Type[] classes) {<a name="line.852"></a>
<span class="sourceLineNo">853</span> assertFieldNotNull(classes, "classes");<a name="line.853"></a>
-<span class="sourceLineNo">854</span> ClassMeta<?>[] cm = new ClassMeta<?>[classes.length];<a name="line.854"></a>
+<span class="sourceLineNo">854</span> ClassMeta[] cm = new ClassMeta<?>[classes.length];<a name="line.854"></a>
<span class="sourceLineNo">855</span> for (int i = 0; i < classes.length; i++)<a name="line.855"></a>
<span class="sourceLineNo">856</span> cm[i] = getClassMeta(classes[i]);<a name="line.856"></a>
-<span class="sourceLineNo">857</span> return cm;<a name="line.857"></a>
+<span class="sourceLineNo">857</span> return new ClassMeta(cm);<a name="line.857"></a>
<span class="sourceLineNo">858</span> }<a name="line.858"></a>
<span class="sourceLineNo">859</span><a name="line.859"></a>
<span class="sourceLineNo">860</span> /**<a name="line.860"></a>
[50/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/index-all.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/index-all.html b/content/site/apidocs/index-all.html
index e2c10ff..13a1a9f 100644
--- a/content/site/apidocs/index-all.html
+++ b/content/site/apidocs/index-all.html
@@ -825,6 +825,12 @@
<dd>
<div class="block">Logs a warning message.</div>
</dd>
+<dt><a href="org/apache/juneau/utils/AList.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">AList</span></a><<a href="org/apache/juneau/utils/AList.html" title="type parameter in AList">T</a>> - Class in <a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></dt>
+<dd>
+<div class="block">An extension of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedList.html?is-external=true" title="class or interface in java.util"><code>LinkedList</code></a> with a convenience <a href="org/apache/juneau/utils/AList.html#append-T-"><code>AList.append(Object)</code></a> method.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/AList.html#AList--">AList()</a></span> - Constructor for class org.apache.juneau.utils.<a href="org/apache/juneau/utils/AList.html" title="class in org.apache.juneau.utils">AList</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/SchemaInfo.html#allOf-java.lang.Object...-">allOf(Object...)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/SchemaInfo.html" title="class in org.apache.juneau.dto.swagger">SchemaInfo</a></dt>
<dd>
<div class="block">Synonym for <a href="org/apache/juneau/dto/swagger/SchemaInfo.html#addAllOf-java.lang.Object...-"><code>SchemaInfo.addAllOf(Object...)</code></a>.</div>
@@ -861,6 +867,12 @@
<dd>
<div class="block"><a class="./org/apache/juneau/dto/html5/doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-alt">alt</a> attribute.</div>
</dd>
+<dt><a href="org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">AMap</span></a><<a href="org/apache/juneau/utils/AMap.html" title="type parameter in AMap">K</a>,<a href="org/apache/juneau/utils/AMap.html" title="type parameter in AMap">V</a>> - Class in <a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></dt>
+<dd>
+<div class="block">An extension of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMap.html?is-external=true" title="class or interface in java.util"><code>LinkedHashMap</code></a> with a convenience <a href="org/apache/juneau/utils/AMap.html#append-K-V-"><code>AMap.append(Object,Object)</code></a> method.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/AMap.html#AMap--">AMap()</a></span> - Constructor for class org.apache.juneau.utils.<a href="org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils">AMap</a></dt>
+<dd> </dd>
<dt><a href="org/apache/juneau/transform/AnnotationBeanFilterBuilder.html" title="class in org.apache.juneau.transform"><span class="typeNameLink">AnnotationBeanFilterBuilder</span></a> - Class in <a href="org/apache/juneau/transform/package-summary.html">org.apache.juneau.transform</a></dt>
<dd>
<div class="block">Bean filter builder initialized from the contents of a <a href="org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation"><code>@Bean</code></a> annotation found on a class.</div>
@@ -1005,6 +1017,18 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonWriter.html#append-char-">append(char)</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/AList.html#append-T-">append(T)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/AList.html" title="class in org.apache.juneau.utils">AList</a></dt>
+<dd>
+<div class="block">Adds an entry to this list.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/AMap.html#append-K-V-">append(K, V)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/AMap.html" title="class in org.apache.juneau.utils">AMap</a></dt>
+<dd>
+<div class="block">Adds an entry to this map.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/ASet.html#append-T-">append(T)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils">ASet</a></dt>
+<dd>
+<div class="block">Adds an entry to this set.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/ProcBuilder.html#append-java.lang.Object...-">append(Object...)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/ProcBuilder.html" title="class in org.apache.juneau.utils">ProcBuilder</a></dt>
<dd>
<div class="block">Append to the command arguments.</div>
@@ -1216,6 +1240,12 @@
<dd>
<div class="block">Constructor.</div>
</dd>
+<dt><a href="org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">ASet</span></a><<a href="org/apache/juneau/utils/ASet.html" title="type parameter in ASet">T</a>> - Class in <a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></dt>
+<dd>
+<div class="block">An extension of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashSet.html?is-external=true" title="class or interface in java.util"><code>LinkedHashSet</code></a> with a convenience <a href="org/apache/juneau/utils/ASet.html#append-T-"><code>ASet.append(Object)</code></a> method.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/ASet.html#ASet--">ASet()</a></span> - Constructor for class org.apache.juneau.utils.<a href="org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils">ASet</a></dt>
+<dd> </dd>
<dt><a href="org/apache/juneau/dto/html5/Aside.html" title="class in org.apache.juneau.dto.html5"><span class="typeNameLink">Aside</span></a> - Class in <a href="org/apache/juneau/dto/html5/package-summary.html">org.apache.juneau.dto.html5</a></dt>
<dd>
<div class="block">DTO for an HTML <a class="./org/apache/juneau/dto/html5/doclink" href="https://www.w3.org/TR/html5/sections.html#the-aside-element"><aside></a> element.</div>
@@ -2857,6 +2887,22 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlSerializerBuilder.html#build--">build()</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlSerializerBuilder.html" title="class in org.apache.juneau.html">HtmlSerializerBuilder</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#build-java.lang.String-">build(String)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd>
+<div class="block">Returns the config file with the specified absolute or relative path.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#build--">build()</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd>
+<div class="block">Create a new empty config file not backed by any file.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#build-java.io.File-">build(File)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd>
+<div class="block">Create a new config file backed by the specified file.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#build-java.io.Reader-">build(Reader)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd>
+<div class="block">Create a new config file not backed by a file.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/jena/RdfParserBuilder.html#build--">build()</a></span> - Method in class org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfParserBuilder.html" title="class in org.apache.juneau.jena">RdfParserBuilder</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/jena/RdfSerializerBuilder.html#build--">build()</a></span> - Method in class org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfSerializerBuilder.html" title="class in org.apache.juneau.jena">RdfSerializerBuilder</a></dt>
@@ -3287,7 +3333,9 @@
<dd>
<div class="block"><a class="./org/apache/juneau/dto/html5/doclink" href="https://www.w3.org/TR/html5/forms.html#attr-keygen-challenge">challenge</a> attribute.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/StringObject.html#charAt-int-">charAt(int)</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringMessage.html#charAt-int-">charAt(int)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringObject.html#charAt-int-">charAt(int)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></dt>
<dd> </dd>
<dt><a href="org/apache/juneau/internal/CharSequenceReader.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">CharSequenceReader</span></a> - Class in <a href="org/apache/juneau/internal/package-summary.html">org.apache.juneau.internal</a></dt>
<dd>
@@ -3305,6 +3353,10 @@
<dd>
<div class="block"><a class="./org/apache/juneau/dto/html5/doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-script-charset">charset</a> attribute.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#charset-java.nio.charset.Charset-">charset(Charset)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd>
+<div class="block">Specify the config file character encoding.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/resources/DirectoryResource.html#checkAccess-org.apache.juneau.rest.RestRequest-">checkAccess(RestRequest)</a></span> - Method in class org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/DirectoryResource.html" title="class in org.apache.juneau.microservice.resources">DirectoryResource</a></dt>
<dd>
<div class="block">Verify that the specified request is allowed.</div>
@@ -4108,6 +4160,12 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFile.html#ConfigFile--">ConfigFile()</a></span> - Constructor for class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></dt>
<dd> </dd>
+<dt><a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileBuilder</span></a> - Class in <a href="org/apache/juneau/ini/package-summary.html">org.apache.juneau.ini</a></dt>
+<dd>
+<div class="block">Builder for creating instances of <a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFiles</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#ConfigFileBuilder--">ConfigFileBuilder()</a></span> - Constructor for class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd> </dd>
<dt><a href="org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileFormat</span></a> - Enum in <a href="org/apache/juneau/ini/package-summary.html">org.apache.juneau.ini</a></dt>
<dd>
<div class="block">Valid formats that can be passed to the <a href="org/apache/juneau/ini/ConfigFile.html#serializeTo-java.io.Writer-org.apache.juneau.ini.ConfigFileFormat-"><code>ConfigFile.serializeTo(Writer, ConfigFileFormat)</code></a> method.</div>
@@ -4147,14 +4205,6 @@
<div class="block">Wraps an instance of <a href="org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><code>ConfigFileImpl</code></a> in an interface that will
automatically replace <a href="org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a> variables.</div>
</dd>
-<dt><a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigMgr</span></a> - Class in <a href="org/apache/juneau/ini/package-summary.html">org.apache.juneau.ini</a></dt>
-<dd>
-<div class="block">Manager for retrieving shared instances of <a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFiles</code></a>.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigMgr.html#ConfigMgr-boolean-org.apache.juneau.ini.Encoder-org.apache.juneau.serializer.WriterSerializer-org.apache.juneau.parser.ReaderParser-java.nio.charset.Charset-java.lang.String:A-">ConfigMgr(boolean, Encoder, WriterSerializer, ReaderParser, Charset, String[])</a></span> - Constructor for class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></dt>
-<dd>
-<div class="block">Create a custom configuration manager.</div>
-</dd>
<dt><a href="org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">ConfigResource</span></a> - Class in <a href="org/apache/juneau/microservice/resources/package-summary.html">org.apache.juneau.microservice.resources</a></dt>
<dd>
<div class="block">Shows contents of the microservice configuration file.</div>
@@ -4473,18 +4523,6 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlWriter.html#cr-int-">cr(int)</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigMgr.html#create--">create()</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></dt>
-<dd>
-<div class="block">Create a new empty config file not backed by any file.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigMgr.html#create-java.io.File-">create(File)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></dt>
-<dd>
-<div class="block">Create a new config file backed by the specified file.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigMgr.html#create-java.io.Reader-">create(Reader)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></dt>
-<dd>
-<div class="block">Create a new config file not backed by a file.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/FileUtils.html#create-java.io.File-">create(File)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/FileUtils.html" title="class in org.apache.juneau.internal">FileUtils</a></dt>
<dd>
<div class="block">Creates a file if it doesn't already exist using <a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true#createNewFile--" title="class or interface in java.io"><code>File.createNewFile()</code></a>.</div>
@@ -4539,6 +4577,10 @@
<div class="block">Creates an instance of an <code>HttpClientBuilder</code> to be used to create
the <code>HttpClient</code>.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#createIfNotExists--">createIfNotExists()</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd>
+<div class="block">Create config files if they cannot be found on the file system.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonParser.html#createParameterSession-java.lang.Object-">createParameterSession(Object)</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon">UonParser</a></dt>
<dd>
<div class="block">Create a UON parser session for parsing parameter values.</div>
@@ -5172,10 +5214,6 @@
<dd>
<div class="block">Default serializer, all default settings.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigMgr.html#DEFAULT">DEFAULT</a></span> - Static variable in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></dt>
-<dd>
-<div class="block">Default reusable configuration manager.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/ByteArrayCache.html#DEFAULT">DEFAULT</a></span> - Static variable in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/ByteArrayCache.html" title="class in org.apache.juneau.internal">ByteArrayCache</a></dt>
<dd>
<div class="block">Default global byte array cache.</div>
@@ -5533,10 +5571,6 @@
<dd>
<div class="block">Remove an element from a POJO model.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigMgr.html#deleteAll--">deleteAll()</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></dt>
-<dd>
-<div class="block">Delete all configuration files registered with this config manager.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ObjectList.html#deleteAt-java.lang.String-">deleteAt(String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ObjectList.html" title="class in org.apache.juneau">ObjectList</a></dt>
<dd>
<div class="block">Similar to <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedList.html?is-external=true#remove-int-" title="class or interface in java.util"><code>remove(int)</code></a>,but the key is a slash-delimited
@@ -5828,24 +5862,6 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlParser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse(ParserSession, ClassMeta<T>)</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlParser.html" title="class in org.apache.juneau.xml">XmlParser</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs(ParserSession, ClassMeta<?>[])</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlParser.html" title="class in org.apache.juneau.html">HtmlParser</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/jena/RdfParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs(ParserSession, ClassMeta<?>[])</a></span> - Method in class org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfParser.html" title="class in org.apache.juneau.jena">RdfParser</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/json/JsonParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs(ParserSession, ClassMeta<?>[])</a></span> - Method in class org.apache.juneau.json.<a href="org/apache/juneau/json/JsonParser.html" title="class in org.apache.juneau.json">JsonParser</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/msgpack/MsgPackParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs(ParserSession, ClassMeta<?>[])</a></span> - Method in class org.apache.juneau.msgpack.<a href="org/apache/juneau/msgpack/MsgPackParser.html" title="class in org.apache.juneau.msgpack">MsgPackParser</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs(ParserSession, ClassMeta<?>[])</a></span> - Method in class org.apache.juneau.parser.<a href="org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></dt>
-<dd>
-<div class="block">Implementation method.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs(ParserSession, ClassMeta<?>[])</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon">UonParser</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs(ParserSession, ClassMeta<?>[])</a></span> - Method in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingParser.html" title="class in org.apache.juneau.urlencoding">UrlEncodingParser</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlParser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs(ParserSession, ClassMeta<?>[])</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlParser.html" title="class in org.apache.juneau.xml">XmlParser</a></dt>
-<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlParser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection(ParserSession, Collection<E>, Type)</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlParser.html" title="class in org.apache.juneau.html">HtmlParser</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/json/JsonParser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection(ParserSession, Collection<E>, Type)</a></span> - Method in class org.apache.juneau.json.<a href="org/apache/juneau/json/JsonParser.html" title="class in org.apache.juneau.json">JsonParser</a></dt>
@@ -6086,6 +6102,10 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/encoders/Encoder.html#Encoder--">Encoder()</a></span> - Constructor for class org.apache.juneau.encoders.<a href="org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#encoder-org.apache.juneau.ini.Encoder-">encoder(Encoder)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd>
+<div class="block">Specify the encoder to use for encoded config file entries (e.g.</div>
+</dd>
<dt><a href="org/apache/juneau/ini/Encoder.html" title="interface in org.apache.juneau.ini"><span class="typeNameLink">Encoder</span></a> - Interface in <a href="org/apache/juneau/ini/package-summary.html">org.apache.juneau.ini</a></dt>
<dd>
<div class="block">API for defining a string encoding/decoding mechanism for entries in <a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a>.</div>
@@ -6980,14 +7000,6 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileWrapped.html#get-java.lang.String-java.lang.String-">get(String, String)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigMgr.html#get-java.lang.String-">get(String)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></dt>
-<dd>
-<div class="block">Returns the config file with the specified absolute or relative path.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigMgr.html#get-java.lang.String-boolean-">get(String, boolean)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></dt>
-<dd>
-<div class="block">Returns the config file with the specified absolute or relative path.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/Section.html#get-java.lang.Object-">get(Object)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/DelegateBeanMap.html#get-java.lang.Object-">get(Object)</a></span> - Method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/DelegateBeanMap.html" title="class in org.apache.juneau.internal">DelegateBeanMap</a></dt>
@@ -7136,6 +7148,10 @@
<dd>
<div class="block">Bean property getter: <property>anyOf</property>.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ClassMeta.html#getArg-int-">getArg(int)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a></dt>
+<dd>
+<div class="block">Returns the argument metadata at the specified index if this is an args metadata object.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/Args.html#getArg-int-">getArg(int)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils">Args</a></dt>
<dd>
<div class="block">Returns main argument at the specified index, or <jk>null</jk> if the index is out of range.</div>
@@ -7148,6 +7164,10 @@
<dd>
<div class="block">Returns the optional argument value converted to the specified object type.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ClassMeta.html#getArgs--">getArgs()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a></dt>
+<dd>
+<div class="block">Returns the argument types of this meta.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/Microservice.html#getArgs--">getArgs()</a></span> - Static method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></dt>
<dd>
<div class="block">Returns the command-line arguments passed into the application.</div>
@@ -7156,6 +7176,10 @@
<dd>
<div class="block">Returns the optional argument values as a list of strings.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta(Type[])</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></dt>
+<dd>
+<div class="block">Given an array of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect"><code>Type</code></a> objects, returns a <a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> representing those arguments.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ObjectList.html#getAt-java.lang.Class-java.lang.String-">getAt(Class<T>, String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ObjectList.html" title="class in org.apache.juneau">ObjectList</a></dt>
<dd>
<div class="block">Same as <a href="org/apache/juneau/ObjectList.html#get-java.lang.Class-int-"><code>get(Class,int)</code></a>, but the key is a slash-delimited
@@ -7578,10 +7602,6 @@
<dd>
<div class="block">Shortcut for calling <code>getClassMeta(o.getClass())</code>.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas(Type[])</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></dt>
-<dd>
-<div class="block">Given an array of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect"><code>Type</code></a> objects, returns an array of corresponding <a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> objects.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/MessageBundle.html#getClientString-java.lang.String-java.lang.Object...-">getClientString(String, Object...)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a></dt>
<dd>
<div class="block">Same as <a href="org/apache/juneau/utils/MessageBundle.html#getString-java.lang.String-java.lang.Object...-"><code>MessageBundle.getString(String, Object...)</code></a> but uses the locale specified on the call to <a href="org/apache/juneau/utils/MessageBundle.html#setClientLocale-java.util.Locale-"><code>MessageBundle.setClientLocale(Locale)</code></a>.</div>
@@ -7875,10 +7895,6 @@
<dd>
<div class="block">Bean property getter: <property>description</property>.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlDocSerializerSession.html#getDescription--">getDescription()</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlDocSerializerSession.html" title="class in org.apache.juneau.html">HtmlDocSerializerSession</a></dt>
-<dd>
-<div class="block">Returns the <a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_description"><code>HtmlDocSerializerContext.HTMLDOC_description</code></a> setting value in this context.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/labels/NameDescription.html#getDescription--">getDescription()</a></span> - Method in class org.apache.juneau.rest.labels.<a href="org/apache/juneau/rest/labels/NameDescription.html" title="class in org.apache.juneau.rest.labels">NameDescription</a></dt>
<dd>
<div class="block">Returns the description field on this label.</div>
@@ -8096,7 +8112,7 @@
<div class="block">Given a matcher that has matched the pattern specified by <a href="org/apache/juneau/microservice/resources/LogEntryFormatter.html#getLogEntryPattern--"><code>LogEntryFormatter.getLogEntryPattern()</code></a>,
returns the field value from the match.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/resources/LogsResource.html#getFileOrDirectory-org.apache.juneau.rest.RestRequest-org.apache.juneau.ObjectMap-java.lang.String-">getFileOrDirectory(RestRequest, ObjectMap, String)</a></span> - Method in class org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/LogsResource.html" title="class in org.apache.juneau.microservice.resources">LogsResource</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/resources/LogsResource.html#getFileOrDirectory-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-org.apache.juneau.ObjectMap-java.lang.String-">getFileOrDirectory(RestRequest, RestResponse, ObjectMap, String)</a></span> - Method in class org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/LogsResource.html" title="class in org.apache.juneau.microservice.resources">LogsResource</a></dt>
<dd>
<div class="block">[GET /*] - Get file details or directory listing.</div>
</dd>
@@ -8738,12 +8754,14 @@
<dd>
<div class="block">Returns the media type of the serializers that matched the HTTP <code>Accept</code> header value.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/StringObject.html#getMediaType--">getMediaType()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></dt>
-<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/Streamable.html#getMediaType--">getMediaType()</a></span> - Method in interface org.apache.juneau.<a href="org/apache/juneau/Streamable.html" title="interface in org.apache.juneau">Streamable</a></dt>
<dd>
<div class="block">Returns the serialized media type for this resource (e.g.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringMessage.html#getMediaType--">getMediaType()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringObject.html#getMediaType--">getMediaType()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/Writable.html#getMediaType--">getMediaType()</a></span> - Method in interface org.apache.juneau.<a href="org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a></dt>
<dd>
<div class="block">Returns the serialized media type for this resource (e.g.</div>
@@ -9231,6 +9249,30 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlSerializer.SqReadable.html#getOverrideProperties--">getOverrideProperties()</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlSerializer.SqReadable.html" title="class in org.apache.juneau.xml">XmlSerializer.SqReadable</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestContext.html#getPageLinks--">getPageLinks()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a></dt>
+<dd>
+<div class="block">Returns the page links as defined by the <a href="org/apache/juneau/rest/annotation/RestResource.html#pageLinks--"><code>RestResource.pageLinks()</code></a> annotation or <a href="org/apache/juneau/rest/RestConfig.html#setPageLinks-java.lang.String-"><code>RestConfig.setPageLinks(String)</code></a> method.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getPageLinks--">getPageLinks()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
+<dd>
+<div class="block">Returns the localized page links for HTML views.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestContext.html#getPageText--">getPageText()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a></dt>
+<dd>
+<div class="block">Returns the page text as defined by the <a href="org/apache/juneau/rest/annotation/RestResource.html#pageText--"><code>RestResource.pageText()</code></a> annotation or <a href="org/apache/juneau/rest/RestConfig.html#setPageText-java.lang.String-"><code>RestConfig.setPageText(String)</code></a> method.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getPageText--">getPageText()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
+<dd>
+<div class="block">Returns the localized page text for HTML views.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestContext.html#getPageTitle--">getPageTitle()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a></dt>
+<dd>
+<div class="block">Returns the page title as defined by the <a href="org/apache/juneau/rest/annotation/RestResource.html#pageTitle--"><code>RestResource.pageTitle()</code></a> annotation or <a href="org/apache/juneau/rest/RestConfig.html#setPageTitle-java.lang.String-"><code>RestConfig.setPageTitle(String)</code></a> method.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getPageTitle--">getPageTitle()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
+<dd>
+<div class="block">Returns the localized page title for HTML views.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Operation.html#getParameters--">getParameters()</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></dt>
<dd>
<div class="block">Bean property getter: <property>parameters</property>.</div>
@@ -10294,6 +10336,10 @@
<dd>
<div class="block">Returns the inner text of this element.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlDocSerializerSession.html#getText--">getText()</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlDocSerializerSession.html" title="class in org.apache.juneau.html">HtmlDocSerializerSession</a></dt>
+<dd>
+<div class="block">Returns the <a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_text"><code>HtmlDocSerializerContext.HTMLDOC_text</code></a> setting value in this context.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/resources/LogParser.Entry.html#getText--">getText()</a></span> - Method in class org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/LogParser.Entry.html" title="class in org.apache.juneau.microservice.resources">LogParser.Entry</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlParserSession.html#getText-javax.xml.stream.XMLStreamReader-boolean-">getText(XMLStreamReader, boolean)</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlParserSession.html" title="class in org.apache.juneau.xml">XmlParserSession</a></dt>
@@ -11011,6 +11057,10 @@
<dd>
<div class="block">Synonym for <a href="org/apache/juneau/dto/swagger/Swagger.html#setHost-java.lang.String-"><code>Swagger.setHost(String)</code></a>.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#host-java.lang.String-">host(String)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
+<dd>
+<div class="block">Sets the URI host.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#host-java.lang.Object-">host(Object)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
<dd>
<div class="block">Sets the value for the <code>Host</code> request header.</div>
@@ -11158,10 +11208,6 @@
<dd>
<div class="block"><b>Configuration property:</b> Stylesheet URL.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_description">HTMLDOC_description</a></span> - Static variable in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlDocSerializerContext.html" title="class in org.apache.juneau.html">HtmlDocSerializerContext</a></dt>
-<dd>
-<div class="block"><b>Configuration property:</b> Page description.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_links">HTMLDOC_links</a></span> - Static variable in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlDocSerializerContext.html" title="class in org.apache.juneau.html">HtmlDocSerializerContext</a></dt>
<dd>
<div class="block"><b>Configuration property:</b> Page links.</div>
@@ -11174,6 +11220,10 @@
<dd>
<div class="block"><b>Configuration property:</b> Prevent word wrap on page.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_text">HTMLDOC_text</a></span> - Static variable in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlDocSerializerContext.html" title="class in org.apache.juneau.html">HtmlDocSerializerContext</a></dt>
+<dd>
+<div class="block"><b>Configuration property:</b> Page description.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_title">HTMLDOC_title</a></span> - Static variable in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlDocSerializerContext.html" title="class in org.apache.juneau.html">HtmlDocSerializerContext</a></dt>
<dd>
<div class="block"><b>Configuration property:</b> Page title.</div>
@@ -12618,6 +12668,10 @@
<dd>
<div class="block">Returns the value of the <a href="org/apache/juneau/rest/RestContext.html#REST_allowHeaderParams"><code>RestContext.REST_allowHeaderParams</code></a> setting.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ClassMeta.html#isArgs--">isArgs()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a></dt>
+<dd>
+<div class="block">Returns <jk>true</jk> if this metadata represents an array of argument types.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ClassMeta.html#isArray--">isArray()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a></dt>
<dd>
<div class="block">Returns <jk>true</jk> if this class is an array.</div>
@@ -13684,7 +13738,9 @@
<dd>
<div class="block">Sets the length of the contents of the target of this link.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/StringObject.html#length--">length()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringMessage.html#length--">length()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringObject.html#length--">length()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/html5/HtmlBuilder.html#li--">li()</a></span> - Static method in class org.apache.juneau.dto.html5.<a href="org/apache/juneau/dto/html5/HtmlBuilder.html" title="class in org.apache.juneau.dto.html5">HtmlBuilder</a></dt>
<dd>
@@ -13828,10 +13884,6 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileWrapped.html#loadIfModified--">loadIfModified()</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigMgr.html#loadIfModified--">loadIfModified()</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></dt>
-<dd>
-<div class="block">Reloads any config files that were modified.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/CoreObjectBuilder.html#locale-java.util.Locale-">locale(Locale)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/CoreObjectBuilder.html" title="class in org.apache.juneau">CoreObjectBuilder</a></dt>
<dd>
<div class="block"><b>Configuration property:</b> Locale.</div>
@@ -14071,7 +14123,7 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/html5/Main.html#Main--">Main()</a></span> - Constructor for class org.apache.juneau.dto.html5.<a href="org/apache/juneau/dto/html5/Main.html" title="class in org.apache.juneau.dto.html5">Main</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigMgr.html#main-java.lang.String:A-">main(String[])</a></span> - Static method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigMgr.html" title="class in org.apache.juneau.ini">ConfigMgr</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#main-java.lang.String:A-">main(String[])</a></span> - Static method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
<dd>
<div class="block">Implements command-line features for working with INI configuration files.</div>
</dd>
@@ -16284,6 +16336,10 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/html5/Param.html#Param--">Param()</a></span> - Constructor for class org.apache.juneau.dto.html5.<a href="org/apache/juneau/dto/html5/Param.html" title="class in org.apache.juneau.dto.html5">Param</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#param-java.lang.String-java.lang.Object-">param(String, Object)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
+<dd>
+<div class="block">Adds a parameter to the URI query.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Swagger.html#parameter-java.lang.String-org.apache.juneau.dto.swagger.ParameterInfo-">parameter(String, ParameterInfo)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a></dt>
<dd>
<div class="block">Synonym for <a href="org/apache/juneau/dto/swagger/Swagger.html#addParameter-java.lang.String-org.apache.juneau.dto.swagger.ParameterInfo-"><code>Swagger.addParameter(String,ParameterInfo)</code></a>.</div>
@@ -16349,15 +16405,11 @@
<dd>
<div class="block">Workhorse method.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs(Object, ClassMeta<?>[])</a></span> - Method in class org.apache.juneau.parser.<a href="org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs(Object, Type[])</a></span> - Method in class org.apache.juneau.parser.<a href="org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></dt>
<dd>
<div class="block">Parses the specified array input with each entry in the object defined by the <code>argTypes</code>
argument.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs(Object, Type[])</a></span> - Method in class org.apache.juneau.parser.<a href="org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></dt>
-<dd>
-<div class="block">Same as <a href="org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-"><code>Parser.parseArgs(Object, ClassMeta[])</code></a> except allows you to pass in <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> objects.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonParser.html#parseAttr-org.apache.juneau.uon.UonParserSession-org.apache.juneau.parser.ParserReader-boolean-">parseAttr(UonParserSession, ParserReader, boolean)</a></span> - Static method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon">UonParser</a></dt>
<dd>
<div class="block">Convenience method for parsing an attribute from the specified parser.</div>
@@ -16441,6 +16493,10 @@
<div class="block">Same as <a href="org/apache/juneau/urlencoding/UrlEncodingParser.html#parseParameter-java.lang.CharSequence-java.lang.reflect.Type-java.lang.reflect.Type...-"><code>UrlEncodingParser.parseParameter(CharSequence, Type, Type...)</code></a> except the type has already
been converted to a <a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> object.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#parser-org.apache.juneau.parser.ReaderParser-">parser(ReaderParser)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd>
+<div class="block">Specify the parser to use for parsing POJOs when using <a href="org/apache/juneau/ini/ConfigFile.html#getObject-java.lang.Class-java.lang.String-"><code>ConfigFile.getObject(Class,String)</code></a>.</div>
+</dd>
<dt><a href="org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser"><span class="typeNameLink">Parser</span></a> - Class in <a href="org/apache/juneau/parser/package-summary.html">org.apache.juneau.parser</a></dt>
<dd>
<div class="block">Parent class for all Juneau parsers.</div>
@@ -16588,6 +16644,10 @@
<div class="block">Annotation that can be applied to a parameter of a <a href="org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>RestMethod</code></a> annotated method
to identify it as the URL parameter remainder after a path pattern match.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#paths-java.lang.String...-">paths(String...)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd>
+<div class="block">Specify the search paths for config files.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#pathStartsWith-java.lang.String-java.lang.String-">pathStartsWith(String, String)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></dt>
<dd>
<div class="block">Returns <jk>true</jk> if the specified path string is prefixed with the specified prefix.</div>
@@ -16928,6 +16988,10 @@
<dd>
<div class="block">Pop an object off the stack.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#port-int-">port(int)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
+<dd>
+<div class="block">Sets the URI port.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/PojoRest.html#post-java.lang.String-java.lang.Object-">post(String, Object)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils">PojoRest</a></dt>
<dd>
<div class="block">Adds a value to a list element in a POJO model.</div>
@@ -17496,6 +17560,10 @@
<div class="block">Identical to <a href="org/apache/juneau/rest/annotation/FormData.html" title="annotation in org.apache.juneau.rest.annotation"><code>@FormData</code></a>, but only retrieves the parameter from the
URL string, not URL-encoded form posts.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#query-java.lang.String-">query(String)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
+<dd>
+<div class="block">Sets a custom URI query.</div>
+</dd>
<dt><a href="org/apache/juneau/rest/converters/Queryable.html" title="class in org.apache.juneau.rest.converters"><span class="typeNameLink">Queryable</span></a> - Class in <a href="org/apache/juneau/rest/converters/package-summary.html">org.apache.juneau.rest.converters</a></dt>
<dd>
<div class="block">Converter for enablement of <a href="org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><code>PojoQuery</code></a> support on response objects returned by a <code>@RestMethod</code> method.</div>
@@ -18010,7 +18078,7 @@
<dd>
<div class="block">Constructor.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/ReaderResource.html#ReaderResource-org.apache.juneau.MediaType-java.util.Map-org.apache.juneau.svl.VarResolverSession-java.lang.Object...-">ReaderResource(MediaType, Map<String, Object>, VarResolverSession, Object...)</a></span> - Constructor for class org.apache.juneau.rest.<a href="org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/ReaderResource.html#ReaderResource-org.apache.juneau.MediaType-java.util.Map-org.apache.juneau.svl.VarResolverSession-java.lang.Object...-">ReaderResource(MediaType, Map<String, String>, VarResolverSession, Object...)</a></span> - Constructor for class org.apache.juneau.rest.<a href="org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a></dt>
<dd>
<div class="block">Constructor.</div>
</dd>
@@ -18066,6 +18134,10 @@
<dd>
<div class="block">Synonym for <a href="org/apache/juneau/dto/swagger/SchemaInfo.html#setReadOnly-java.lang.Boolean-"><code>SchemaInfo.setReadOnly(Boolean)</code></a>.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#readOnly--">readOnly()</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd>
+<div class="block">Make <a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFiles</code></a> read-only.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/transform/BeanFilter.html#readProperty-java.lang.Object-java.lang.String-java.lang.Object-">readProperty(Object, String, Object)</a></span> - Method in class org.apache.juneau.transform.<a href="org/apache/juneau/transform/BeanFilter.html" title="class in org.apache.juneau.transform">BeanFilter</a></dt>
<dd>
<div class="block">Subclasses can override this property to convert property values to some other
@@ -19280,7 +19352,7 @@
<dd>
<div class="block">Represents a connection to a remote REST resource.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#RestCall-org.apache.juneau.rest.client.RestClient-org.apache.http.client.methods.HttpRequestBase-">RestCall(RestClient, HttpRequestBase)</a></span> - Constructor for class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#RestCall-org.apache.juneau.rest.client.RestClient-org.apache.http.client.methods.HttpRequestBase-java.net.URI-">RestCall(RestClient, HttpRequestBase, URI)</a></span> - Constructor for class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
<dd>
<div class="block">Constructs a REST call with the specified method name.</div>
</dd>
@@ -19848,6 +19920,10 @@
<dd>
<div class="block">Sets the category scheme.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#scheme-java.lang.String-">scheme(String)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
+<dd>
+<div class="block">Sets the URI scheme.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Operation.html#schemes-java.lang.String...-">schemes(String...)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></dt>
<dd>
<div class="block">Synonym for <a href="org/apache/juneau/dto/swagger/Operation.html#addSchemes-java.lang.String...-"><code>Operation.addSchemes(String...)</code></a>.</div>
@@ -20046,6 +20122,10 @@
<dd>
<div class="block">Constructor.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileBuilder.html#serializer-org.apache.juneau.serializer.WriterSerializer-">serializer(WriterSerializer)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileBuilder.html" title="class in org.apache.juneau.ini">ConfigFileBuilder</a></dt>
+<dd>
+<div class="block">Specify the serializer to use for serializing POJOs when using <a href="org/apache/juneau/ini/ConfigFile.html#put-java.lang.String-java.lang.Object-"><code>ConfigFile.put(String, Object)</code></a>.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#serializer-org.apache.juneau.serializer.Serializer-">serializer(Serializer)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
<dd>
<div class="block">Specifies the serializer to use on this call.</div>
@@ -21583,6 +21663,30 @@
<dd>
<div class="block">Shortcut method that allows you to use varargs to simplify setting array output.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestConfig.html#setPageLinks-java.lang.String-">setPageLinks(String)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></dt>
+<dd>
+<div class="block">Sets the page links to use on HTML views of pages.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestResponse.html#setPageLinks-java.lang.Object-">setPageLinks(Object)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></dt>
+<dd>
+<div class="block">Sets the page text for HTML views.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestConfig.html#setPageText-java.lang.String-">setPageText(String)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></dt>
+<dd>
+<div class="block">Sets the page text to use on HTML views of pages.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestResponse.html#setPageText-java.lang.Object-">setPageText(Object)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></dt>
+<dd>
+<div class="block">Sets the page text for HTML views.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestConfig.html#setPageTitle-java.lang.String-">setPageTitle(String)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a></dt>
+<dd>
+<div class="block">Sets the page title to use on HTML views of pages.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestResponse.html#setPageTitle-java.lang.Object-">setPageTitle(Object)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></dt>
+<dd>
+<div class="block">Sets the page title for HTML views.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Operation.html#setParameters-java.util.List-">setParameters(List<ParameterInfo>)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></dt>
<dd>
<div class="block">Bean property setter: <property>parameters</property>.</div>
@@ -22825,14 +22929,26 @@
<dd>
<div class="block">Create a new string writer using the specified initial string-builder size.</div>
</dd>
-<dt><a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">StringObject</span></a> - Class in <a href="org/apache/juneau/serializer/package-summary.html">org.apache.juneau.serializer</a></dt>
+<dt><a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">StringMessage</span></a> - Class in <a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></dt>
+<dd>
+<div class="block">An encapsulated MessageFormat-style string and arguments.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringMessage.html#StringMessage-java.lang.String-java.lang.Object...-">StringMessage(String, Object...)</a></span> - Constructor for class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
+<dt><a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">StringObject</span></a> - Class in <a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></dt>
<dd>
<div class="block">A serializer/object pair used for delayed object serialization.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/StringObject.html#StringObject-org.apache.juneau.serializer.WriterSerializer-java.lang.Object-">StringObject(WriterSerializer, Object)</a></span> - Constructor for class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringObject.html#StringObject-org.apache.juneau.serializer.WriterSerializer-java.lang.Object-">StringObject(WriterSerializer, Object)</a></span> - Constructor for class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></dt>
<dd>
<div class="block">Constructor.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringObject.html#StringObject-java.lang.Object-">StringObject(Object)</a></span> - Constructor for class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></dt>
+<dd>
+<div class="block">Constructor with default serializer <a href="org/apache/juneau/json/JsonSerializer.html#DEFAULT_LAX"><code>JsonSerializer.DEFAULT_LAX</code></a></div>
+</dd>
<dt><a href="org/apache/juneau/transform/StringSwap.html" title="class in org.apache.juneau.transform"><span class="typeNameLink">StringSwap</span></a><<a href="org/apache/juneau/transform/StringSwap.html" title="type parameter in StringSwap">T</a>> - Class in <a href="org/apache/juneau/transform/package-summary.html">org.apache.juneau.transform</a></dt>
<dd>
<div class="block">Abstract subclass for POJO swaps that swap objects for strings.</div>
@@ -23101,7 +23217,9 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/html5/Sub.html#Sub--">Sub()</a></span> - Constructor for class org.apache.juneau.dto.html5.<a href="org/apache/juneau/dto/html5/Sub.html" title="class in org.apache.juneau.dto.html5">Sub</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/StringObject.html#subSequence-int-int-">subSequence(int, int)</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringMessage.html#subSequence-int-int-">subSequence(int, int)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringObject.html#subSequence-int-int-">subSequence(int, int)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/atom/Feed.html#subtitle-org.apache.juneau.dto.atom.Text-">subtitle(Text)</a></span> - Method in class org.apache.juneau.dto.atom.<a href="org/apache/juneau/dto/atom/Feed.html" title="class in org.apache.juneau.dto.atom">Feed</a></dt>
<dd>
@@ -23929,8 +24047,6 @@
<dd>
<div class="block">Converts the specified object to a <code>String</code>.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/StringObject.html#toString--">toString()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></dt>
-<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/WriterSerializer.html#toString-java.lang.Object-">toString(Object)</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a></dt>
<dd>
<div class="block">Identical to <a href="org/apache/juneau/serializer/WriterSerializer.html#serialize-java.lang.Object-"><code>WriterSerializer.serialize(Object)</code></a> except throws a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang"><code>RuntimeException</code></a>
@@ -23950,13 +24066,17 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/PojoRest.html#toString--">toString()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils">PojoRest</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringMessage.html#toString--">toString()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringObject.html#toString--">toString()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/Namespace.html#toString--">toString()</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlWriter.html#toString--">toString()</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/WriterSerializer.html#toStringObject-java.lang.Object-">toStringObject(Object)</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a></dt>
<dd>
-<div class="block">Wraps the specified object inside a <a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer"><code>StringObject</code></a>.</div>
+<div class="block">Wraps the specified object inside a <a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils"><code>StringObject</code></a>.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/Redirect.html#toUrl-org.apache.juneau.urlencoding.UrlEncodingSerializer-">toUrl(UrlEncodingSerializer)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/Redirect.html" title="class in org.apache.juneau.rest">Redirect</a></dt>
<dd>
@@ -24688,6 +24808,10 @@
<dd>
<div class="block">Constant for <a href="org/apache/juneau/html/HtmlSerializerContext.html#HTML_uriAnchorText"><code>HtmlSerializerContext.HTML_uriAnchorText</code></a> property.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#uri-java.lang.Object-">uri(Object)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
+<dd>
+<div class="block">Sets the URI for this call.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlSerializerContext.html#URI_ANCHOR">URI_ANCHOR</a></span> - Static variable in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlSerializerContext.html" title="class in org.apache.juneau.html">HtmlSerializerContext</a></dt>
<dd>
<div class="block">Constant for <a href="org/apache/juneau/html/HtmlSerializerContext.html#HTML_uriAnchorText"><code>HtmlSerializerContext.HTML_uriAnchorText</code></a> property.</div>
@@ -24985,6 +25109,14 @@
<dd>
<div class="block">Sets the value for the <code>User-Agent</code> request header.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#userInfo-java.lang.String-">userInfo(String)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
+<dd>
+<div class="block">Sets the URI user info.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#userInfo-java.lang.String-java.lang.String-">userInfo(String, String)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
+<dd>
+<div class="block">Sets the URI user info.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#useSystemProperties--">useSystemProperties()</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/csv/CsvSerializerBuilder.html#useWhitespace-boolean-">useWhitespace(boolean)</a></span> - Method in class org.apache.juneau.csv.<a href="org/apache/juneau/csv/CsvSerializerBuilder.html" title="class in org.apache.juneau.csv">CsvSerializerBuilder</a></dt>
@@ -25453,7 +25585,9 @@ the order they are declared.</div>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/ReaderResource.html#writeTo-java.io.Writer-">writeTo(Writer)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/StringObject.html#writeTo-java.io.Writer-">writeTo(Writer)</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringMessage.html#writeTo-java.io.Writer-">writeTo(Writer)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringObject.html#writeTo-java.io.Writer-">writeTo(Writer)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/Writable.html#writeTo-java.io.Writer-">writeTo(Writer)</a></span> - Method in interface org.apache.juneau.<a href="org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a></dt>
<dd>
[22/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.html
index 3aa18df..63dfc3a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.html
@@ -398,7 +398,7 @@
<span class="sourceLineNo">390</span> out.i(i+2);<a name="line.390"></a>
<span class="sourceLineNo">391</span> out.eTag("td").nl();<a name="line.391"></a>
<span class="sourceLineNo">392</span> out.sTag(i+2, "td");<a name="line.392"></a>
-<span class="sourceLineNo">393</span> cr = serializeAnything(session, out, value, valueType, (key == null ? "_x0000_" : key.toString()), 2, null, false);<a name="line.393"></a>
+<span class="sourceLineNo">393</span> cr = serializeAnything(session, out, value, valueType, (key == null ? "_x0000_" : session.toString(key)), 2, null, false);<a name="line.393"></a>
<span class="sourceLineNo">394</span> if (cr == CR_NORMAL)<a name="line.394"></a>
<span class="sourceLineNo">395</span> out.i(i+2);<a name="line.395"></a>
<span class="sourceLineNo">396</span> out.eTag("td").nl();<a name="line.396"></a>
@@ -493,211 +493,217 @@
<span class="sourceLineNo">485</span><a name="line.485"></a>
<span class="sourceLineNo">486</span> out.oTag(i, "table").attr(btpn, type2).append('>').nl();<a name="line.486"></a>
<span class="sourceLineNo">487</span> out.sTag(i+1, "tr").nl();<a name="line.487"></a>
-<span class="sourceLineNo">488</span> for (Object key : th)<a name="line.488"></a>
-<span class="sourceLineNo">489</span> out.sTag(i+2, "th").append(key).eTag("th").nl();<a name="line.489"></a>
-<span class="sourceLineNo">490</span> out.eTag(i+1, "tr").nl();<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> for (Object o : c) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> ClassMeta<?> cm = session.getClassMetaForObject(o);<a name="line.493"></a>
+<span class="sourceLineNo">488</span> for (Object key : th) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span> out.sTag(i+2, "th");<a name="line.489"></a>
+<span class="sourceLineNo">490</span> out.text(session.convertToType(key, String.class));<a name="line.490"></a>
+<span class="sourceLineNo">491</span> out.eTag("th").nl();<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span> out.eTag(i+1, "tr").nl();<a name="line.493"></a>
<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> PojoSwap f = cm.getPojoSwap();<a name="line.496"></a>
-<span class="sourceLineNo">497</span> o = f.swap(session, o);<a name="line.497"></a>
-<span class="sourceLineNo">498</span> cm = cm.getSerializedClassMeta();<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> out.oTag(i+1, "tr");<a name="line.501"></a>
-<span class="sourceLineNo">502</span> String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.502"></a>
-<span class="sourceLineNo">503</span> if (typeName != null && sType.getElementType() != cm)<a name="line.503"></a>
-<span class="sourceLineNo">504</span> out.attr(btpn, typeName);<a name="line.504"></a>
-<span class="sourceLineNo">505</span> out.cTag().nl();<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span> if (cm == null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span> serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.508"></a>
+<span class="sourceLineNo">495</span> for (Object o : c) {<a name="line.495"></a>
+<span class="sourceLineNo">496</span> ClassMeta<?> cm = session.getClassMetaForObject(o);<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> PojoSwap f = cm.getPojoSwap();<a name="line.499"></a>
+<span class="sourceLineNo">500</span> o = f.swap(session, o);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> cm = cm.getSerializedClassMeta();<a name="line.501"></a>
+<span class="sourceLineNo">502</span> }<a name="line.502"></a>
+<span class="sourceLineNo">503</span><a name="line.503"></a>
+<span class="sourceLineNo">504</span> out.oTag(i+1, "tr");<a name="line.504"></a>
+<span class="sourceLineNo">505</span> String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.505"></a>
+<span class="sourceLineNo">506</span> if (typeName != null && sType.getElementType() != cm)<a name="line.506"></a>
+<span class="sourceLineNo">507</span> out.attr(btpn, typeName);<a name="line.507"></a>
+<span class="sourceLineNo">508</span> out.cTag().nl();<a name="line.508"></a>
<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span> } else if (cm.isMap() && ! (cm.isBeanMap())) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> Map m2 = session.sort((Map)o);<a name="line.511"></a>
+<span class="sourceLineNo">510</span> if (cm == null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span> serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.511"></a>
<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span> for (Object k : th) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> out.sTag(i+2, "td");<a name="line.514"></a>
-<span class="sourceLineNo">515</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, session.toString(k), 2, null, false);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> if (cr == CR_NORMAL)<a name="line.516"></a>
-<span class="sourceLineNo">517</span> out.i(i+2);<a name="line.517"></a>
-<span class="sourceLineNo">518</span> out.eTag("td").nl();<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> } else {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> BeanMap m2 = null;<a name="line.521"></a>
-<span class="sourceLineNo">522</span> if (o instanceof BeanMap)<a name="line.522"></a>
-<span class="sourceLineNo">523</span> m2 = (BeanMap)o;<a name="line.523"></a>
-<span class="sourceLineNo">524</span> else<a name="line.524"></a>
-<span class="sourceLineNo">525</span> m2 = session.toBeanMap(o);<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span> for (Object k : th) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.528"></a>
-<span class="sourceLineNo">529</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.529"></a>
-<span class="sourceLineNo">530</span> out.sTag(i+2, "td");<a name="line.530"></a>
-<span class="sourceLineNo">531</span> ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.531"></a>
-<span class="sourceLineNo">532</span> if (cr == CR_NORMAL)<a name="line.532"></a>
-<span class="sourceLineNo">533</span> out.i(i+2);<a name="line.533"></a>
-<span class="sourceLineNo">534</span> out.eTag("td").nl();<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span> }<a name="line.536"></a>
-<span class="sourceLineNo">537</span> out.eTag(i+1, "tr").nl();<a name="line.537"></a>
-<span class="sourceLineNo">538</span> }<a name="line.538"></a>
-<span class="sourceLineNo">539</span> out.eTag(i, "table").nl();<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> } else {<a name="line.541"></a>
-<span class="sourceLineNo">542</span> out.oTag(i, "ul");<a name="line.542"></a>
-<span class="sourceLineNo">543</span> if (! type2.equals("array"))<a name="line.543"></a>
-<span class="sourceLineNo">544</span> out.attr(btpn, type2);<a name="line.544"></a>
-<span class="sourceLineNo">545</span> out.append('>').nl();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> for (Object o : c) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> out.sTag(i+1, "li");<a name="line.547"></a>
-<span class="sourceLineNo">548</span> ContentResult cr = serializeAnything(session, out, o, seType, name, 1, null, false);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> if (cr == CR_NORMAL)<a name="line.549"></a>
-<span class="sourceLineNo">550</span> out.i(i+1);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> out.eTag("li").nl();<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span> out.eTag(i, "ul").nl();<a name="line.553"></a>
-<span class="sourceLineNo">554</span> }<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span> /*<a name="line.557"></a>
-<span class="sourceLineNo">558</span> * Returns the table column headers for the specified collection of objects.<a name="line.558"></a>
-<span class="sourceLineNo">559</span> * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.559"></a>
-<span class="sourceLineNo">560</span> * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.560"></a>
-<span class="sourceLineNo">561</span> */<a name="line.561"></a>
-<span class="sourceLineNo">562</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.562"></a>
-<span class="sourceLineNo">563</span> private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.563"></a>
-<span class="sourceLineNo">564</span> if (c.size() == 0)<a name="line.564"></a>
-<span class="sourceLineNo">565</span> return null;<a name="line.565"></a>
-<span class="sourceLineNo">566</span> c = session.sort(c);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> Object[] th;<a name="line.567"></a>
-<span class="sourceLineNo">568</span> Set<Object> s = new TreeSet<Object>();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> Set<ClassMeta> prevC = new HashSet<ClassMeta>();<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Object o1 = null;<a name="line.570"></a>
-<span class="sourceLineNo">571</span> for (Object o : c)<a name="line.571"></a>
-<span class="sourceLineNo">572</span> if (o != null) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span> o1 = o;<a name="line.573"></a>
-<span class="sourceLineNo">574</span> break;<a name="line.574"></a>
-<span class="sourceLineNo">575</span> }<a name="line.575"></a>
-<span class="sourceLineNo">576</span> if (o1 == null)<a name="line.576"></a>
-<span class="sourceLineNo">577</span> return null;<a name="line.577"></a>
-<span class="sourceLineNo">578</span> ClassMeta<?> cm = session.getClassMetaForObject(o1);<a name="line.578"></a>
-<span class="sourceLineNo">579</span> if (cm.getPojoSwap() != null) {<a name="line.579"></a>
-<span class="sourceLineNo">580</span> PojoSwap f = cm.getPojoSwap();<a name="line.580"></a>
-<span class="sourceLineNo">581</span> o1 = f.swap(session, o1);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> cm = cm.getSerializedClassMeta();<a name="line.582"></a>
-<span class="sourceLineNo">583</span> }<a name="line.583"></a>
-<span class="sourceLineNo">584</span> if (cm == null || ! cm.isMapOrBean())<a name="line.584"></a>
-<span class="sourceLineNo">585</span> return null;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.586"></a>
+<span class="sourceLineNo">513</span> } else if (cm.isMap() && ! (cm.isBeanMap())) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> Map m2 = session.sort((Map)o);<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span> for (Object k : th) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span> out.sTag(i+2, "td");<a name="line.517"></a>
+<span class="sourceLineNo">518</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, session.toString(k), 2, null, false);<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (cr == CR_NORMAL)<a name="line.519"></a>
+<span class="sourceLineNo">520</span> out.i(i+2);<a name="line.520"></a>
+<span class="sourceLineNo">521</span> out.eTag("td").nl();<a name="line.521"></a>
+<span class="sourceLineNo">522</span> }<a name="line.522"></a>
+<span class="sourceLineNo">523</span> } else {<a name="line.523"></a>
+<span class="sourceLineNo">524</span> BeanMap m2 = null;<a name="line.524"></a>
+<span class="sourceLineNo">525</span> if (o instanceof BeanMap)<a name="line.525"></a>
+<span class="sourceLineNo">526</span> m2 = (BeanMap)o;<a name="line.526"></a>
+<span class="sourceLineNo">527</span> else<a name="line.527"></a>
+<span class="sourceLineNo">528</span> m2 = session.toBeanMap(o);<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span> for (Object k : th) {<a name="line.530"></a>
+<span class="sourceLineNo">531</span> BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.531"></a>
+<span class="sourceLineNo">532</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.532"></a>
+<span class="sourceLineNo">533</span> out.sTag(i+2, "td");<a name="line.533"></a>
+<span class="sourceLineNo">534</span> ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.534"></a>
+<span class="sourceLineNo">535</span> if (cr == CR_NORMAL)<a name="line.535"></a>
+<span class="sourceLineNo">536</span> out.i(i+2);<a name="line.536"></a>
+<span class="sourceLineNo">537</span> out.eTag("td").nl();<a name="line.537"></a>
+<span class="sourceLineNo">538</span> }<a name="line.538"></a>
+<span class="sourceLineNo">539</span> }<a name="line.539"></a>
+<span class="sourceLineNo">540</span> out.eTag(i+1, "tr").nl();<a name="line.540"></a>
+<span class="sourceLineNo">541</span> }<a name="line.541"></a>
+<span class="sourceLineNo">542</span> out.eTag(i, "table").nl();<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span> } else {<a name="line.544"></a>
+<span class="sourceLineNo">545</span> out.oTag(i, "ul");<a name="line.545"></a>
+<span class="sourceLineNo">546</span> if (! type2.equals("array"))<a name="line.546"></a>
+<span class="sourceLineNo">547</span> out.attr(btpn, type2);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> out.append('>').nl();<a name="line.548"></a>
+<span class="sourceLineNo">549</span> for (Object o : c) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span> out.sTag(i+1, "li");<a name="line.550"></a>
+<span class="sourceLineNo">551</span> ContentResult cr = serializeAnything(session, out, o, seType, name, 1, null, false);<a name="line.551"></a>
+<span class="sourceLineNo">552</span> if (cr == CR_NORMAL)<a name="line.552"></a>
+<span class="sourceLineNo">553</span> out.i(i+1);<a name="line.553"></a>
+<span class="sourceLineNo">554</span> out.eTag("li").nl();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> }<a name="line.555"></a>
+<span class="sourceLineNo">556</span> out.eTag(i, "ul").nl();<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span> }<a name="line.558"></a>
+<span class="sourceLineNo">559</span><a name="line.559"></a>
+<span class="sourceLineNo">560</span> /*<a name="line.560"></a>
+<span class="sourceLineNo">561</span> * Returns the table column headers for the specified collection of objects.<a name="line.561"></a>
+<span class="sourceLineNo">562</span> * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.562"></a>
+<span class="sourceLineNo">563</span> * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.563"></a>
+<span class="sourceLineNo">564</span> */<a name="line.564"></a>
+<span class="sourceLineNo">565</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.565"></a>
+<span class="sourceLineNo">566</span> private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.566"></a>
+<span class="sourceLineNo">567</span> if (c.size() == 0)<a name="line.567"></a>
+<span class="sourceLineNo">568</span> return null;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> c = session.sort(c);<a name="line.569"></a>
+<span class="sourceLineNo">570</span> Object[] th;<a name="line.570"></a>
+<span class="sourceLineNo">571</span> Set<ClassMeta> prevC = new HashSet<ClassMeta>();<a name="line.571"></a>
+<span class="sourceLineNo">572</span> Object o1 = null;<a name="line.572"></a>
+<span class="sourceLineNo">573</span> for (Object o : c)<a name="line.573"></a>
+<span class="sourceLineNo">574</span> if (o != null) {<a name="line.574"></a>
+<span class="sourceLineNo">575</span> o1 = o;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> break;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span> if (o1 == null)<a name="line.578"></a>
+<span class="sourceLineNo">579</span> return null;<a name="line.579"></a>
+<span class="sourceLineNo">580</span> ClassMeta<?> cm = session.getClassMetaForObject(o1);<a name="line.580"></a>
+<span class="sourceLineNo">581</span> if (cm.getPojoSwap() != null) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span> PojoSwap f = cm.getPojoSwap();<a name="line.582"></a>
+<span class="sourceLineNo">583</span> o1 = f.swap(session, o1);<a name="line.583"></a>
+<span class="sourceLineNo">584</span> cm = cm.getSerializedClassMeta();<a name="line.584"></a>
+<span class="sourceLineNo">585</span> }<a name="line.585"></a>
+<span class="sourceLineNo">586</span> if (cm == null || ! cm.isMapOrBean())<a name="line.586"></a>
<span class="sourceLineNo">587</span> return null;<a name="line.587"></a>
-<span class="sourceLineNo">588</span> HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> if (h.isNoTables() || (hbpMeta != null && hbpMeta.isNoTables()))<a name="line.589"></a>
-<span class="sourceLineNo">590</span> return null;<a name="line.590"></a>
-<span class="sourceLineNo">591</span> if (h.isNoTableHeaders() || (hbpMeta != null && hbpMeta.isNoTableHeaders()))<a name="line.591"></a>
-<span class="sourceLineNo">592</span> return new Object[0];<a name="line.592"></a>
-<span class="sourceLineNo">593</span> if (session.canIgnoreValue(cm, null, o1))<a name="line.593"></a>
-<span class="sourceLineNo">594</span> return null;<a name="line.594"></a>
-<span class="sourceLineNo">595</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.596"></a>
-<span class="sourceLineNo">597</span> for (Object o : c) {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> if (! cm.isInstance(o))<a name="line.599"></a>
-<span class="sourceLineNo">600</span> return null;<a name="line.600"></a>
-<span class="sourceLineNo">601</span> Map m = session.sort((Map)o);<a name="line.601"></a>
-<span class="sourceLineNo">602</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (e.getValue() != null)<a name="line.603"></a>
-<span class="sourceLineNo">604</span> set.add(e.getKey() == null ? null : e.getKey());<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span> th = set.toArray(new Object[set.size()]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> } else {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.610"></a>
-<span class="sourceLineNo">611</span> for (Object o : c) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.612"></a>
-<span class="sourceLineNo">613</span> if (! cm.isInstance(o))<a name="line.613"></a>
-<span class="sourceLineNo">614</span> return null;<a name="line.614"></a>
-<span class="sourceLineNo">615</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.615"></a>
-<span class="sourceLineNo">616</span> for (Map.Entry<String,Object> e : bm.entrySet()) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span> if (e.getValue() != null)<a name="line.617"></a>
-<span class="sourceLineNo">618</span> set.add(e.getKey());<a name="line.618"></a>
-<span class="sourceLineNo">619</span> }<a name="line.619"></a>
-<span class="sourceLineNo">620</span> }<a name="line.620"></a>
-<span class="sourceLineNo">621</span> }<a name="line.621"></a>
-<span class="sourceLineNo">622</span> th = set.toArray(new Object[set.size()]);<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span> prevC.add(cm);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> s.addAll(Arrays.asList(th));<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> for (Object o : c) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> if (o == null)<a name="line.628"></a>
-<span class="sourceLineNo">629</span> continue;<a name="line.629"></a>
-<span class="sourceLineNo">630</span> cm = session.getClassMetaForObject(o);<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> PojoSwap f = cm.getPojoSwap();<a name="line.632"></a>
-<span class="sourceLineNo">633</span> o = f.swap(session, o);<a name="line.633"></a>
-<span class="sourceLineNo">634</span> cm = cm.getSerializedClassMeta();<a name="line.634"></a>
-<span class="sourceLineNo">635</span> }<a name="line.635"></a>
-<span class="sourceLineNo">636</span> if (prevC.contains(cm))<a name="line.636"></a>
-<span class="sourceLineNo">637</span> continue;<a name="line.637"></a>
-<span class="sourceLineNo">638</span> if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.638"></a>
-<span class="sourceLineNo">639</span> return null;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.640"></a>
-<span class="sourceLineNo">641</span> return null;<a name="line.641"></a>
-<span class="sourceLineNo">642</span> if (session.canIgnoreValue(cm, null, o))<a name="line.642"></a>
-<span class="sourceLineNo">643</span> return null;<a name="line.643"></a>
-<span class="sourceLineNo">644</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> Map m = (Map)o;<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (th.length != m.keySet().size())<a name="line.646"></a>
-<span class="sourceLineNo">647</span> return null;<a name="line.647"></a>
-<span class="sourceLineNo">648</span> for (Object k : m.keySet())<a name="line.648"></a>
-<span class="sourceLineNo">649</span> if (! s.contains(k.toString()))<a name="line.649"></a>
-<span class="sourceLineNo">650</span> return null;<a name="line.650"></a>
-<span class="sourceLineNo">651</span> } else {<a name="line.651"></a>
-<span class="sourceLineNo">652</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.652"></a>
-<span class="sourceLineNo">653</span> int l = 0;<a name="line.653"></a>
-<span class="sourceLineNo">654</span> for (String k : bm.keySet()) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> if (! s.contains(k))<a name="line.655"></a>
+<span class="sourceLineNo">588</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.588"></a>
+<span class="sourceLineNo">589</span> return null;<a name="line.589"></a>
+<span class="sourceLineNo">590</span> HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.590"></a>
+<span class="sourceLineNo">591</span> if (h.isNoTables() || (hbpMeta != null && hbpMeta.isNoTables()))<a name="line.591"></a>
+<span class="sourceLineNo">592</span> return null;<a name="line.592"></a>
+<span class="sourceLineNo">593</span> if (h.isNoTableHeaders() || (hbpMeta != null && hbpMeta.isNoTableHeaders()))<a name="line.593"></a>
+<span class="sourceLineNo">594</span> return new Object[0];<a name="line.594"></a>
+<span class="sourceLineNo">595</span> if (session.canIgnoreValue(cm, null, o1))<a name="line.595"></a>
+<span class="sourceLineNo">596</span> return null;<a name="line.596"></a>
+<span class="sourceLineNo">597</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.597"></a>
+<span class="sourceLineNo">598</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.598"></a>
+<span class="sourceLineNo">599</span> for (Object o : c) {<a name="line.599"></a>
+<span class="sourceLineNo">600</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.600"></a>
+<span class="sourceLineNo">601</span> if (! cm.isInstance(o))<a name="line.601"></a>
+<span class="sourceLineNo">602</span> return null;<a name="line.602"></a>
+<span class="sourceLineNo">603</span> Map m = session.sort((Map)o);<a name="line.603"></a>
+<span class="sourceLineNo">604</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span> if (e.getValue() != null)<a name="line.605"></a>
+<span class="sourceLineNo">606</span> set.add(e.getKey() == null ? null : e.getKey());<a name="line.606"></a>
+<span class="sourceLineNo">607</span> }<a name="line.607"></a>
+<span class="sourceLineNo">608</span> }<a name="line.608"></a>
+<span class="sourceLineNo">609</span> }<a name="line.609"></a>
+<span class="sourceLineNo">610</span> th = set.toArray(new Object[set.size()]);<a name="line.610"></a>
+<span class="sourceLineNo">611</span> } else {<a name="line.611"></a>
+<span class="sourceLineNo">612</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.612"></a>
+<span class="sourceLineNo">613</span> for (Object o : c) {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.614"></a>
+<span class="sourceLineNo">615</span> if (! cm.isInstance(o))<a name="line.615"></a>
+<span class="sourceLineNo">616</span> return null;<a name="line.616"></a>
+<span class="sourceLineNo">617</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.617"></a>
+<span class="sourceLineNo">618</span> for (Map.Entry<String,Object> e : bm.entrySet()) {<a name="line.618"></a>
+<span class="sourceLineNo">619</span> if (e.getValue() != null)<a name="line.619"></a>
+<span class="sourceLineNo">620</span> set.add(e.getKey());<a name="line.620"></a>
+<span class="sourceLineNo">621</span> }<a name="line.621"></a>
+<span class="sourceLineNo">622</span> }<a name="line.622"></a>
+<span class="sourceLineNo">623</span> }<a name="line.623"></a>
+<span class="sourceLineNo">624</span> th = set.toArray(new Object[set.size()]);<a name="line.624"></a>
+<span class="sourceLineNo">625</span> }<a name="line.625"></a>
+<span class="sourceLineNo">626</span> prevC.add(cm);<a name="line.626"></a>
+<span class="sourceLineNo">627</span> boolean isSortable = true;<a name="line.627"></a>
+<span class="sourceLineNo">628</span> for (Object o : th)<a name="line.628"></a>
+<span class="sourceLineNo">629</span> isSortable &= (o instanceof Comparable);<a name="line.629"></a>
+<span class="sourceLineNo">630</span> Set<Object> s = (isSortable ? new TreeSet<Object>() : new LinkedHashSet<Object>());<a name="line.630"></a>
+<span class="sourceLineNo">631</span> s.addAll(Arrays.asList(th));<a name="line.631"></a>
+<span class="sourceLineNo">632</span><a name="line.632"></a>
+<span class="sourceLineNo">633</span> for (Object o : c) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span> if (o == null)<a name="line.634"></a>
+<span class="sourceLineNo">635</span> continue;<a name="line.635"></a>
+<span class="sourceLineNo">636</span> cm = session.getClassMetaForObject(o);<a name="line.636"></a>
+<span class="sourceLineNo">637</span> if (cm != null && cm.getPojoSwap() != null) {<a name="line.637"></a>
+<span class="sourceLineNo">638</span> PojoSwap f = cm.getPojoSwap();<a name="line.638"></a>
+<span class="sourceLineNo">639</span> o = f.swap(session, o);<a name="line.639"></a>
+<span class="sourceLineNo">640</span> cm = cm.getSerializedClassMeta();<a name="line.640"></a>
+<span class="sourceLineNo">641</span> }<a name="line.641"></a>
+<span class="sourceLineNo">642</span> if (prevC.contains(cm))<a name="line.642"></a>
+<span class="sourceLineNo">643</span> continue;<a name="line.643"></a>
+<span class="sourceLineNo">644</span> if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.644"></a>
+<span class="sourceLineNo">645</span> return null;<a name="line.645"></a>
+<span class="sourceLineNo">646</span> if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.646"></a>
+<span class="sourceLineNo">647</span> return null;<a name="line.647"></a>
+<span class="sourceLineNo">648</span> if (session.canIgnoreValue(cm, null, o))<a name="line.648"></a>
+<span class="sourceLineNo">649</span> return null;<a name="line.649"></a>
+<span class="sourceLineNo">650</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> Map m = (Map)o;<a name="line.651"></a>
+<span class="sourceLineNo">652</span> if (th.length != m.keySet().size())<a name="line.652"></a>
+<span class="sourceLineNo">653</span> return null;<a name="line.653"></a>
+<span class="sourceLineNo">654</span> for (Object k : m.keySet())<a name="line.654"></a>
+<span class="sourceLineNo">655</span> if (! s.contains(k.toString()))<a name="line.655"></a>
<span class="sourceLineNo">656</span> return null;<a name="line.656"></a>
-<span class="sourceLineNo">657</span> l++;<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> if (s.size() != l)<a name="line.659"></a>
-<span class="sourceLineNo">660</span> return null;<a name="line.660"></a>
-<span class="sourceLineNo">661</span> }<a name="line.661"></a>
-<span class="sourceLineNo">662</span> }<a name="line.662"></a>
-<span class="sourceLineNo">663</span> return th;<a name="line.663"></a>
-<span class="sourceLineNo">664</span> }<a name="line.664"></a>
-<span class="sourceLineNo">665</span><a name="line.665"></a>
-<span class="sourceLineNo">666</span> /**<a name="line.666"></a>
-<span class="sourceLineNo">667</span> * Returns the schema serializer based on the settings of this serializer.<a name="line.667"></a>
-<span class="sourceLineNo">668</span> * @return The schema serializer.<a name="line.668"></a>
-<span class="sourceLineNo">669</span> */<a name="line.669"></a>
-<span class="sourceLineNo">670</span> @Override /* XmlSerializer */<a name="line.670"></a>
-<span class="sourceLineNo">671</span> public HtmlSerializer getSchemaSerializer() {<a name="line.671"></a>
-<span class="sourceLineNo">672</span> if (schemaSerializer == null)<a name="line.672"></a>
-<span class="sourceLineNo">673</span> schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.673"></a>
-<span class="sourceLineNo">674</span> return schemaSerializer;<a name="line.674"></a>
-<span class="sourceLineNo">675</span> }<a name="line.675"></a>
-<span class="sourceLineNo">676</span><a name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span> //--------------------------------------------------------------------------------<a name="line.678"></a>
-<span class="sourceLineNo">679</span> // Entry point methods<a name="line.679"></a>
-<span class="sourceLineNo">680</span> //--------------------------------------------------------------------------------<a name="line.680"></a>
-<span class="sourceLineNo">681</span><a name="line.681"></a>
-<span class="sourceLineNo">682</span> @Override /* Serializer */<a name="line.682"></a>
-<span class="sourceLineNo">683</span> public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.683"></a>
-<span class="sourceLineNo">684</span> return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.684"></a>
-<span class="sourceLineNo">685</span> }<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span> @Override /* Serializer */<a name="line.687"></a>
-<span class="sourceLineNo">688</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.688"></a>
-<span class="sourceLineNo">689</span> HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.689"></a>
-<span class="sourceLineNo">690</span> doSerialize(s, o, s.getWriter());<a name="line.690"></a>
+<span class="sourceLineNo">657</span> } else {<a name="line.657"></a>
+<span class="sourceLineNo">658</span> BeanMap<?> bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.658"></a>
+<span class="sourceLineNo">659</span> int l = 0;<a name="line.659"></a>
+<span class="sourceLineNo">660</span> for (String k : bm.keySet()) {<a name="line.660"></a>
+<span class="sourceLineNo">661</span> if (! s.contains(k))<a name="line.661"></a>
+<span class="sourceLineNo">662</span> return null;<a name="line.662"></a>
+<span class="sourceLineNo">663</span> l++;<a name="line.663"></a>
+<span class="sourceLineNo">664</span> }<a name="line.664"></a>
+<span class="sourceLineNo">665</span> if (s.size() != l)<a name="line.665"></a>
+<span class="sourceLineNo">666</span> return null;<a name="line.666"></a>
+<span class="sourceLineNo">667</span> }<a name="line.667"></a>
+<span class="sourceLineNo">668</span> }<a name="line.668"></a>
+<span class="sourceLineNo">669</span> return th;<a name="line.669"></a>
+<span class="sourceLineNo">670</span> }<a name="line.670"></a>
+<span class="sourceLineNo">671</span><a name="line.671"></a>
+<span class="sourceLineNo">672</span> /**<a name="line.672"></a>
+<span class="sourceLineNo">673</span> * Returns the schema serializer based on the settings of this serializer.<a name="line.673"></a>
+<span class="sourceLineNo">674</span> * @return The schema serializer.<a name="line.674"></a>
+<span class="sourceLineNo">675</span> */<a name="line.675"></a>
+<span class="sourceLineNo">676</span> @Override /* XmlSerializer */<a name="line.676"></a>
+<span class="sourceLineNo">677</span> public HtmlSerializer getSchemaSerializer() {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> if (schemaSerializer == null)<a name="line.678"></a>
+<span class="sourceLineNo">679</span> schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.679"></a>
+<span class="sourceLineNo">680</span> return schemaSerializer;<a name="line.680"></a>
+<span class="sourceLineNo">681</span> }<a name="line.681"></a>
+<span class="sourceLineNo">682</span><a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span> //--------------------------------------------------------------------------------<a name="line.684"></a>
+<span class="sourceLineNo">685</span> // Entry point methods<a name="line.685"></a>
+<span class="sourceLineNo">686</span> //--------------------------------------------------------------------------------<a name="line.686"></a>
+<span class="sourceLineNo">687</span><a name="line.687"></a>
+<span class="sourceLineNo">688</span> @Override /* Serializer */<a name="line.688"></a>
+<span class="sourceLineNo">689</span> public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.689"></a>
+<span class="sourceLineNo">690</span> return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.690"></a>
<span class="sourceLineNo">691</span> }<a name="line.691"></a>
-<span class="sourceLineNo">692</span>}<a name="line.692"></a>
+<span class="sourceLineNo">692</span><a name="line.692"></a>
+<span class="sourceLineNo">693</span> @Override /* Serializer */<a name="line.693"></a>
+<span class="sourceLineNo">694</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.694"></a>
+<span class="sourceLineNo">695</span> HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.695"></a>
+<span class="sourceLineNo">696</span> doSerialize(s, o, s.getWriter());<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span>}<a name="line.698"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFile.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFile.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFile.html
index 941f21c..c555860 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFile.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFile.html
@@ -752,20 +752,19 @@
<span class="sourceLineNo">744</span> return null;<a name="line.744"></a>
<span class="sourceLineNo">745</span> }<a name="line.745"></a>
<span class="sourceLineNo">746</span><a name="line.746"></a>
-<span class="sourceLineNo">747</span><a name="line.747"></a>
-<span class="sourceLineNo">748</span> private static int parseIntWithSuffix(String s) {<a name="line.748"></a>
-<span class="sourceLineNo">749</span> assertFieldNotNull(s, "s");<a name="line.749"></a>
-<span class="sourceLineNo">750</span> int m = 1;<a name="line.750"></a>
-<span class="sourceLineNo">751</span> if (s.endsWith("M")) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> m = 1024*1024;<a name="line.752"></a>
-<span class="sourceLineNo">753</span> s = s.substring(0, s.length()-1).trim();<a name="line.753"></a>
-<span class="sourceLineNo">754</span> } else if (s.endsWith("K")) {<a name="line.754"></a>
-<span class="sourceLineNo">755</span> m = 1024;<a name="line.755"></a>
-<span class="sourceLineNo">756</span> s = s.substring(0, s.length()-1).trim();<a name="line.756"></a>
-<span class="sourceLineNo">757</span> }<a name="line.757"></a>
-<span class="sourceLineNo">758</span> return Integer.parseInt(s) * m;<a name="line.758"></a>
-<span class="sourceLineNo">759</span> }<a name="line.759"></a>
-<span class="sourceLineNo">760</span>}<a name="line.760"></a>
+<span class="sourceLineNo">747</span> private static int parseIntWithSuffix(String s) {<a name="line.747"></a>
+<span class="sourceLineNo">748</span> assertFieldNotNull(s, "s");<a name="line.748"></a>
+<span class="sourceLineNo">749</span> int m = 1;<a name="line.749"></a>
+<span class="sourceLineNo">750</span> if (s.endsWith("M")) {<a name="line.750"></a>
+<span class="sourceLineNo">751</span> m = 1024*1024;<a name="line.751"></a>
+<span class="sourceLineNo">752</span> s = s.substring(0, s.length()-1).trim();<a name="line.752"></a>
+<span class="sourceLineNo">753</span> } else if (s.endsWith("K")) {<a name="line.753"></a>
+<span class="sourceLineNo">754</span> m = 1024;<a name="line.754"></a>
+<span class="sourceLineNo">755</span> s = s.substring(0, s.length()-1).trim();<a name="line.755"></a>
+<span class="sourceLineNo">756</span> }<a name="line.756"></a>
+<span class="sourceLineNo">757</span> return Integer.parseInt(s) * m;<a name="line.757"></a>
+<span class="sourceLineNo">758</span> }<a name="line.758"></a>
+<span class="sourceLineNo">759</span>}<a name="line.759"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigMgr.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigMgr.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigMgr.html
deleted file mode 100644
index aacfc03..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigMgr.html
+++ /dev/null
@@ -1,386 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
-<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *<a name="line.2"></a>
-<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *<a name="line.3"></a>
-<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *<a name="line.4"></a>
-<span class="sourceLineNo">005</span>// * with the License. You may obtain a copy of the License at *<a name="line.5"></a>
-<span class="sourceLineNo">006</span>// * *<a name="line.6"></a>
-<span class="sourceLineNo">007</span>// * http://www.apache.org/licenses/LICENSE-2.0 *<a name="line.7"></a>
-<span class="sourceLineNo">008</span>// * *<a name="line.8"></a>
-<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *<a name="line.9"></a>
-<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *<a name="line.10"></a>
-<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License. *<a name="line.11"></a>
-<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
-<span class="sourceLineNo">013</span>package org.apache.juneau.ini;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static org.apache.juneau.ini.ConfigFileFormat.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import java.io.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import java.nio.charset.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import java.util.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.concurrent.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.internal.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.json.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.parser.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.serializer.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.utils.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>/**<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * Manager for retrieving shared instances of {@link ConfigFile ConfigFiles}.<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * <h5 class='section'>Example:</h5><a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <p class='bcode'><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * ConfigFile cf = ConfigMgr.<jsf>DEFAULT</jsf>.get(<js>"MyConfig.cfg"</js>);<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * String setting = cf.get(<js>"MySection/mysetting"</js>);<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * </p><a name="line.35"></a>
-<span class="sourceLineNo">036</span> */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>public class ConfigMgr {<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span> /**<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * Default reusable configuration manager.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <ul class='spaced-list'><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <li>Read-only: <jk>false</jk>.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <li>Encoder: {@link XorEncoder}.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <li>Serializer: {@link JsonSerializer#DEFAULT}.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <li>Parser: {@link JsonParser#DEFAULT}.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <li>Charset: {@link Charset#defaultCharset()}.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <li>Search paths: [<js>"."</js>].<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * </ul><a name="line.48"></a>
-<span class="sourceLineNo">049</span> */<a name="line.49"></a>
-<span class="sourceLineNo">050</span> public static final ConfigMgr DEFAULT = new ConfigMgr(false, new XorEncoder(), JsonSerializer.DEFAULT, JsonParser.DEFAULT, Charset.defaultCharset(), new String[]{"."});<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> private ConcurrentHashMap<String,File> files = new ConcurrentHashMap<String,File>();<a name="line.52"></a>
-<span class="sourceLineNo">053</span> private ConcurrentHashMap<File,ConfigFile> configs = new ConcurrentHashMap<File,ConfigFile>();<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private final WriterSerializer serializer;<a name="line.54"></a>
-<span class="sourceLineNo">055</span> private final ReaderParser parser;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> private final Encoder encoder;<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private final boolean readOnly;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> private final Charset charset;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private final List<File> searchPaths = new LinkedList<File>();<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> /**<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * Create a custom configuration manager.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> *<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * @param readOnly Make {@link ConfigFile ConfigFiles} read-only.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * @param encoder Optional. Specify the encoder to use for encoded config file entries (e.g. <js>"mySecret*={...}"</js>).<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * @param serializer Optional. Specify the serializer to use for serializing POJOs when using {@link ConfigFile#put(String, Object)}.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * @param parser Optional. Specify the parser to use for parsing POJOs when using {@link ConfigFile#getObject(Class,String)}.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * @param charset Optional. Specify the config file character encoding. If <jk>null</jk>, uses {@link Charset#defaultCharset()}.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * @param searchPaths Specify the search paths for config files. Can contain relative or absolute paths.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> */<a name="line.70"></a>
-<span class="sourceLineNo">071</span> public ConfigMgr(boolean readOnly, Encoder encoder, WriterSerializer serializer, ReaderParser parser, Charset charset, String[] searchPaths) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> this.readOnly = readOnly;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> this.encoder = encoder;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> this.serializer = serializer;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> this.parser = parser;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> this.charset = charset;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> if (searchPaths != null)<a name="line.77"></a>
-<span class="sourceLineNo">078</span> for (String p : searchPaths)<a name="line.78"></a>
-<span class="sourceLineNo">079</span> this.searchPaths.add(new File(p));<a name="line.79"></a>
-<span class="sourceLineNo">080</span> }<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> /**<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * Returns the config file with the specified absolute or relative path.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * <p><a name="line.84"></a>
-<span class="sourceLineNo">085</span> * Multiple calls to the same path return the same <code>ConfigFile</code> instance.<a name="line.85"></a>
-<span class="sourceLineNo">086</span> *<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * @param path The absolute or relative path of the config file.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * @return The config file.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * @throws IOException If config file could not be parsed.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * @throws FileNotFoundException If config file could not be found.<a name="line.90"></a>
-<span class="sourceLineNo">091</span> */<a name="line.91"></a>
-<span class="sourceLineNo">092</span> public ConfigFile get(String path) throws IOException {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> return get(path, false);<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> /**<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * Returns the config file with the specified absolute or relative path.<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * <p><a name="line.98"></a>
-<span class="sourceLineNo">099</span> * Multiple calls to the same path return the same <code>ConfigFile</code> instance.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * <p><a name="line.100"></a>
-<span class="sourceLineNo">101</span> * If file doesn't exist and <code>create</code> is <jk>true</jk>, the configuration file will be<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * create in the location identified by the first entry in the search paths.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> *<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * @param path The absolute or relative path of the config file.<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * @param create Create the config file if it doesn't exist.<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * @return The config file.<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * @throws IOException If config file could not be parsed.<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * @throws FileNotFoundException If config file could not be found or could not be created.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> */<a name="line.109"></a>
-<span class="sourceLineNo">110</span> public ConfigFile get(String path, boolean create) throws IOException {<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> File f = resolve(path, create);<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> ConfigFile cf = configs.get(f);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> if (cf != null)<a name="line.115"></a>
-<span class="sourceLineNo">116</span> return cf;<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> cf = new ConfigFileImpl(f, readOnly, encoder, serializer, parser, charset);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> configs.putIfAbsent(f, cf);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return configs.get(f);<a name="line.120"></a>
-<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> /**<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * Create a new empty config file not backed by any file.<a name="line.124"></a>
-<span class="sourceLineNo">125</span> *<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * @return A new config file.<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * @throws IOException<a name="line.127"></a>
-<span class="sourceLineNo">128</span> */<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public ConfigFile create() throws IOException {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> return new ConfigFileImpl(null, false, encoder, serializer, parser, charset);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> /**<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * Create a new config file backed by the specified file.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * Note that {@link #get(String)} is the preferred method for getting access to config files<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * since this method will create a new config file each time it is called.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * This method is provided primarily for testing purposes.<a name="line.137"></a>
-<span class="sourceLineNo">138</span> *<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * @param f The file to create a config file from.<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * @return A new config file.<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * @throws IOException<a name="line.141"></a>
-<span class="sourceLineNo">142</span> */<a name="line.142"></a>
-<span class="sourceLineNo">143</span> public ConfigFile create(File f) throws IOException {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> return new ConfigFileImpl(f, false, encoder, serializer, parser, charset);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> /**<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * Create a new config file not backed by a file.<a name="line.148"></a>
-<span class="sourceLineNo">149</span> *<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * @param r The reader containing an INI-formatted file to initialize the config file from.<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * @return A new config file.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @throws IOException<a name="line.152"></a>
-<span class="sourceLineNo">153</span> */<a name="line.153"></a>
-<span class="sourceLineNo">154</span> public ConfigFile create(Reader r) throws IOException {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> return new ConfigFileImpl(null, false, encoder, serializer, parser, charset).load(r);<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> * Reloads any config files that were modified.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * @throws IOException<a name="line.160"></a>
-<span class="sourceLineNo">161</span> */<a name="line.161"></a>
-<span class="sourceLineNo">162</span> public void loadIfModified() throws IOException {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> for (ConfigFile cf : configs.values())<a name="line.163"></a>
-<span class="sourceLineNo">164</span> cf.loadIfModified();<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>
-<span class="sourceLineNo">167</span> /**<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * Delete all configuration files registered with this config manager.<a name="line.168"></a>
-<span class="sourceLineNo">169</span> */<a name="line.169"></a>
-<span class="sourceLineNo">170</span> public void deleteAll() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> for (File f : Collections.list(configs.keys())) // Don't use keySet(), otherwise fails on Java 6/7 if compiled using Java 8.<a name="line.171"></a>
-<span class="sourceLineNo">172</span> FileUtils.delete(f);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> files.clear();<a name="line.173"></a>
-<span class="sourceLineNo">174</span> configs.clear();<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> private File resolve(String path, boolean create) throws IOException {<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> // See if it's cached.<a name="line.179"></a>
-<span class="sourceLineNo">180</span> File f = files.get(path);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> if (f != null)<a name="line.181"></a>
-<span class="sourceLineNo">182</span> return f;<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> // Handle absolute file.<a name="line.184"></a>
-<span class="sourceLineNo">185</span> f = new File(path);<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (f.isAbsolute()) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> if (create)<a name="line.187"></a>
-<span class="sourceLineNo">188</span> FileUtils.create(f);<a name="line.188"></a>
-<span class="sourceLineNo">189</span> if (f.exists())<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return addFile(path, f);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> throw new FileNotFoundException("Could not find config file '"+path+"'");<a name="line.191"></a>
-<span class="sourceLineNo">192</span> }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span> if (searchPaths.isEmpty())<a name="line.194"></a>
-<span class="sourceLineNo">195</span> throw new FileNotFoundException("No search paths specified on ConfigMgr.");<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span> // Handle paths relative to search paths.<a name="line.197"></a>
-<span class="sourceLineNo">198</span> for (File sf : searchPaths) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> f = new File(sf.getAbsolutePath() + "/" + path);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> if (f.exists())<a name="line.200"></a>
-<span class="sourceLineNo">201</span> return addFile(path, f);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> if (create) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> f = new File(searchPaths.get(0).getAbsolutePath() + "/" + path);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> FileUtils.create(f);<a name="line.206"></a>
-<span class="sourceLineNo">207</span> return addFile(path, f);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span> throw new FileNotFoundException("Could not find config file '"+path+"'");<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> private File addFile(String path, File f) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> files.putIfAbsent(path, f);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> return files.get(path);<a name="line.215"></a>
-<span class="sourceLineNo">216</span> }<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span> /**<a name="line.218"></a>
-<span class="sourceLineNo">219</span> * Implements command-line features for working with INI configuration files.<a name="line.219"></a>
-<span class="sourceLineNo">220</span> * <p><a name="line.220"></a>
-<span class="sourceLineNo">221</span> * Invoke as a normal Java program...<a name="line.221"></a>
-<span class="sourceLineNo">222</span> * <p><a name="line.222"></a>
-<span class="sourceLineNo">223</span> * <p class='bcode'><a name="line.223"></a>
-<span class="sourceLineNo">224</span> * java org.apache.juneau.ini.ConfigMgr [args]<a name="line.224"></a>
-<span class="sourceLineNo">225</span> * </p><a name="line.225"></a>
-<span class="sourceLineNo">226</span> * <p><a name="line.226"></a>
-<span class="sourceLineNo">227</span> * Arguments can be any of the following...<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * <ul class='spaced-list'><a name="line.228"></a>
-<span class="sourceLineNo">229</span> * <li>No arguments<br><a name="line.229"></a>
-<span class="sourceLineNo">230</span> * Prints usage message.<br><a name="line.230"></a>
-<span class="sourceLineNo">231</span> * <li><code>createBatchEnvFile -configfile &lt;configFile&gt; -envfile &lt;batchFile&gt; [-verbose]</code><br><a name="line.231"></a>
-<span class="sourceLineNo">232</span> * Creates a batch file that will set each config file entry as an environment variable.<br><a name="line.232"></a>
-<span class="sourceLineNo">233</span> * Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * will be converted to underscores.<br><a name="line.234"></a>
-<span class="sourceLineNo">235</span> * <li><code>createShellEnvFile -configFile &lt;configFile&gt; -envFile &lt;configFile&gt; [-verbose]</code><a name="line.235"></a>
-<span class="sourceLineNo">236</span> * Creates a shell script that will set each config file entry as an environment variable.<br><a name="line.236"></a>
-<span class="sourceLineNo">237</span> * Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * will be converted to underscores.<br><a name="line.238"></a>
-<span class="sourceLineNo">239</span> * <li><code>setVals -configFile &lt;configFile&gt; -vals [var1=val1 [var2=val2...]] [-verbose]</code><a name="line.239"></a>
-<span class="sourceLineNo">240</span> * Sets values in config files.<br><a name="line.240"></a>
-<span class="sourceLineNo">241</span> * </ul><a name="line.241"></a>
-<span class="sourceLineNo">242</span> * <p><a name="line.242"></a>
-<span class="sourceLineNo">243</span> * For example, the following command will create the file <code>'MyConfig.bat'</code> from the contents of the file <code>'MyConfig.cfg'</code>.<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * <p class='bcode'><a name="line.244"></a>
-<span class="sourceLineNo">245</span> * java org.apache.juneau.ini.ConfigMgr createBatchEnvFile -configfile C:\foo\MyConfig.cfg -batchfile C:\foo\MyConfig.bat<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * </p><a name="line.246"></a>
-<span class="sourceLineNo">247</span> *<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * @param args Command-line arguments<a name="line.248"></a>
-<span class="sourceLineNo">249</span> */<a name="line.249"></a>
-<span class="sourceLineNo">250</span> public static void main(String[] args) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> Args a = new Args(args);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> String command = a.getArg(0);<a name="line.253"></a>
-<span class="sourceLineNo">254</span> String configFile = a.getArg("configFile");<a name="line.254"></a>
-<span class="sourceLineNo">255</span> String envFile = a.getArg("envFile");<a name="line.255"></a>
-<span class="sourceLineNo">256</span> List<String> vals = a.getArgs("vals");<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span> if (command == null || ! (command.equals("createBatchEnvFile") || command.equals("createShellEnvFile") || command.equals("setVals")))<a name="line.258"></a>
-<span class="sourceLineNo">259</span> printUsageAndExit();<a name="line.259"></a>
-<span class="sourceLineNo">260</span> else if (configFile.isEmpty())<a name="line.260"></a>
-<span class="sourceLineNo">261</span> printUsageAndExit();<a name="line.261"></a>
-<span class="sourceLineNo">262</span> else if (command.equals("setVals") && vals.isEmpty())<a name="line.262"></a>
-<span class="sourceLineNo">263</span> printUsageAndExit();<a name="line.263"></a>
-<span class="sourceLineNo">264</span> else if ((command.equals("createBatchEnvFile") || command.equals("createShellEnvFile")) && envFile.isEmpty())<a name="line.264"></a>
-<span class="sourceLineNo">265</span> printUsageAndExit();<a name="line.265"></a>
-<span class="sourceLineNo">266</span> else {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> try {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> ConfigFile cf = ConfigMgr.DEFAULT.get(configFile);<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span> if (command.equalsIgnoreCase("setVals")) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> for (String val : vals) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> String[] x = val.split("\\=");<a name="line.272"></a>
-<span class="sourceLineNo">273</span> if (x.length != 2)<a name="line.273"></a>
-<span class="sourceLineNo">274</span> throw new RuntimeException("Invalid format for value: '"+val+"'. Must be in the format 'key=value'");<a name="line.274"></a>
-<span class="sourceLineNo">275</span> cf.put(x[0], x[1]);<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> cf.save();<a name="line.277"></a>
-<span class="sourceLineNo">278</span> return;<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> } else if (command.equalsIgnoreCase("createBatchEnvFile")) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> Writer fw = new OutputStreamWriter(new FileOutputStream(envFile), Charset.defaultCharset());<a name="line.281"></a>
-<span class="sourceLineNo">282</span> try {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> cf.serializeTo(fw, BATCH);<a name="line.283"></a>
-<span class="sourceLineNo">284</span> } finally {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> fw.close();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span> return;<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> } else if (command.equalsIgnoreCase("createShellEnvFile")) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> Writer fw = new OutputStreamWriter(new FileOutputStream(envFile), Charset.defaultCharset());<a name="line.290"></a>
-<span class="sourceLineNo">291</span> try {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> cf.serializeTo(fw, SHELL);<a name="line.292"></a>
-<span class="sourceLineNo">293</span> } finally {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> fw.close();<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> return;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span> } catch (Exception e) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> e.printStackTrace();<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> private static void printUsageAndExit() {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> System.err.println("---Usage---"); // NOT DEBUG<a name="line.306"></a>
-<span class="sourceLineNo">307</span> System.err.println("java -cp juneau.jar org.apache.juneau.ini.ConfigFile createBatchEnvFile -configFile <configFile> -envFile <envFile> [-verbose]"); // NOT DEBUG<a name="line.307"></a>
-<span class="sourceLineNo">308</span> System.err.println("java -cp juneau.jar org.apache.juneau.ini.ConfigFile createShellEnvFile -configFile <configFile> -envFile <envFile> [-verbose]"); // NOT DEBUG<a name="line.308"></a>
-<span class="sourceLineNo">309</span> System.err.println("java -cp juneau.jar org.apache.juneau.ini.ConfigFile setVals -configFile <configFile> -vals [var1 val1 [var2 val2...]] [-verbose]"); // NOT DEBUG<a name="line.309"></a>
-<span class="sourceLineNo">310</span> int rc = Integer.getInteger("exit.2", 2);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> if (rc != 0)<a name="line.311"></a>
-<span class="sourceLineNo">312</span> System.exit(rc);<a name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span>}<a name="line.314"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
[21/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/jena/RdfCommonContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfCommonContext.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfCommonContext.html
index 89837f0..1804d11 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfCommonContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfCommonContext.html
@@ -23,552 +23,551 @@
<span class="sourceLineNo">015</span>import java.util.*;<a name="line.15"></a>
<span class="sourceLineNo">016</span><a name="line.16"></a>
<span class="sourceLineNo">017</span>import org.apache.juneau.jena.annotation.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.xml.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.xml.annotation.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * Configurable properties common to both the {@link RdfSerializer} and {@link RdfParser} classes.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> */<a name="line.23"></a>
-<span class="sourceLineNo">024</span>@SuppressWarnings("serial")<a name="line.24"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.utils.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.xml.*;<a name="line.19"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.xml.annotation.*;<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> * Configurable properties common to both the {@link RdfSerializer} and {@link RdfParser} classes.<a name="line.23"></a>
+<span class="sourceLineNo">024</span> */<a name="line.24"></a>
<span class="sourceLineNo">025</span>public interface RdfCommonContext {<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> * Maps RDF writer names to property prefixes that apply to them.<a name="line.28"></a>
<span class="sourceLineNo">029</span> */<a name="line.29"></a>
-<span class="sourceLineNo">030</span> final static Map<String,String> LANG_PROP_MAP = new HashMap<String,String>() {{<a name="line.30"></a>
-<span class="sourceLineNo">031</span> put("RDF/XML","rdfXml.");<a name="line.31"></a>
-<span class="sourceLineNo">032</span> put("RDF/XML-ABBREV","rdfXml.");<a name="line.32"></a>
-<span class="sourceLineNo">033</span> put("N3","n3.");<a name="line.33"></a>
-<span class="sourceLineNo">034</span> put("N3-PP","n3.");<a name="line.34"></a>
-<span class="sourceLineNo">035</span> put("N3-PLAIN","n3.");<a name="line.35"></a>
-<span class="sourceLineNo">036</span> put("N3-TRIPLES","n3.");<a name="line.36"></a>
-<span class="sourceLineNo">037</span> put("TURTLE","n3.");<a name="line.37"></a>
-<span class="sourceLineNo">038</span> put("N-TRIPLE","ntriple.");<a name="line.38"></a>
-<span class="sourceLineNo">039</span> }};<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span> /**<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <b>Configuration property:</b> RDF language.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <p><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <ul><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <li><b>Name:</b> <js>"Rdf.language"</js><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <li><b>Data type:</b> <code>String</code><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <li><b>Default:</b> <js>"RDF/XML-ABBREV"</js><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * </ul><a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
-<span class="sourceLineNo">050</span> * Can be any of the following:<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <ul class='spaced-list'><a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <li><js>"RDF/XML"</js><a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <li><js>"RDF/XML-ABBREV"</js><a name="line.53"></a>
-<span class="sourceLineNo">054</span> * <li><js>"N-TRIPLE"</js><a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <li><js>"N3"</js> - General name for the N3 writer.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when created.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * Default is the pretty writer but can be overridden with system property <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>.<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <li><js>"N3-PP"</js> - Name of the N3 pretty writer.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding one-referenced bNodes.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <li><js>"N3-PLAIN"</js> - Name of the N3 plain writer.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * The plain writer writes records by subject.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <li><js>"N3-TRIPLES"</js> - Name of the N3 triples writer.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * This writer writes one line per statement, like N-Triples, but does N3-style prefixing.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * <li><js>"TURTLE"</js> - Turtle writer.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * http://www.dajobe.org/2004/01/turtle/<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * </ul><a name="line.66"></a>
-<span class="sourceLineNo">067</span> */<a name="line.67"></a>
-<span class="sourceLineNo">068</span> public static final String RDF_language = "Rdf.language";<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span> /**<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * <b>Configuration property:</b> XML namespace for Juneau properties.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * <p><a name="line.72"></a>
-<span class="sourceLineNo">073</span> * <ul><a name="line.73"></a>
-<span class="sourceLineNo">074</span> * <li><b>Name:</b> <js>"Rdf.juneauNs"</js><a name="line.74"></a>
-<span class="sourceLineNo">075</span> * <li><b>Data type:</b> {@link Namespace}<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * <li><b>Default:</b> <code>{j:<js>'http://www.apache.org/juneau/'</js>}</code><a name="line.76"></a>
-<span class="sourceLineNo">077</span> * </ul><a name="line.77"></a>
-<span class="sourceLineNo">078</span> */<a name="line.78"></a>
-<span class="sourceLineNo">079</span> public static final String RDF_juneauNs = "Rdf.juneauNs";<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> /**<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * <b>Configuration property:</b> Default XML namespace for bean properties.<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * <p><a name="line.83"></a>
-<span class="sourceLineNo">084</span> * <ul><a name="line.84"></a>
-<span class="sourceLineNo">085</span> * <li><b>Name:</b> <js>"Rdf.juneauBpNs"</js><a name="line.85"></a>
-<span class="sourceLineNo">086</span> * <li><b>Data type:</b> {@link Namespace}<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * <li><b>Default:</b> <code>{j:<js>'http://www.apache.org/juneaubp/'</js>}</code><a name="line.87"></a>
-<span class="sourceLineNo">088</span> * </ul><a name="line.88"></a>
-<span class="sourceLineNo">089</span> */<a name="line.89"></a>
-<span class="sourceLineNo">090</span> public static final String RDF_juneauBpNs = "Rdf.juneauBpNs";<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * <b>Configuration property:</b> Reuse XML namespaces when RDF namespaces not specified.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * <p><a name="line.94"></a>
-<span class="sourceLineNo">095</span> * <ul><a name="line.95"></a>
-<span class="sourceLineNo">096</span> * <li><b>Name:</b> <js>"Rdf.useXmlNamespaces"</js><a name="line.96"></a>
-<span class="sourceLineNo">097</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.97"></a>
-<span class="sourceLineNo">098</span> * <li><b>Default:</b> <jk>true</jk><a name="line.98"></a>
-<span class="sourceLineNo">099</span> * </ul><a name="line.99"></a>
-<span class="sourceLineNo">100</span> * <p><a name="line.100"></a>
-<span class="sourceLineNo">101</span> * When specified, namespaces defined using {@link XmlNs} and {@link Xml} will be inherited by the RDF serializers.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * Otherwise, namespaces will be defined using {@link RdfNs} and {@link Rdf}.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> */<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public static final String RDF_useXmlNamespaces = "Rdf.useXmlNamespaces";<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> /**<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * <b>Configuration property:</b> RDF/XML property: <code>iri_rules</code>.<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * <p><a name="line.108"></a>
-<span class="sourceLineNo">109</span> * <ul><a name="line.109"></a>
-<span class="sourceLineNo">110</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.iri-rules"</js><a name="line.110"></a>
-<span class="sourceLineNo">111</span> * <li><b>Data type:</b> <code>String</code><a name="line.111"></a>
-<span class="sourceLineNo">112</span> * <li><b>Default:</b> <js>"lax"</js><a name="line.112"></a>
-<span class="sourceLineNo">113</span> * </ul><a name="line.113"></a>
-<span class="sourceLineNo">114</span> * <p><a name="line.114"></a>
-<span class="sourceLineNo">115</span> * Set the engine for checking and resolving.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <p><a name="line.116"></a>
-<span class="sourceLineNo">117</span> * Possible values:<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * <ul class='spaced-list'><a name="line.118"></a>
-<span class="sourceLineNo">119</span> * <li><js>"lax"</js> - The rules for RDF URI references only, which does permit spaces although the use of spaces is not good practice.<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * <li><js>"strict"</js> - Sets the IRI engine with rules for valid IRIs, XLink and RDF; it does not permit spaces in IRIs.<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * <li><js>"iri"</js> - Sets the IRI engine to IRI (<a class="doclink" href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986</a>, <a class="doclink" href="http://www.ietf.org/rfc/rfc3987.txt">RFC 3987</a>).<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * </ul><a name="line.122"></a>
-<span class="sourceLineNo">123</span> */<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public static final String RDF_arp_iriRules = "Rdf.jena.rdfXml.iri-rules";<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> /**<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * <b>Configuration property:</b> RDF/XML ARP property: <code>error-mode</code>.<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * <p><a name="line.128"></a>
-<span class="sourceLineNo">129</span> * <ul><a name="line.129"></a>
-<span class="sourceLineNo">130</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.error-mode"</js><a name="line.130"></a>
-<span class="sourceLineNo">131</span> * <li><b>Data type:</b> <code>String</code><a name="line.131"></a>
-<span class="sourceLineNo">132</span> * <li><b>Default:</b> <js>"lax"</js><a name="line.132"></a>
-<span class="sourceLineNo">133</span> * </ul><a name="line.133"></a>
-<span class="sourceLineNo">134</span> * <p><a name="line.134"></a>
-<span class="sourceLineNo">135</span> * This allows a coarse-grained approach to control of error handling.<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * <p><a name="line.136"></a>
-<span class="sourceLineNo">137</span> * Possible values:<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * <ul><a name="line.138"></a>
-<span class="sourceLineNo">139</span> * <li><js>"default"</js><a name="line.139"></a>
-<span class="sourceLineNo">140</span> * <li><js>"lax"</js><a name="line.140"></a>
-<span class="sourceLineNo">141</span> * <li><js>"strict"</js><a name="line.141"></a>
-<span class="sourceLineNo">142</span> * <li><js>"strict-ignore"</js><a name="line.142"></a>
-<span class="sourceLineNo">143</span> * <li><js>"strict-warning"</js><a name="line.143"></a>
-<span class="sourceLineNo">144</span> * <li><js>"strict-error"</js><a name="line.144"></a>
-<span class="sourceLineNo">145</span> * <li><js>"strict-fatal"</js><a name="line.145"></a>
-<span class="sourceLineNo">146</span> * </ul><a name="line.146"></a>
-<span class="sourceLineNo">147</span> * <p><a name="line.147"></a>
-<span class="sourceLineNo">148</span> * See also:<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 class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setDefaultErrorMode()">ARPOptions.setDefaultErrorMode()</a><a name="line.150"></a>
-<span class="sourceLineNo">151</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setLaxErrorMode()">ARPOptions.setLaxErrorMode()</a><a name="line.151"></a>
-<span class="sourceLineNo">152</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setStrictErrorMode()">ARPOptions.setStrictErrorMode()</a><a name="line.152"></a>
-<span class="sourceLineNo">153</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setStrictErrorMode(int)">ARPOptions.setStrictErrorMode(int)</a><a name="line.153"></a>
-<span class="sourceLineNo">154</span> * </ul><a name="line.154"></a>
-<span class="sourceLineNo">155</span> */<a name="line.155"></a>
-<span class="sourceLineNo">156</span> public static final String RDF_arp_errorMode = "Rdf.jena.rdfXml.error-mode";<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> * <b>Configuration property:</b> RDF/XML ARP property: <code>embedding</code>.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * <p><a name="line.160"></a>
-<span class="sourceLineNo">161</span> * <ul><a name="line.161"></a>
-<span class="sourceLineNo">162</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.embedding"</js><a name="line.162"></a>
-<span class="sourceLineNo">163</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.163"></a>
-<span class="sourceLineNo">164</span> * <li><b>Default:</b> <jk>false</jk><a name="line.164"></a>
-<span class="sourceLineNo">165</span> * </ul><a name="line.165"></a>
-<span class="sourceLineNo">166</span> * <p><a name="line.166"></a>
-<span class="sourceLineNo">167</span> * Sets ARP to look for RDF embedded within an enclosing XML document.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * <p><a name="line.168"></a>
-<span class="sourceLineNo">169</span> * See also:<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * <ul class='spaced-list'><a name="line.170"></a>
-<span class="sourceLineNo">171</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setEmbedding(boolean)">ARPOptions.setEmbedding(boolean)</a><a name="line.171"></a>
-<span class="sourceLineNo">172</span> * </ul><a name="line.172"></a>
-<span class="sourceLineNo">173</span> */<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public static final String RDF_arp_embedding = "Rdf.jena.rdfXml.embedding";<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> /**<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * <b>Configuration property:</b> RDF/XML ARP property: <code>ERR_xxx</code>.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * <p><a name="line.178"></a>
-<span class="sourceLineNo">179</span> * <ul><a name="line.179"></a>
-<span class="sourceLineNo">180</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.ERR_"</js><a name="line.180"></a>
-<span class="sourceLineNo">181</span> * <li><b>Data type:</b> <code>String</code><a name="line.181"></a>
-<span class="sourceLineNo">182</span> * </ul><a name="line.182"></a>
-<span class="sourceLineNo">183</span> * <p><a name="line.183"></a>
-<span class="sourceLineNo">184</span> * Provides fine-grained control over detected error conditions.<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * <p><a name="line.185"></a>
-<span class="sourceLineNo">186</span> * Possible values:<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * <ul><a name="line.187"></a>
-<span class="sourceLineNo">188</span> * <li><js>"EM_IGNORE"</js><a name="line.188"></a>
-<span class="sourceLineNo">189</span> * <li><js>"EM_WARNING"</js><a name="line.189"></a>
-<span class="sourceLineNo">190</span> * <li><js>"EM_ERROR"</js><a name="line.190"></a>
-<span class="sourceLineNo">191</span> * <li><js>"EM_FATAL"</js><a name="line.191"></a>
-<span class="sourceLineNo">192</span> * </ul><a name="line.192"></a>
-<span class="sourceLineNo">193</span> * <p><a name="line.193"></a>
-<span class="sourceLineNo">194</span> * See also:<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <ul class='spaced-list'><a name="line.195"></a>
-<span class="sourceLineNo">196</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html">ARPErrorNumbers</a><a name="line.196"></a>
-<span class="sourceLineNo">197</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setErrorMode(int,%20int)">ARPOptions.setErrorMode(int, int)</a><a name="line.197"></a>
-<span class="sourceLineNo">198</span> * </ul><a name="line.198"></a>
-<span class="sourceLineNo">199</span> */<a name="line.199"></a>
-<span class="sourceLineNo">200</span> public static final String RDF_arp_err_ = "Rdf.jena.rdfXml.ERR_";<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span> /**<a name="line.202"></a>
-<span class="sourceLineNo">203</span> * <b>Configuration property:</b> RDF/XML ARP property: <code>WARN_xxx</code>.<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * <p><a name="line.204"></a>
-<span class="sourceLineNo">205</span> * <ul><a name="line.205"></a>
-<span class="sourceLineNo">206</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.WARN_"</js><a name="line.206"></a>
-<span class="sourceLineNo">207</span> * <li><b>Data type:</b> <code>String</code><a name="line.207"></a>
-<span class="sourceLineNo">208</span> * </ul><a name="line.208"></a>
-<span class="sourceLineNo">209</span> * <p><a name="line.209"></a>
-<span class="sourceLineNo">210</span> * See {@link #RDF_arp_err_} for details.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> */<a name="line.211"></a>
-<span class="sourceLineNo">212</span> public static final String RDF_arp_warn_ = "Rdf.jena.rdfXml.WARN_";<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * RDF/XML ARP property: <code>IGN_xxx</code>.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * <p><a name="line.216"></a>
-<span class="sourceLineNo">217</span> * <ul><a name="line.217"></a>
-<span class="sourceLineNo">218</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.IGN_"</js><a name="line.218"></a>
-<span class="sourceLineNo">219</span> * <li><b>Data type:</b> <code>String</code><a name="line.219"></a>
-<span class="sourceLineNo">220</span> * </ul><a name="line.220"></a>
-<span class="sourceLineNo">221</span> * <p><a name="line.221"></a>
-<span class="sourceLineNo">222</span> * See {@link #RDF_arp_err_} for details.<a name="line.222"></a>
-<span class="sourceLineNo">223</span> */<a name="line.223"></a>
-<span class="sourceLineNo">224</span> public static final String RDF_arp_ign_ = "Rdf.jena.rdfXml.IGN_";<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> /**<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * <b>Configuration property:</b> RDF/XML property: <code>xmlbase</code>.<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * <p><a name="line.228"></a>
-<span class="sourceLineNo">229</span> * <ul><a name="line.229"></a>
-<span class="sourceLineNo">230</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.xmlbase"</js><a name="line.230"></a>
-<span class="sourceLineNo">231</span> * <li><b>Data type:</b> <code>String</code><a name="line.231"></a>
-<span class="sourceLineNo">232</span> * <li><b>Default:</b> <jk>null</jk><a name="line.232"></a>
-<span class="sourceLineNo">233</span> * </ul><a name="line.233"></a>
-<span class="sourceLineNo">234</span> * <p><a name="line.234"></a>
-<span class="sourceLineNo">235</span> * The value to be included for an <xa>xml:base</xa> attribute on the root element in the file.<a name="line.235"></a>
-<span class="sourceLineNo">236</span> */<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public static final String RDF_rdfxml_xmlBase = "Rdf.jena.rdfXml.xmlbase";<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> /**<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * <b>Configuration property:</b> RDF/XML property: <code>longId</code>.<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * <p><a name="line.241"></a>
-<span class="sourceLineNo">242</span> * <ul><a name="line.242"></a>
-<span class="sourceLineNo">243</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.longId"</js><a name="line.243"></a>
-<span class="sourceLineNo">244</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.244"></a>
-<span class="sourceLineNo">245</span> * <li><b>Default:</b> <jk>false</jk><a name="line.245"></a>
-<span class="sourceLineNo">246</span> * </ul><a name="line.246"></a>
-<span class="sourceLineNo">247</span> * <p><a name="line.247"></a>
-<span class="sourceLineNo">248</span> * Whether to use long ID's for anon resources.<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * Short ID's are easier to read, but can run out of memory on very large models.<a name="line.249"></a>
-<span class="sourceLineNo">250</span> */<a name="line.250"></a>
-<span class="sourceLineNo">251</span> public static final String RDF_rdfxml_longId = "Rdf.jena.rdfXml.longId";<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * <b>Configuration property:</b> RDF/XML property: <code>allowBadURIs</code>.<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * <p><a name="line.255"></a>
-<span class="sourceLineNo">256</span> * <ul><a name="line.256"></a>
-<span class="sourceLineNo">257</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.allowBadURIs"</js><a name="line.257"></a>
-<span class="sourceLineNo">258</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.258"></a>
-<span class="sourceLineNo">259</span> * <li><b>Default:</b> <jk>false</jk><a name="line.259"></a>
-<span class="sourceLineNo">260</span> * </ul><a name="line.260"></a>
-<span class="sourceLineNo">261</span> * <p><a name="line.261"></a>
-<span class="sourceLineNo">262</span> * URIs in the graph are, by default, checked prior to serialization.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> */<a name="line.263"></a>
-<span class="sourceLineNo">264</span> public static final String RDF_rdfxml_allowBadUris = "Rdf.jena.rdfXml.allowBadURIs";<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> /**<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * <b>Configuration property:</b> RDF/XML property: <code>relativeURIs</code>.<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * <p><a name="line.268"></a>
-<span class="sourceLineNo">269</span> * <ul><a name="line.269"></a>
-<span class="sourceLineNo">270</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.relativeURIs"</js><a name="line.270"></a>
-<span class="sourceLineNo">271</span> * <li><b>Data type:</b> <code>String</code><a name="line.271"></a>
-<span class="sourceLineNo">272</span> * <li><b>Default:</b> <js>"same-document, absolute, relative, parent"</js><a name="line.272"></a>
-<span class="sourceLineNo">273</span> * </ul><a name="line.273"></a>
-<span class="sourceLineNo">274</span> * <p><a name="line.274"></a>
-<span class="sourceLineNo">275</span> * What sort of relative URIs should be used.<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * <p><a name="line.276"></a>
-<span class="sourceLineNo">277</span> * A comma separate list of options:<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * <ul class='spaced-list'><a name="line.278"></a>
-<span class="sourceLineNo">279</span> * <li><js>"same-document"</js> - Same-document references (e.g. <js>""</js> or <js>"#foo"</js>)<a name="line.279"></a>
-<span class="sourceLineNo">280</span> * <li><js>"network"</js> - Network paths (e.g. <js>"//example.org/foo"</js> omitting the URI scheme)<a name="line.280"></a>
-<span class="sourceLineNo">281</span> * <li><js>"absolute"</js> - Absolute paths (e.g. <js>"/foo"</js> omitting the scheme and authority)<a name="line.281"></a>
-<span class="sourceLineNo">282</span> * <li><js>"relative"</js> - Relative path not begining in <js>"../"</js><a name="line.282"></a>
-<span class="sourceLineNo">283</span> * <li><js>"parent"</js> - Relative path begining in <js>"../"</js><a name="line.283"></a>
-<span class="sourceLineNo">284</span> * <li><js>"grandparent"</js> - Relative path begining in <js>"../../"</js><a name="line.284"></a>
-<span class="sourceLineNo">285</span> * </ul><a name="line.285"></a>
-<span class="sourceLineNo">286</span> * <p><a name="line.286"></a>
-<span class="sourceLineNo">287</span> * The default value is <js>"same-document, absolute, relative, parent"</js>.<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * To switch off relative URIs use the value <js>""</js>.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * Relative URIs of any of these types are output where possible if and only if the option has been specified.<a name="line.289"></a>
-<span class="sourceLineNo">290</span> */<a name="line.290"></a>
-<span class="sourceLineNo">291</span> public static final String RDF_rdfxml_relativeUris = "Rdf.jena.rdfXml.relativeURIs";<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> /**<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * <b>Configuration property:</b> RDF/XML property: <code>showXmlDeclaration</code>.<a name="line.294"></a>
-<span class="sourceLineNo">295</span> * <p><a name="line.295"></a>
-<span class="sourceLineNo">296</span> * <ul><a name="line.296"></a>
-<span class="sourceLineNo">297</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.showXmlDeclaration"</js><a name="line.297"></a>
-<span class="sourceLineNo">298</span> * <li><b>Data type:</b> <code>String</code><a name="line.298"></a>
-<span class="sourceLineNo">299</span> * <li><b>Default:</b> <js>"default"</js><a name="line.299"></a>
-<span class="sourceLineNo">300</span> * </ul><a name="line.300"></a>
-<span class="sourceLineNo">301</span> * <p><a name="line.301"></a>
-<span class="sourceLineNo">302</span> * Possible values:<a name="line.302"></a>
-<span class="sourceLineNo">303</span> * <ul class='spaced-list'><a name="line.303"></a>
-<span class="sourceLineNo">304</span> * <li><js>"true"</js> - Add XML Declaration to the output.<a name="line.304"></a>
-<span class="sourceLineNo">305</span> * <li><js>"false"</js> - Don't add XML Declaration to the output.<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * <li><js>"default"</js> - Only add an XML Declaration when asked to write to an <code>OutputStreamWriter</code> that uses some encoding other than <code>UTF-8</code> or <code>UTF-16</code>.<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * In this case the encoding is shown in the XML declaration.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * </ul><a name="line.308"></a>
-<span class="sourceLineNo">309</span> */<a name="line.309"></a>
-<span class="sourceLineNo">310</span> public static final String RDF_rdfxml_showXmlDeclaration = "Rdf.jena.rdfXml.showXmlDeclaration";<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> /**<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * <b>Configuration property:</b> RDF/XML property: <code>showDoctypeDeclaration</code>.<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * <p><a name="line.314"></a>
-<span class="sourceLineNo">315</span> * <ul><a name="line.315"></a>
-<span class="sourceLineNo">316</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.showDoctypeDeclaration"</js><a name="line.316"></a>
-<span class="sourceLineNo">317</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.317"></a>
-<span class="sourceLineNo">318</span> * <li><b>Default:</b> <jk>true</jk><a name="line.318"></a>
-<span class="sourceLineNo">319</span> * </ul><a name="line.319"></a>
-<span class="sourceLineNo">320</span> * <p><a name="line.320"></a>
-<span class="sourceLineNo">321</span> * If true, an XML Doctype declaration is included in the output.<a name="line.321"></a>
-<span class="sourceLineNo">322</span> * This declaration includes a <code>!ENTITY</code> declaration for each prefix mapping in the model, and any attribute value that starts with the URI of that mapping is written as starting with the corresponding entity invocation.<a name="line.322"></a>
-<span class="sourceLineNo">323</span> */<a name="line.323"></a>
-<span class="sourceLineNo">324</span> public static final String RDF_rdfxml_showDoctypeDeclaration = "Rdf.jena.rdfXml.showDoctypeDeclaration";<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> /**<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * <b>Configuration property:</b> RDF/XML property: <code>tab</code>.<a name="line.327"></a>
-<span class="sourceLineNo">328</span> * <p><a name="line.328"></a>
-<span class="sourceLineNo">329</span> * <ul><a name="line.329"></a>
-<span class="sourceLineNo">330</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.tab"</js><a name="line.330"></a>
-<span class="sourceLineNo">331</span> * <li><b>Data type:</b> <code>Integer</code><a name="line.331"></a>
-<span class="sourceLineNo">332</span> * <li><b>Default:</b> <code>2</code><a name="line.332"></a>
-<span class="sourceLineNo">333</span> * </ul><a name="line.333"></a>
-<span class="sourceLineNo">334</span> * <p><a name="line.334"></a>
-<span class="sourceLineNo">335</span> * The number of spaces with which to indent XML child elements.<a name="line.335"></a>
-<span class="sourceLineNo">336</span> */<a name="line.336"></a>
-<span class="sourceLineNo">337</span> public static final String RDF_rdfxml_tab = "Rdf.jena.rdfXml.tab";<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> /**<a name="line.339"></a>
-<span class="sourceLineNo">340</span> * <b>Configuration property:</b> RDF/XML property: <code>attributeQuoteChar</code>.<a name="line.340"></a>
-<span class="sourceLineNo">341</span> * <p><a name="line.341"></a>
-<span class="sourceLineNo">342</span> * <ul><a name="line.342"></a>
-<span class="sourceLineNo">343</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.attributeQuoteChar"</js><a name="line.343"></a>
-<span class="sourceLineNo">344</span> * <li><b>Data type:</b> <code>Character</code><a name="line.344"></a>
-<span class="sourceLineNo">345</span> * <li><b>Default:</b> <js>'"'</js><a name="line.345"></a>
-<span class="sourceLineNo">346</span> * </ul><a name="line.346"></a>
-<span class="sourceLineNo">347</span> * <p><a name="line.347"></a>
-<span class="sourceLineNo">348</span> * The XML attribute quote character.<a name="line.348"></a>
-<span class="sourceLineNo">349</span> */<a name="line.349"></a>
-<span class="sourceLineNo">350</span> public static final String RDF_rdfxml_attributeQuoteChar = "Rdf.jena.rdfXml.attributeQuoteChar";<a name="line.350"></a>
-<span class="sourceLineNo">351</span><a name="line.351"></a>
-<span class="sourceLineNo">352</span> /**<a name="line.352"></a>
-<span class="sourceLineNo">353</span> * <b>Configuration property:</b> RDF/XML property: <code>blockRules</code>.<a name="line.353"></a>
-<span class="sourceLineNo">354</span> * <p><a name="line.354"></a>
-<span class="sourceLineNo">355</span> * <ul><a name="line.355"></a>
-<span class="sourceLineNo">356</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.blockRules"</js><a name="line.356"></a>
-<span class="sourceLineNo">357</span> * <li><b>Data type:</b> <code>String</code><a name="line.357"></a>
-<span class="sourceLineNo">358</span> * <li><b>Default:</b> <js>""</js><a name="line.358"></a>
-<span class="sourceLineNo">359</span> * </ul><a name="line.359"></a>
-<span class="sourceLineNo">360</span> * <p><a name="line.360"></a>
-<span class="sourceLineNo">361</span> * A list of <code>Resource</code> or a <code>String</code> being a comma separated list of fragment IDs from <a class="doclink" href="http://www.w3.org/TR/rdf-syntax-grammar">RDF Syntax Grammar</a> indicating grammar rules that will not be used.<a name="line.361"></a>
-<span class="sourceLineNo">362</span> */<a name="line.362"></a>
-<span class="sourceLineNo">363</span> public static final String RDF_rdfxml_blockRules = "Rdf.jena.rdfXml.blockRules";<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> /**<a name="line.365"></a>
-<span class="sourceLineNo">366</span> * <b>Configuration property:</b> N3/Turtle property: <code>minGap</code>.<a name="line.366"></a>
-<span class="sourceLineNo">367</span> * <p><a name="line.367"></a>
-<span class="sourceLineNo">368</span> * <ul><a name="line.368"></a>
-<span class="sourceLineNo">369</span> * <li><b>Name:</b> <js>"Rdf.jena.n3.minGap"</js><a name="line.369"></a>
-<span class="sourceLineNo">370</span> * <li><b>Data type:</b> <code>Integer</code><a name="line.370"></a>
-<span class="sourceLineNo">371</span> * <li><b>Default:</b> <code>1</code><a name="line.371"></a>
-<span class="sourceLineNo">372</span> * </ul><a name="line.372"></a>
-<span class="sourceLineNo">373</span> * <p><a name="line.373"></a>
-<span class="sourceLineNo">374</span> * Minimum gap between items on a line.<a name="line.374"></a>
-<span class="sourceLineNo">375</span> */<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public static final String RDF_n3_minGap = "Rdf.jena.n3.minGap";<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span> /**<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * <b>Configuration property:</b> N3/Turtle property: <code>objectLists</code>.<a name="line.379"></a>
-<span class="sourceLineNo">380</span> * <p><a name="line.380"></a>
-<span class="sourceLineNo">381</span> * <ul><a name="line.381"></a>
-<span class="sourceLineNo">382</span> * <li><b>Name:</b> <js>"Rdf.jena.n3.objectLists"</js><a name="line.382"></a>
-<span class="sourceLineNo">383</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.383"></a>
-<span class="sourceLineNo">384</span> * <li><b>Default:</b> <jk>true</jk><a name="line.384"></a>
-<span class="sourceLineNo">385</span> * </ul><a name="line.385"></a>
-<span class="sourceLineNo">386</span> * <p><a name="line.386"></a>
-<span class="sourceLineNo">387</span> * Print object lists as comma separated lists.<a name="line.387"></a>
-<span class="sourceLineNo">388</span> */<a name="line.388"></a>
-<span class="sourceLineNo">389</span> public static final String RDF_n3_objectLists = "Rdf.jena.n3.objectLists";<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span> /**<a name="line.391"></a>
-<span class="sourceLineNo">392</span> * <b>Configuration property:</b> N3/Turtle property: <code>subjectColumn</code>.<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * <p><a name="line.393"></a>
-<span class="sourceLineNo">394</span> * <ul><a name="line.394"></a>
-<span class="sourceLineNo">395</span> * <li><b>Name:</b> <js>"Rdf.jena.n3.subjectColumn"</js><a name="line.395"></a>
-<span class="sourceLineNo">396</span> * <li><b>Data type:</b> <code>Integer</code><a name="line.396"></a>
-<span class="sourceLineNo">397</span> * <li><b>Default:</b> indentProperty<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * </ul><a name="line.398"></a>
-<span class="sourceLineNo">399</span> * <p><a name="line.399"></a>
-<span class="sourceLineNo">400</span> * If the subject is shorter than this value, the first property may go on the same line.<a name="line.400"></a>
-<span class="sourceLineNo">401</span> */<a name="line.401"></a>
-<span class="sourceLineNo">402</span> public static final String RDF_n3_subjectColumn = "Rdf.jena.n3.subjectColumn";<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span> /**<a name="line.404"></a>
-<span class="sourceLineNo">405</span> * <b>Configuration property:</b> N3/Turtle property: <code>propertyColumn</code>.<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * <p><a name="line.406"></a>
-<span class="sourceLineNo">407</span> * <ul><a name="line.407"></a>
-<span class="sourceLineNo">408</span> * <li><b>Name:</b> <js>"Rdf.jena.n3.propertyColumn"</js><a name="line.408"></a>
-<span class="sourceLineNo">409</span> * <li><b>Data type:</b> <code>Integer</code><a name="line.409"></a>
-<span class="sourceLineNo">410</span> * <li><b>Default:</b> <code>8</code><a name="line.410"></a>
-<span class="sourceLineNo">411</span> * </ul><a name="line.411"></a>
-<span class="sourceLineNo">412</span> * <p><a name="line.412"></a>
-<span class="sourceLineNo">413</span> * Width of the property column.<a name="line.413"></a>
-<span class="sourceLineNo">414</span> */<a name="line.414"></a>
-<span class="sourceLineNo">415</span> public static final String RDF_n3_propertyColumn = "Rdf.jena.n3.propertyColumn";<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span> /**<a name="line.417"></a>
-<span class="sourceLineNo">418</span> * <b>Configuration property:</b> N3/Turtle property: <code>indentProperty</code>.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * <p><a name="line.419"></a>
-<span class="sourceLineNo">420</span> * <ul><a name="line.420"></a>
-<span class="sourceLineNo">421</span> * <li><b>Name:</b> <js>"Rdf.jena.n3.indentProperty"</js><a name="line.421"></a>
-<span class="sourceLineNo">422</span> * <li><b>Data type:</b> <code>Integer</code><a name="line.422"></a>
-<span class="sourceLineNo">423</span> * <li><b>Default:</b> <code>6</code><a name="line.423"></a>
-<span class="sourceLineNo">424</span> * </ul><a name="line.424"></a>
-<span class="sourceLineNo">425</span> * <p><a name="line.425"></a>
-<span class="sourceLineNo">426</span> * Width to indent properties.<a name="line.426"></a>
-<span class="sourceLineNo">427</span> */<a name="line.427"></a>
-<span class="sourceLineNo">428</span> public static final String RDF_n3_indentProperty = "Rdf.jena.n3.indentProperty";<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span> /**<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * <b>Configuration property:</b> N3/Turtle property: <code>widePropertyLen</code>.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> * <p><a name="line.432"></a>
-<span class="sourceLineNo">433</span> * <ul><a name="line.433"></a>
-<span class="sourceLineNo">434</span> * <li><b>Name:</b> <js>"Rdf.jena.n3.widePropertyLen"</js><a name="line.434"></a>
-<span class="sourceLineNo">435</span> * <li><b>Data type:</b> <code>Integer</code><a name="line.435"></a>
-<span class="sourceLineNo">436</span> * <li><b>Default:</b> <code>20</code><a name="line.436"></a>
-<span class="sourceLineNo">437</span> * </ul><a name="line.437"></a>
-<span class="sourceLineNo">438</span> * <p><a name="line.438"></a>
-<span class="sourceLineNo">439</span> * Width of the property column.<a name="line.439"></a>
-<span class="sourceLineNo">440</span> * Must be longer than <code>propertyColumn</code>.<a name="line.440"></a>
-<span class="sourceLineNo">441</span> */<a name="line.441"></a>
-<span class="sourceLineNo">442</span> public static final String RDF_n3_widePropertyLen = "Rdf.jena.n3.widePropertyLen";<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> /**<a name="line.444"></a>
-<span class="sourceLineNo">445</span> * <b>Configuration property:</b> N3/Turtle property: <code>abbrevBaseURI</code>.<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * <p><a name="line.446"></a>
-<span class="sourceLineNo">447</span> * <ul><a name="line.447"></a>
-<span class="sourceLineNo">448</span> * <li><b>Name:</b> <js>"Rdf.jena.n3.abbrevBaseURI"</js><a name="line.448"></a>
-<span class="sourceLineNo">449</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.449"></a>
-<span class="sourceLineNo">450</span> * <li><b>Default:</b> <jk>true</jk><a name="line.450"></a>
-<span class="sourceLineNo">451</span> * </ul><a name="line.451"></a>
-<span class="sourceLineNo">452</span> * <p><a name="line.452"></a>
-<span class="sourceLineNo">453</span> * Control whether to use abbreviations <code>&lt;&gt;</code> or <code>&lt;#&gt;</code>.<a name="line.453"></a>
-<span class="sourceLineNo">454</span> */<a name="line.454"></a>
-<span class="sourceLineNo">455</span> public static final String RDF_n3_abbrevBaseUri = "Rdf.jena.n3.abbrevBaseURI";<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span> /**<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * <b>Configuration property:</b> N3/Turtle property: <code>usePropertySymbols</code>.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * <p><a name="line.459"></a>
-<span class="sourceLineNo">460</span> * <ul><a name="line.460"></a>
-<span class="sourceLineNo">461</span> * <li><b>Name:</b> <js>"Rdf.jena.n3.usePropertySymbols"</js><a name="line.461"></a>
-<span class="sourceLineNo">462</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.462"></a>
-<span class="sourceLineNo">463</span> * <li><b>Default:</b> <jk>true</jk><a name="line.463"></a>
-<span class="sourceLineNo">464</span> * </ul><a name="line.464"></a>
-<span class="sourceLineNo">465</span> * <p><a name="line.465"></a>
-<span class="sourceLineNo">466</span> * Control whether to use <code>a</code>, <code>=</code> and <code>=&gt;</code> in output<a name="line.466"></a>
-<span class="sourceLineNo">467</span> */<a name="line.467"></a>
-<span class="sourceLineNo">468</span> public static final String RDF_n3_usePropertySymbols = "Rdf.jena.n3.usePropertySymbols";<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span> /**<a name="line.470"></a>
-<span class="sourceLineNo">471</span> * <b>Configuration property:</b> N3/Turtle property: <code>useTripleQuotedStrings</code>.<a name="line.471"></a>
-<span class="sourceLineNo">472</span> * <p><a name="line.472"></a>
-<span class="sourceLineNo">473</span> * <ul><a name="line.473"></a>
-<span class="sourceLineNo">474</span> * <li><b>Name:</b> <js>"Rdf.jena.n3.useTripleQuotedStrings"</js><a name="line.474"></a>
-<span class="sourceLineNo">475</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.475"></a>
-<span class="sourceLineNo">476</span> * <li><b>Default:</b> <jk>true</jk><a name="line.476"></a>
-<span class="sourceLineNo">477</span> * </ul><a name="line.477"></a>
-<span class="sourceLineNo">478</span> * <p><a name="line.478"></a>
-<span class="sourceLineNo">479</span> * Allow the use of <code>"""</code> to delimit long strings.<a name="line.479"></a>
-<span class="sourceLineNo">480</span> */<a name="line.480"></a>
-<span class="sourceLineNo">481</span> public static final String RDF_n3_useTripleQuotedStrings = "Rdf.jena.n3.useTripleQuotedStrings";<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span> /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * <b>Configuration property:</b> N3/Turtle property: <code>useDoubles</code>.<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * <p><a name="line.485"></a>
-<span class="sourceLineNo">486</span> * <ul><a name="line.486"></a>
-<span class="sourceLineNo">487</span> * <li><b>Name:</b> <js>"Rdf.jena.n3.useDoubles"</js><a name="line.487"></a>
-<span class="sourceLineNo">488</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.488"></a>
-<span class="sourceLineNo">489</span> * <li><b>Default:</b> <jk>true</jk><a name="line.489"></a>
-<span class="sourceLineNo">490</span> * </ul><a name="line.490"></a>
-<span class="sourceLineNo">491</span> * <p><a name="line.491"></a>
-<span class="sourceLineNo">492</span> * Allow the use doubles as <code>123.456</code>.<a name="line.492"></a>
-<span class="sourceLineNo">493</span> */<a name="line.493"></a>
-<span class="sourceLineNo">494</span> public static final String RDF_n3_useDoubles = "Rdf.jena.n3.useDoubles";<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span> /**<a name="line.496"></a>
-<span class="sourceLineNo">497</span> * <b>Configuration property:</b> RDF format for representing collections and arrays.<a name="line.497"></a>
-<span class="sourceLineNo">498</span> * <p><a name="line.498"></a>
-<span class="sourceLineNo">499</span> * <ul><a name="line.499"></a>
-<span class="sourceLineNo">500</span> * <li><b>Name:</b> <js>"Rdf.collectionFormat"</js><a name="line.500"></a>
-<span class="sourceLineNo">501</span> * <li><b>Data type:</b> <code>String</code><a name="line.501"></a>
-<span class="sourceLineNo">502</span> * <li><b>Default:</b> <js>"DEFAULT"</js><a name="line.502"></a>
-<span class="sourceLineNo">503</span> * </ul><a name="line.503"></a>
-<span class="sourceLineNo">504</span> * <p><a name="line.504"></a>
-<span class="sourceLineNo">505</span> * Possible values:<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * <ul class='spaced-list'><a name="line.506"></a>
-<span class="sourceLineNo">507</span> * <li><js>"DEFAULT"</js> - Default format. The default is an RDF Sequence container.<a name="line.507"></a>
-<span class="sourceLineNo">508</span> * <li><js>"SEQ"</js> - RDF Sequence container.<a name="line.508"></a>
-<span class="sourceLineNo">509</span> * <li><js>"BAG"</js> - RDF Bag container.<a name="line.509"></a>
-<span class="sourceLineNo">510</span> * <li><js>"LIST"</js> - RDF List container.<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * <li><js>"MULTI_VALUED"</js> - Multi-valued properties.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> * </ul><a name="line.512"></a>
-<span class="sourceLineNo">513</span> * <p><a name="line.513"></a>
-<span class="sourceLineNo">514</span> * <h5 class='section'>Notes:</h5><a name="line.514"></a>
-<span class="sourceLineNo">515</span> * <ul><a name="line.515"></a>
-<span class="sourceLineNo">516</span> * <li>If you use <js>"BAG"</js> or <js>"MULTI_VALUED"</js>, the order of the elements in the collection will get lost.<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * </ul><a name="line.517"></a>
-<span class="sourceLineNo">518</span> */<a name="line.518"></a>
-<span class="sourceLineNo">519</span> public static final String RDF_collectionFormat = "Rdf.collectionFormat";<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span> /**<a name="line.521"></a>
-<span class="sourceLineNo">522</span> * <b>Configuration property:</b> Collections should be serialized and parsed as loose collections.<a name="line.522"></a>
-<span class="sourceLineNo">523</span> * <p><a name="line.523"></a>
-<span class="sourceLineNo">524</span> * <ul><a name="line.524"></a>
-<span class="sourceLineNo">525</span> * <li><b>Name:</b> <js>"Rdf.looseCollections"</js><a name="line.525"></a>
-<span class="sourceLineNo">526</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.526"></a>
-<span class="sourceLineNo">527</span> * <li><b>Default:</b> <jk>false</jk><a name="line.527"></a>
-<span class="sourceLineNo">528</span> * </ul><a name="line.528"></a>
-<span class="sourceLineNo">529</span> * <p><a name="line.529"></a>
-<span class="sourceLineNo">530</span> * When specified, collections of resources are handled as loose collections of resources in RDF instead of<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * resources that are children of an RDF collection (e.g. Sequence, Bag).<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * <p><a name="line.532"></a>
-<span class="sourceLineNo">533</span> * Note that this setting is specialized for RDF syntax, and is incompatible with the concept of<a name="line.533"></a>
-<span class="sourceLineNo">534</span> * losslessly representing POJO models, since the tree structure of these POJO models are lost<a name="line.534"></a>
-<span class="sourceLineNo">535</span> * when serialized as loose collections.<a name="line.535"></a>
-<span class="sourceLineNo">536</span> * <p><a name="line.536"></a>
-<span class="sourceLineNo">537</span> * This setting is typically only useful if the beans being parsed into do not have a bean property<a name="line.537"></a>
-<span class="sourceLineNo">538</span> * annotated with {@link Rdf#beanUri @Rdf(beanUri=true)}.<a name="line.538"></a>
-<span class="sourceLineNo">539</span> *<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * <h5 class='section'>Example:</h5><a name="line.540"></a>
-<span class="sourceLineNo">541</span> * <p class='bcode'><a name="line.541"></a>
-<span class="sourceLineNo">542</span> * WriterSerializer s = <jk>new</jk> RdfSerializerBuilder().xmlabbrev().looseCollections(<jk>true</jk>).build();<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * ReaderParser p = <jk>new</jk> RdfParserBuilder().xml().looseCollections(<jk>true</jk>).build();<a name="line.543"></a>
-<span class="sourceLineNo">544</span> *<a name="line.544"></a>
-<span class="sourceLineNo">545</span> * List&lt;MyBean&gt; l = createListOfMyBeans();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> *<a name="line.546"></a>
-<span class="sourceLineNo">547</span> * <jc>// Serialize to RDF/XML as loose resources</jc><a name="line.547"></a>
-<span class="sourceLineNo">548</span> * String rdfXml = s.serialize(l);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> *<a name="line.549"></a>
-<span class="sourceLineNo">550</span> * <jc>// Parse back into a Java collection</jc><a name="line.550"></a>
-<span class="sourceLineNo">551</span> * l = p.parse(rdfXml, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);<a name="line.551"></a>
-<span class="sourceLineNo">552</span> *<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * MyBean[] b = createArrayOfMyBeans();<a name="line.553"></a>
-<span class="sourceLineNo">554</span> *<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * <jc>// Serialize to RDF/XML as loose resources</jc><a name="line.555"></a>
-<span class="sourceLineNo">556</span> * String rdfXml = s.serialize(b);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> *<a name="line.557"></a>
-<span class="sourceLineNo">558</span> * <jc>// Parse back into a bean array</jc><a name="line.558"></a>
-<span class="sourceLineNo">559</span> * b = p.parse(rdfXml, MyBean[].<jk>class</jk>);<a name="line.559"></a>
-<span class="sourceLineNo">560</span> * </p><a name="line.560"></a>
-<span class="sourceLineNo">561</span> */<a name="line.561"></a>
-<span class="sourceLineNo">562</span> public static final String RDF_looseCollections = "Rdf.looseCollections";<a name="line.562"></a>
-<span class="sourceLineNo">563</span>}<a name="line.563"></a>
+<span class="sourceLineNo">030</span> final static Map<String,String> LANG_PROP_MAP = new AMap<String,String>()<a name="line.30"></a>
+<span class="sourceLineNo">031</span> .append("RDF/XML","rdfXml.")<a name="line.31"></a>
+<span class="sourceLineNo">032</span> .append("RDF/XML-ABBREV","rdfXml.")<a name="line.32"></a>
+<span class="sourceLineNo">033</span> .append("N3","n3.")<a name="line.33"></a>
+<span class="sourceLineNo">034</span> .append("N3-PP","n3.")<a name="line.34"></a>
+<span class="sourceLineNo">035</span> .append("N3-PLAIN","n3.")<a name="line.35"></a>
+<span class="sourceLineNo">036</span> .append("N3-TRIPLES","n3.")<a name="line.36"></a>
+<span class="sourceLineNo">037</span> .append("TURTLE","n3.")<a name="line.37"></a>
+<span class="sourceLineNo">038</span> .append("N-TRIPLE","ntriple.");<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span> /**<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <b>Configuration property:</b> RDF language.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <p><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <ul><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <li><b>Name:</b> <js>"Rdf.language"</js><a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <li><b>Data type:</b> <code>String</code><a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <li><b>Default:</b> <js>"RDF/XML-ABBREV"</js><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * </ul><a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <p><a name="line.48"></a>
+<span class="sourceLineNo">049</span> * Can be any of the following:<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * <ul class='spaced-list'><a name="line.50"></a>
+<span class="sourceLineNo">051</span> * <li><js>"RDF/XML"</js><a name="line.51"></a>
+<span class="sourceLineNo">052</span> * <li><js>"RDF/XML-ABBREV"</js><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * <li><js>"N-TRIPLE"</js><a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <li><js>"N3"</js> - General name for the N3 writer.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when created.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * Default is the pretty writer but can be overridden with system property <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <li><js>"N3-PP"</js> - Name of the N3 pretty writer.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding one-referenced bNodes.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <li><js>"N3-PLAIN"</js> - Name of the N3 plain writer.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * The plain writer writes records by subject.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <li><js>"N3-TRIPLES"</js> - Name of the N3 triples writer.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * This writer writes one line per statement, like N-Triples, but does N3-style prefixing.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * <li><js>"TURTLE"</js> - Turtle writer.<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * http://www.dajobe.org/2004/01/turtle/<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * </ul><a name="line.65"></a>
+<span class="sourceLineNo">066</span> */<a name="line.66"></a>
+<span class="sourceLineNo">067</span> public static final String RDF_language = "Rdf.language";<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> /**<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * <b>Configuration property:</b> XML namespace for Juneau properties.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * <p><a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <ul><a name="line.72"></a>
+<span class="sourceLineNo">073</span> * <li><b>Name:</b> <js>"Rdf.juneauNs"</js><a name="line.73"></a>
+<span class="sourceLineNo">074</span> * <li><b>Data type:</b> {@link Namespace}<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * <li><b>Default:</b> <code>{j:<js>'http://www.apache.org/juneau/'</js>}</code><a name="line.75"></a>
+<span class="sourceLineNo">076</span> * </ul><a name="line.76"></a>
+<span class="sourceLineNo">077</span> */<a name="line.77"></a>
+<span class="sourceLineNo">078</span> public static final String RDF_juneauNs = "Rdf.juneauNs";<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> /**<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * <b>Configuration property:</b> Default XML namespace for bean properties.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * <p><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * <ul><a name="line.83"></a>
+<span class="sourceLineNo">084</span> * <li><b>Name:</b> <js>"Rdf.juneauBpNs"</js><a name="line.84"></a>
+<span class="sourceLineNo">085</span> * <li><b>Data type:</b> {@link Namespace}<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * <li><b>Default:</b> <code>{j:<js>'http://www.apache.org/juneaubp/'</js>}</code><a name="line.86"></a>
+<span class="sourceLineNo">087</span> * </ul><a name="line.87"></a>
+<span class="sourceLineNo">088</span> */<a name="line.88"></a>
+<span class="sourceLineNo">089</span> public static final String RDF_juneauBpNs = "Rdf.juneauBpNs";<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span> /**<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <b>Configuration property:</b> Reuse XML namespaces when RDF namespaces not specified.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <p><a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <ul><a name="line.94"></a>
+<span class="sourceLineNo">095</span> * <li><b>Name:</b> <js>"Rdf.useXmlNamespaces"</js><a name="line.95"></a>
+<span class="sourceLineNo">096</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.96"></a>
+<span class="sourceLineNo">097</span> * <li><b>Default:</b> <jk>true</jk><a name="line.97"></a>
+<span class="sourceLineNo">098</span> * </ul><a name="line.98"></a>
+<span class="sourceLineNo">099</span> * <p><a name="line.99"></a>
+<span class="sourceLineNo">100</span> * When specified, namespaces defined using {@link XmlNs} and {@link Xml} will be inherited by the RDF serializers.<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * Otherwise, namespaces will be defined using {@link RdfNs} and {@link Rdf}.<a name="line.101"></a>
+<span class="sourceLineNo">102</span> */<a name="line.102"></a>
+<span class="sourceLineNo">103</span> public static final String RDF_useXmlNamespaces = "Rdf.useXmlNamespaces";<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> /**<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * <b>Configuration property:</b> RDF/XML property: <code>iri_rules</code>.<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * <p><a name="line.107"></a>
+<span class="sourceLineNo">108</span> * <ul><a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.iri-rules"</js><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * <li><b>Data type:</b> <code>String</code><a name="line.110"></a>
+<span class="sourceLineNo">111</span> * <li><b>Default:</b> <js>"lax"</js><a name="line.111"></a>
+<span class="sourceLineNo">112</span> * </ul><a name="line.112"></a>
+<span class="sourceLineNo">113</span> * <p><a name="line.113"></a>
+<span class="sourceLineNo">114</span> * Set the engine for checking and resolving.<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <p><a name="line.115"></a>
+<span class="sourceLineNo">116</span> * Possible values:<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <ul class='spaced-list'><a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <li><js>"lax"</js> - The rules for RDF URI references only, which does permit spaces although the use of spaces is not good practice.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * <li><js>"strict"</js> - Sets the IRI engine with rules for valid IRIs, XLink and RDF; it does not permit spaces in IRIs.<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * <li><js>"iri"</js> - Sets the IRI engine to IRI (<a class="doclink" href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986</a>, <a class="doclink" href="http://www.ietf.org/rfc/rfc3987.txt">RFC 3987</a>).<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * </ul><a name="line.121"></a>
+<span class="sourceLineNo">122</span> */<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public static final String RDF_arp_iriRules = "Rdf.jena.rdfXml.iri-rules";<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span> /**<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * <b>Configuration property:</b> RDF/XML ARP property: <code>error-mode</code>.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * <p><a name="line.127"></a>
+<span class="sourceLineNo">128</span> * <ul><a name="line.128"></a>
+<span class="sourceLineNo">129</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.error-mode"</js><a name="line.129"></a>
+<span class="sourceLineNo">130</span> * <li><b>Data type:</b> <code>String</code><a name="line.130"></a>
+<span class="sourceLineNo">131</span> * <li><b>Default:</b> <js>"lax"</js><a name="line.131"></a>
+<span class="sourceLineNo">132</span> * </ul><a name="line.132"></a>
+<span class="sourceLineNo">133</span> * <p><a name="line.133"></a>
+<span class="sourceLineNo">134</span> * This allows a coarse-grained approach to control of error handling.<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * <p><a name="line.135"></a>
+<span class="sourceLineNo">136</span> * Possible values:<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * <ul><a name="line.137"></a>
+<span class="sourceLineNo">138</span> * <li><js>"default"</js><a name="line.138"></a>
+<span class="sourceLineNo">139</span> * <li><js>"lax"</js><a name="line.139"></a>
+<span class="sourceLineNo">140</span> * <li><js>"strict"</js><a name="line.140"></a>
+<span class="sourceLineNo">141</span> * <li><js>"strict-ignore"</js><a name="line.141"></a>
+<span class="sourceLineNo">142</span> * <li><js>"strict-warning"</js><a name="line.142"></a>
+<span class="sourceLineNo">143</span> * <li><js>"strict-error"</js><a name="line.143"></a>
+<span class="sourceLineNo">144</span> * <li><js>"strict-fatal"</js><a name="line.144"></a>
+<span class="sourceLineNo">145</span> * </ul><a name="line.145"></a>
+<span class="sourceLineNo">146</span> * <p><a name="line.146"></a>
+<span class="sourceLineNo">147</span> * See also:<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <ul class='spaced-list'><a name="line.148"></a>
+<span class="sourceLineNo">149</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setDefaultErrorMode()">ARPOptions.setDefaultErrorMode()</a><a name="line.149"></a>
+<span class="sourceLineNo">150</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setLaxErrorMode()">ARPOptions.setLaxErrorMode()</a><a name="line.150"></a>
+<span class="sourceLineNo">151</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setStrictErrorMode()">ARPOptions.setStrictErrorMode()</a><a name="line.151"></a>
+<span class="sourceLineNo">152</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setStrictErrorMode(int)">ARPOptions.setStrictErrorMode(int)</a><a name="line.152"></a>
+<span class="sourceLineNo">153</span> * </ul><a name="line.153"></a>
+<span class="sourceLineNo">154</span> */<a name="line.154"></a>
+<span class="sourceLineNo">155</span> public static final String RDF_arp_errorMode = "Rdf.jena.rdfXml.error-mode";<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> * <b>Configuration property:</b> RDF/XML ARP property: <code>embedding</code>.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * <p><a name="line.159"></a>
+<span class="sourceLineNo">160</span> * <ul><a name="line.160"></a>
+<span class="sourceLineNo">161</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.embedding"</js><a name="line.161"></a>
+<span class="sourceLineNo">162</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.162"></a>
+<span class="sourceLineNo">163</span> * <li><b>Default:</b> <jk>false</jk><a name="line.163"></a>
+<span class="sourceLineNo">164</span> * </ul><a name="line.164"></a>
+<span class="sourceLineNo">165</span> * <p><a name="line.165"></a>
+<span class="sourceLineNo">166</span> * Sets ARP to look for RDF embedded within an enclosing XML document.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * <p><a name="line.167"></a>
+<span class="sourceLineNo">168</span> * See also:<a name="line.168"></a>
+<span class="sourceLineNo">169</span> * <ul class='spaced-list'><a name="line.169"></a>
+<span class="sourceLineNo">170</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setEmbedding(boolean)">ARPOptions.setEmbedding(boolean)</a><a name="line.170"></a>
+<span class="sourceLineNo">171</span> * </ul><a name="line.171"></a>
+<span class="sourceLineNo">172</span> */<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public static final String RDF_arp_embedding = "Rdf.jena.rdfXml.embedding";<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span> /**<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * <b>Configuration property:</b> RDF/XML ARP property: <code>ERR_xxx</code>.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * <p><a name="line.177"></a>
+<span class="sourceLineNo">178</span> * <ul><a name="line.178"></a>
+<span class="sourceLineNo">179</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.ERR_"</js><a name="line.179"></a>
+<span class="sourceLineNo">180</span> * <li><b>Data type:</b> <code>String</code><a name="line.180"></a>
+<span class="sourceLineNo">181</span> * </ul><a name="line.181"></a>
+<span class="sourceLineNo">182</span> * <p><a name="line.182"></a>
+<span class="sourceLineNo">183</span> * Provides fine-grained control over detected error conditions.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * <p><a name="line.184"></a>
+<span class="sourceLineNo">185</span> * Possible values:<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * <ul><a name="line.186"></a>
+<span class="sourceLineNo">187</span> * <li><js>"EM_IGNORE"</js><a name="line.187"></a>
+<span class="sourceLineNo">188</span> * <li><js>"EM_WARNING"</js><a name="line.188"></a>
+<span class="sourceLineNo">189</span> * <li><js>"EM_ERROR"</js><a name="line.189"></a>
+<span class="sourceLineNo">190</span> * <li><js>"EM_FATAL"</js><a name="line.190"></a>
+<span class="sourceLineNo">191</span> * </ul><a name="line.191"></a>
+<span class="sourceLineNo">192</span> * <p><a name="line.192"></a>
+<span class="sourceLineNo">193</span> * See also:<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * <ul class='spaced-list'><a name="line.194"></a>
+<span class="sourceLineNo">195</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html">ARPErrorNumbers</a><a name="line.195"></a>
+<span class="sourceLineNo">196</span> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setErrorMode(int,%20int)">ARPOptions.setErrorMode(int, int)</a><a name="line.196"></a>
+<span class="sourceLineNo">197</span> * </ul><a name="line.197"></a>
+<span class="sourceLineNo">198</span> */<a name="line.198"></a>
+<span class="sourceLineNo">199</span> public static final String RDF_arp_err_ = "Rdf.jena.rdfXml.ERR_";<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * <b>Configuration property:</b> RDF/XML ARP property: <code>WARN_xxx</code>.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * <p><a name="line.203"></a>
+<span class="sourceLineNo">204</span> * <ul><a name="line.204"></a>
+<span class="sourceLineNo">205</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.WARN_"</js><a name="line.205"></a>
+<span class="sourceLineNo">206</span> * <li><b>Data type:</b> <code>String</code><a name="line.206"></a>
+<span class="sourceLineNo">207</span> * </ul><a name="line.207"></a>
+<span class="sourceLineNo">208</span> * <p><a name="line.208"></a>
+<span class="sourceLineNo">209</span> * See {@link #RDF_arp_err_} for details.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> */<a name="line.210"></a>
+<span class="sourceLineNo">211</span> public static final String RDF_arp_warn_ = "Rdf.jena.rdfXml.WARN_";<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span> /**<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * RDF/XML ARP property: <code>IGN_xxx</code>.<a name="line.214"></a>
+<span class="sourceLineNo">215</span> * <p><a name="line.215"></a>
+<span class="sourceLineNo">216</span> * <ul><a name="line.216"></a>
+<span class="sourceLineNo">217</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.IGN_"</js><a name="line.217"></a>
+<span class="sourceLineNo">218</span> * <li><b>Data type:</b> <code>String</code><a name="line.218"></a>
+<span class="sourceLineNo">219</span> * </ul><a name="line.219"></a>
+<span class="sourceLineNo">220</span> * <p><a name="line.220"></a>
+<span class="sourceLineNo">221</span> * See {@link #RDF_arp_err_} for details.<a name="line.221"></a>
+<span class="sourceLineNo">222</span> */<a name="line.222"></a>
+<span class="sourceLineNo">223</span> public static final String RDF_arp_ign_ = "Rdf.jena.rdfXml.IGN_";<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span> /**<a name="line.225"></a>
+<span class="sourceLineNo">226</span> * <b>Configuration property:</b> RDF/XML property: <code>xmlbase</code>.<a name="line.226"></a>
+<span class="sourceLineNo">227</span> * <p><a name="line.227"></a>
+<span class="sourceLineNo">228</span> * <ul><a name="line.228"></a>
+<span class="sourceLineNo">229</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.xmlbase"</js><a name="line.229"></a>
+<span class="sourceLineNo">230</span> * <li><b>Data type:</b> <code>String</code><a name="line.230"></a>
+<span class="sourceLineNo">231</span> * <li><b>Default:</b> <jk>null</jk><a name="line.231"></a>
+<span class="sourceLineNo">232</span> * </ul><a name="line.232"></a>
+<span class="sourceLineNo">233</span> * <p><a name="line.233"></a>
+<span class="sourceLineNo">234</span> * The value to be included for an <xa>xml:base</xa> attribute on the root element in the file.<a name="line.234"></a>
+<span class="sourceLineNo">235</span> */<a name="line.235"></a>
+<span class="sourceLineNo">236</span> public static final String RDF_rdfxml_xmlBase = "Rdf.jena.rdfXml.xmlbase";<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> /**<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * <b>Configuration property:</b> RDF/XML property: <code>longId</code>.<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * <p><a name="line.240"></a>
+<span class="sourceLineNo">241</span> * <ul><a name="line.241"></a>
+<span class="sourceLineNo">242</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.longId"</js><a name="line.242"></a>
+<span class="sourceLineNo">243</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.243"></a>
+<span class="sourceLineNo">244</span> * <li><b>Default:</b> <jk>false</jk><a name="line.244"></a>
+<span class="sourceLineNo">245</span> * </ul><a name="line.245"></a>
+<span class="sourceLineNo">246</span> * <p><a name="line.246"></a>
+<span class="sourceLineNo">247</span> * Whether to use long ID's for anon resources.<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * Short ID's are easier to read, but can run out of memory on very large models.<a name="line.248"></a>
+<span class="sourceLineNo">249</span> */<a name="line.249"></a>
+<span class="sourceLineNo">250</span> public static final String RDF_rdfxml_longId = "Rdf.jena.rdfXml.longId";<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span> /**<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * <b>Configuration property:</b> RDF/XML property: <code>allowBadURIs</code>.<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * <p><a name="line.254"></a>
+<span class="sourceLineNo">255</span> * <ul><a name="line.255"></a>
+<span class="sourceLineNo">256</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.allowBadURIs"</js><a name="line.256"></a>
+<span class="sourceLineNo">257</span> * <li><b>Data type:</b> <code>Boolean</code><a name="line.257"></a>
+<span class="sourceLineNo">258</span> * <li><b>Default:</b> <jk>false</jk><a name="line.258"></a>
+<span class="sourceLineNo">259</span> * </ul><a name="line.259"></a>
+<span class="sourceLineNo">260</span> * <p><a name="line.260"></a>
+<span class="sourceLineNo">261</span> * URIs in the graph are, by default, checked prior to serialization.<a name="line.261"></a>
+<span class="sourceLineNo">262</span> */<a name="line.262"></a>
+<span class="sourceLineNo">263</span> public static final String RDF_rdfxml_allowBadUris = "Rdf.jena.rdfXml.allowBadURIs";<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span> /**<a name="line.265"></a>
+<span class="sourceLineNo">266</span> * <b>Configuration property:</b> RDF/XML property: <code>relativeURIs</code>.<a name="line.266"></a>
+<span class="sourceLineNo">267</span> * <p><a name="line.267"></a>
+<span class="sourceLineNo">268</span> * <ul><a name="line.268"></a>
+<span class="sourceLineNo">269</span> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.relativeURIs"</js><a name="line.269"></a>
+<span class="sourceLineNo">270</span> * <li><b>Data type:</b> <code>String</code><a name="line.270"></a>
+<span class="sourceLineNo">271</span> * <li><b>Default:</b> <js>"same-document, absolute, relative, parent"</js><a name="line.271"></a>
+<span class="sourceLineNo">272</span> * </ul><a name="line.272"></a>
+<span class="sourceLineNo">273</span> * <p><a name="line.273"></a>
+<span class="sourceLineNo">274</span> * What sort of relative URIs should be used.<a name="line.274"></a>
+<span class="sourceLineNo">275</span> * <p><a name="line.275"></a>
+<span class="sourceLineNo">276</span> * A comma separate list of options:<a name="line.276"></a>
+<span class="sourceLineNo">277</span> * <ul class='spaced-list'><a name="line.277"></a>
+<span class="sourceLineNo">278</span> * <li><js>"same-document"</js> - Same-document references (e.g. <js>""</js> or <js
<TRUNCATED>
[46/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/dto/swagger/Swagger.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/swagger/Swagger.html b/content/site/apidocs/org/apache/juneau/dto/swagger/Swagger.html
index 44f9d85..9709f61 100644
--- a/content/site/apidocs/org/apache/juneau/dto/swagger/Swagger.html
+++ b/content/site/apidocs/org/apache/juneau/dto/swagger/Swagger.html
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre><a href="../../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation">@Bean</a>(<a href="../../../../../org/apache/juneau/annotation/Bean.html#properties--">properties</a>="swagger,info,tags,externalDocs,basePath,schemes,consumes,produces,paths,definitions,parameters,responses,securityDefinitions,security")
-public class <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.27">Swagger</a>
+public class <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.28">Swagger</a>
extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.html" title="class in org.apache.juneau.dto.swagger">SwaggerElement</a></pre>
<div class="block">This is the root document object for the API specification.
<p>
@@ -589,7 +589,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockListLast">
<li class="blockList">
<h4>NULL</h4>
-<pre>public static final <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/dto/swagger/Swagger.html#line.30">NULL</a></pre>
+<pre>public static final <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/dto/swagger/Swagger.html#line.31">NULL</a></pre>
<div class="block">Represents a null swagger</div>
</li>
</ul>
@@ -607,7 +607,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockListLast">
<li class="blockList">
<h4>Swagger</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.27">Swagger</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.28">Swagger</a>()</pre>
</li>
</ul>
</li>
@@ -624,7 +624,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getSwagger</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/dto/swagger/Swagger.html#line.56">getSwagger</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.57">getSwagger</a>()</pre>
<div class="block">Bean property getter: <property>swagger</property>.
<p>
Required. Specifies the Swagger Specification version being used.
@@ -642,7 +642,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setSwagger</h4>
-<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/dto/swagger/Swagger.html#line.70">setSwagger</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> swagger)</pre>
+<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/dto/swagger/Swagger.html#line.71">setSwagger</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> swagger)</pre>
<div class="block">Bean property setter: <property>swagger</property>.
<p>
Required. Specifies the Swagger Specification version being used.
@@ -662,7 +662,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>swagger</h4>
-<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/dto/swagger/Swagger.html#line.81">swagger</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> swagger)</pre>
+<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/dto/swagger/Swagger.html#line.82">swagger</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> swagger)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#setSwagger-java.lang.String-"><code>setSwagger(String)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -678,7 +678,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getInfo</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/Info.html" title="class in org.apache.juneau.dto.swagger">Info</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.93">getInfo</a>()</pre>
+<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/Info.html" title="class in org.apache.juneau.dto.swagger">Info</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.94">getInfo</a>()</pre>
<div class="block">Bean property getter: <property>info</property>.
<p>
Required. Provides metadata about the API.
@@ -695,7 +695,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setInfo</h4>
-<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/dto/swagger/Swagger.html#line.106">setInfo</a>(<a href="../../../../../org/apache/juneau/dto/swagger/Info.html" title="class in org.apache.juneau.dto.swagger">Info</a> info)</pre>
+<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/dto/swagger/Swagger.html#line.107">setInfo</a>(<a href="../../../../../org/apache/juneau/dto/swagger/Info.html" title="class in org.apache.juneau.dto.swagger">Info</a> info)</pre>
<div class="block">Bean property setter: <property>info</property>.
<p>
Required. Provides metadata about the API.
@@ -714,7 +714,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>info</h4>
-<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/dto/swagger/Swagger.html#line.117">info</a>(<a href="../../../../../org/apache/juneau/dto/swagger/Info.html" title="class in org.apache.juneau.dto.swagger">Info</a> info)</pre>
+<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/dto/swagger/Swagger.html#line.118">info</a>(<a href="../../../../../org/apache/juneau/dto/swagger/Info.html" title="class in org.apache.juneau.dto.swagger">Info</a> info)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#setInfo-org.apache.juneau.dto.swagger.Info-"><code>setInfo(Info)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -730,7 +730,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getHost</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/dto/swagger/Swagger.html#line.132">getHost</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.133">getHost</a>()</pre>
<div class="block">Bean property getter: <property>host</property>.
<p>
The host (name or ip) serving the API.
@@ -750,7 +750,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setHost</h4>
-<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/dto/swagger/Swagger.html#line.148">setHost</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host)</pre>
+<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/dto/swagger/Swagger.html#line.149">setHost</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host)</pre>
<div class="block">Bean property setter: <property>host</property>.
<p>
The host (name or ip) serving the API.
@@ -772,7 +772,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>host</h4>
-<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/dto/swagger/Swagger.html#line.159">host</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host)</pre>
+<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/dto/swagger/Swagger.html#line.160">host</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#setHost-java.lang.String-"><code>setHost(String)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -788,7 +788,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getBasePath</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/dto/swagger/Swagger.html#line.173">getBasePath</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.174">getBasePath</a>()</pre>
<div class="block">Bean property getter: <property>basePath</property>.
<p>
The base path on which the API is served, which is relative to the <code>host</code>.
@@ -807,7 +807,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setBasePath</h4>
-<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/dto/swagger/Swagger.html#line.188">setBasePath</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> basePath)</pre>
+<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/dto/swagger/Swagger.html#line.189">setBasePath</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> basePath)</pre>
<div class="block">Bean property setter: <property>basePath</property>.
<p>
The base path on which the API is served, which is relative to the <code>host</code>.
@@ -828,7 +828,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>basePath</h4>
-<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/dto/swagger/Swagger.html#line.199">basePath</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> basePath)</pre>
+<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/dto/swagger/Swagger.html#line.200">basePath</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> basePath)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#setBasePath-java.lang.String-"><code>setBasePath(String)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -844,7 +844,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getSchemes</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="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/dto/swagger/Swagger.html#line.212">getSchemes</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="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/dto/swagger/Swagger.html#line.213">getSchemes</a>()</pre>
<div class="block">Bean property getter: <property>schemes</property>.
<p>
The transfer protocol of the API.
@@ -862,7 +862,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setSchemes</h4>
-<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/dto/swagger/Swagger.html#line.226">setSchemes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> schemes)</pre>
+<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/dto/swagger/Swagger.html#line.227">setSchemes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> schemes)</pre>
<div class="block">Bean property setter: <property>schemes</property>.
<p>
The transfer protocol of the API.
@@ -882,7 +882,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addSchemes</h4>
-<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/dto/swagger/Swagger.html#line.241">addSchemes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... schemes)</pre>
+<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/dto/swagger/Swagger.html#line.242">addSchemes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... schemes)</pre>
<div class="block">Bean property adder: <property>schemes</property>.
<p>
The transfer protocol of the API.
@@ -902,7 +902,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addSchemes</h4>
-<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/dto/swagger/Swagger.html#line.255">addSchemes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> schemes)</pre>
+<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/dto/swagger/Swagger.html#line.256">addSchemes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> schemes)</pre>
<div class="block">Bean property adder: <property>schemes</property>.
<p>
The transfer protocol of the API.
@@ -922,7 +922,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>schemes</h4>
-<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/dto/swagger/Swagger.html#line.270">schemes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... schemes)</pre>
+<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/dto/swagger/Swagger.html#line.271">schemes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... schemes)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#addSchemes-java.lang.String...-"><code>addSchemes(String...)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -938,7 +938,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getConsumes</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.283">getConsumes</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.284">getConsumes</a>()</pre>
<div class="block">Bean property getter: <property>consumes</property>.
<p>
A list of MIME types the APIs can consume.
@@ -956,7 +956,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setConsumes</h4>
-<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/dto/swagger/Swagger.html#line.297">setConsumes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> consumes)</pre>
+<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/dto/swagger/Swagger.html#line.298">setConsumes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> consumes)</pre>
<div class="block">Bean property setter: <property>consumes</property>.
<p>
A list of MIME types the APIs can consume.
@@ -976,7 +976,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addConsumes</h4>
-<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/dto/swagger/Swagger.html#line.312">addConsumes</a>(<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... consumes)</pre>
+<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/dto/swagger/Swagger.html#line.313">addConsumes</a>(<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... consumes)</pre>
<div class="block">Bean property adder: <property>consumes</property>.
<p>
A list of MIME types the APIs can consume.
@@ -996,7 +996,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addConsumes</h4>
-<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/dto/swagger/Swagger.html#line.326">addConsumes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> consumes)</pre>
+<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/dto/swagger/Swagger.html#line.327">addConsumes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> consumes)</pre>
<div class="block">Bean property adder: <property>consumes</property>.
<p>
A list of MIME types the APIs can consume.
@@ -1016,7 +1016,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>consumes</h4>
-<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/dto/swagger/Swagger.html#line.341">consumes</a>(<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... consumes)</pre>
+<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/dto/swagger/Swagger.html#line.342">consumes</a>(<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... consumes)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#addConsumes-org.apache.juneau.MediaType...-"><code>addConsumes(MediaType...)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1032,7 +1032,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>consumes</h4>
-<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/dto/swagger/Swagger.html#line.351">consumes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> consumes)</pre>
+<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/dto/swagger/Swagger.html#line.352">consumes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> consumes)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#addConsumes-java.util.Collection-"><code>addConsumes(Collection)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1048,7 +1048,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getProduces</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.364">getProduces</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.365">getProduces</a>()</pre>
<div class="block">Bean property getter: <property>produces</property>.
<p>
A list of MIME types the APIs can produce.
@@ -1066,7 +1066,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setProduces</h4>
-<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/dto/swagger/Swagger.html#line.378">setProduces</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> produces)</pre>
+<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/dto/swagger/Swagger.html#line.379">setProduces</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> produces)</pre>
<div class="block">Bean property setter: <property>produces</property>.
<p>
A list of MIME types the APIs can produce.
@@ -1086,7 +1086,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addProduces</h4>
-<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/dto/swagger/Swagger.html#line.393">addProduces</a>(<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... produces)</pre>
+<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/dto/swagger/Swagger.html#line.394">addProduces</a>(<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... produces)</pre>
<div class="block">Bean property adder: <property>produces</property>.
<p>
A list of MIME types the APIs can produce.
@@ -1106,7 +1106,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addProduces</h4>
-<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/dto/swagger/Swagger.html#line.407">addProduces</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> produces)</pre>
+<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/dto/swagger/Swagger.html#line.408">addProduces</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> produces)</pre>
<div class="block">Bean property adder: <property>produces</property>.
<p>
A list of MIME types the APIs can produce.
@@ -1126,7 +1126,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>produces</h4>
-<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/dto/swagger/Swagger.html#line.422">produces</a>(<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... produces)</pre>
+<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/dto/swagger/Swagger.html#line.423">produces</a>(<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>... produces)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#addProduces-org.apache.juneau.MediaType...-"><code>addProduces(MediaType...)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1142,7 +1142,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>produces</h4>
-<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/dto/swagger/Swagger.html#line.432">produces</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> produces)</pre>
+<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/dto/swagger/Swagger.html#line.433">produces</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a>> produces)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#addProduces-java.util.Collection-"><code>addProduces(Collection)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1158,7 +1158,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getPaths</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a>>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.443">getPaths</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a>>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.444">getPaths</a>()</pre>
<div class="block">Bean property getter: <property>paths</property>.
<p>
Required. The available paths and operations for the API.</div>
@@ -1174,7 +1174,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setPaths</h4>
-<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/dto/swagger/Swagger.html#line.455">setPaths</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a>>> paths)</pre>
+<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/dto/swagger/Swagger.html#line.456">setPaths</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a>>> paths)</pre>
<div class="block">Bean property setter: <property>paths</property>.
<p>
Required. The available paths and operations for the API.</div>
@@ -1192,7 +1192,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addPath</h4>
-<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/dto/swagger/Swagger.html#line.470">addPath</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
+<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/dto/swagger/Swagger.html#line.471">addPath</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> methodName,
<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a> operation)</pre>
<div class="block">Bean property adder: <property>paths</property>.
@@ -1214,7 +1214,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>path</h4>
-<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/dto/swagger/Swagger.html#line.490">path</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
+<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/dto/swagger/Swagger.html#line.491">path</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> methodName,
<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a> operation)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#path-java.lang.String-java.lang.String-org.apache.juneau.dto.swagger.Operation-"><code>path(String,String,Operation)</code></a>.</div>
@@ -1234,7 +1234,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getDefinitions</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/SchemaInfo.html" title="class in org.apache.juneau.dto.swagger">SchemaInfo</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.501">getDefinitions</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/SchemaInfo.html" title="class in org.apache.juneau.dto.swagger">SchemaInfo</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.502">getDefinitions</a>()</pre>
<div class="block">Bean property getter: <property>definitions</property>.
<p>
An object to hold data types produced and consumed by operations.</div>
@@ -1250,7 +1250,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setDefinitions</h4>
-<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/dto/swagger/Swagger.html#line.513">setDefinitions</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/SchemaInfo.html" title="class in org.apache.juneau.dto.swagger">SchemaInfo</a>> definitions)</pre>
+<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/dto/swagger/Swagger.html#line.514">setDefinitions</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/SchemaInfo.html" title="class in org.apache.juneau.dto.swagger">SchemaInfo</a>> definitions)</pre>
<div class="block">Bean property setter: <property>definitions</property>.
<p>
An object to hold data types produced and consumed by operations.</div>
@@ -1268,7 +1268,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addDefinition</h4>
-<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/dto/swagger/Swagger.html#line.527">addDefinition</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.528">addDefinition</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="../../../../../org/apache/juneau/dto/swagger/SchemaInfo.html" title="class in org.apache.juneau.dto.swagger">SchemaInfo</a> schema)</pre>
<div class="block">Bean property adder: <property>definitions</property>.
<p>
@@ -1288,7 +1288,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>xxx</h4>
-<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/dto/swagger/Swagger.html#line.541">xxx</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.542">xxx</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="../../../../../org/apache/juneau/dto/swagger/SchemaInfo.html" title="class in org.apache.juneau.dto.swagger">SchemaInfo</a> schema)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#addDefinition-java.lang.String-org.apache.juneau.dto.swagger.SchemaInfo-"><code>addDefinition(String,SchemaInfo)</code></a>.</div>
<dl>
@@ -1306,7 +1306,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getParameters</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger">ParameterInfo</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.553">getParameters</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger">ParameterInfo</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.554">getParameters</a>()</pre>
<div class="block">Bean property getter: <property>parameters</property>.
<p>
An object to hold parameters that can be used across operations.
@@ -1323,7 +1323,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setParameters</h4>
-<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/dto/swagger/Swagger.html#line.566">setParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger">ParameterInfo</a>> parameters)</pre>
+<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/dto/swagger/Swagger.html#line.567">setParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger">ParameterInfo</a>> parameters)</pre>
<div class="block">Bean property setter: <property>parameters</property>.
<p>
An object to hold parameters that can be used across operations.
@@ -1342,7 +1342,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addParameter</h4>
-<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/dto/swagger/Swagger.html#line.581">addParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.582">addParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="../../../../../org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger">ParameterInfo</a> parameter)</pre>
<div class="block">Bean property adder: <property>parameters</property>.
<p>
@@ -1363,7 +1363,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>parameter</h4>
-<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/dto/swagger/Swagger.html#line.595">parameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.596">parameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="../../../../../org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger">ParameterInfo</a> parameter)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#addParameter-java.lang.String-org.apache.juneau.dto.swagger.ParameterInfo-"><code>addParameter(String,ParameterInfo)</code></a>.</div>
<dl>
@@ -1381,7 +1381,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getResponses</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.607">getResponses</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.608">getResponses</a>()</pre>
<div class="block">Bean property getter: <property>responses</property>.
<p>
An object to hold responses that can be used across operations.
@@ -1398,7 +1398,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setResponses</h4>
-<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/dto/swagger/Swagger.html#line.620">setResponses</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>> responses)</pre>
+<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/dto/swagger/Swagger.html#line.621">setResponses</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>> responses)</pre>
<div class="block">Bean property setter: <property>responses</property>.
<p>
An object to hold responses that can be used across operations.
@@ -1417,7 +1417,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addResponse</h4>
-<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/dto/swagger/Swagger.html#line.635">addResponse</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.636">addResponse</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a> response)</pre>
<div class="block">Bean property adder: <property>responses</property>.
<p>
@@ -1438,7 +1438,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>response</h4>
-<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/dto/swagger/Swagger.html#line.649">response</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.650">response</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a> response)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#addResponse-java.lang.String-org.apache.juneau.dto.swagger.ResponseInfo-"><code>addResponse(String,ResponseInfo)</code></a>.</div>
<dl>
@@ -1456,7 +1456,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getSecurityDefinitions</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/SecurityScheme.html" title="class in org.apache.juneau.dto.swagger">SecurityScheme</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.660">getSecurityDefinitions</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/SecurityScheme.html" title="class in org.apache.juneau.dto.swagger">SecurityScheme</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.661">getSecurityDefinitions</a>()</pre>
<div class="block">Bean property getter: <property>securityDefinitions</property>.
<p>
Security scheme definitions that can be used across the specification.</div>
@@ -1472,7 +1472,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setSecurityDefinitions</h4>
-<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/dto/swagger/Swagger.html#line.672">setSecurityDefinitions</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/SecurityScheme.html" title="class in org.apache.juneau.dto.swagger">SecurityScheme</a>> securityDefinitions)</pre>
+<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/dto/swagger/Swagger.html#line.673">setSecurityDefinitions</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/SecurityScheme.html" title="class in org.apache.juneau.dto.swagger">SecurityScheme</a>> securityDefinitions)</pre>
<div class="block">Bean property setter: <property>securityDefinitions</property>.
<p>
Security scheme definitions that can be used across the specification.</div>
@@ -1490,7 +1490,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addSecurityDefinition</h4>
-<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/dto/swagger/Swagger.html#line.686">addSecurityDefinition</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.687">addSecurityDefinition</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="../../../../../org/apache/juneau/dto/swagger/SecurityScheme.html" title="class in org.apache.juneau.dto.swagger">SecurityScheme</a> securityScheme)</pre>
<div class="block">Bean property adder: <property>securityDefinitions</property>.
<p>
@@ -1510,7 +1510,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>securityDefinition</h4>
-<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/dto/swagger/Swagger.html#line.700">securityDefinition</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.701">securityDefinition</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="../../../../../org/apache/juneau/dto/swagger/SecurityScheme.html" title="class in org.apache.juneau.dto.swagger">SecurityScheme</a> securityScheme)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#addSecurityDefinition-java.lang.String-org.apache.juneau.dto.swagger.SecurityScheme-"><code>addSecurityDefinition(String,SecurityScheme)</code></a>.</div>
<dl>
@@ -1528,7 +1528,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getSecurity</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>>>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.713">getSecurity</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>>>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.714">getSecurity</a>()</pre>
<div class="block">Bean property getter: <property>security</property>.
<p>
A declaration of which security schemes are applied for the API as a whole.
@@ -1546,7 +1546,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setSecurity</h4>
-<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/dto/swagger/Swagger.html#line.727">setSecurity</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>>>> security)</pre>
+<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/dto/swagger/Swagger.html#line.728">setSecurity</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>>>> security)</pre>
<div class="block">Bean property setter: <property>security</property>.
<p>
A declaration of which security schemes are applied for the API as a whole.
@@ -1566,7 +1566,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addSecurity</h4>
-<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/dto/swagger/Swagger.html#line.742">addSecurity</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>>> security)</pre>
+<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/dto/swagger/Swagger.html#line.743">addSecurity</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>>> security)</pre>
<div class="block">Bean property adder: <property>security</property>.
<p>
A declaration of which security schemes are applied for the API as a whole.
@@ -1586,7 +1586,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>security</h4>
-<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/dto/swagger/Swagger.html#line.756">security</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> scheme,
+<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/dto/swagger/Swagger.html#line.757">security</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> scheme,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... alternatives)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#addSecurity-java.util.Map-"><code>addSecurity(Map)</code></a>.</div>
<dl>
@@ -1604,7 +1604,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getTags</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.773">getTags</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.774">getTags</a>()</pre>
<div class="block">Bean property getter: <property>tags</property>.
<p>
A list of tags used by the specification with additional metadata.
@@ -1624,7 +1624,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setTags</h4>
-<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/dto/swagger/Swagger.html#line.789">setTags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>> tags)</pre>
+<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/dto/swagger/Swagger.html#line.790">setTags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>> tags)</pre>
<div class="block">Bean property setter: <property>tags</property>.
<p>
A list of tags used by the specification with additional metadata.
@@ -1646,7 +1646,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>addTags</h4>
-<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/dto/swagger/Swagger.html#line.806">addTags</a>(<a href="../../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>... tags)</pre>
+<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/dto/swagger/Swagger.html#line.807">addTags</a>(<a href="../../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>... tags)</pre>
<div class="block">Bean property adder: <property>tags</property>.
<p>
A list of tags used by the specification with additional metadata.
@@ -1668,7 +1668,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>tags</h4>
-<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/dto/swagger/Swagger.html#line.819">tags</a>(<a href="../../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>... tags)</pre>
+<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/dto/swagger/Swagger.html#line.820">tags</a>(<a href="../../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>... tags)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#addTags-org.apache.juneau.dto.swagger.Tag...-"><code>addTags(Tag...)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1684,7 +1684,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>tags</h4>
-<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/dto/swagger/Swagger.html#line.829">tags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>> tags)</pre>
+<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/dto/swagger/Swagger.html#line.830">tags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>> tags)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#setTags-java.util.List-"><code>setTags(List)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1700,7 +1700,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>getExternalDocs</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger">ExternalDocumentation</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.840">getExternalDocs</a>()</pre>
+<pre>public <a href="../../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger">ExternalDocumentation</a> <a href="../../../../../src-html/org/apache/juneau/dto/swagger/Swagger.html#line.841">getExternalDocs</a>()</pre>
<div class="block">Bean property getter: <property>externalDocs</property>.
<p>
Additional external documentation.</div>
@@ -1716,7 +1716,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockList">
<li class="blockList">
<h4>setExternalDocs</h4>
-<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/dto/swagger/Swagger.html#line.852">setExternalDocs</a>(<a href="../../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger">ExternalDocumentation</a> externalDocs)</pre>
+<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/dto/swagger/Swagger.html#line.853">setExternalDocs</a>(<a href="../../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger">ExternalDocumentation</a> externalDocs)</pre>
<div class="block">Bean property setter: <property>externalDocs</property>.
<p>
Additional external documentation.</div>
@@ -1734,7 +1734,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
<ul class="blockListLast">
<li class="blockList">
<h4>externalDocs</h4>
-<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/dto/swagger/Swagger.html#line.863">externalDocs</a>(<a href="../../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger">ExternalDocumentation</a> externalDocs)</pre>
+<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/dto/swagger/Swagger.html#line.864">externalDocs</a>(<a href="../../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger">ExternalDocumentation</a> externalDocs)</pre>
<div class="block">Synonym for <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html#setExternalDocs-org.apache.juneau.dto.swagger.ExternalDocumentation-"><code>setExternalDocs(ExternalDocumentation)</code></a>.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
[40/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/parser/ParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/parser/ParserSession.html b/content/site/apidocs/org/apache/juneau/parser/ParserSession.html
index 9eec449..2a89f2c 100644
--- a/content/site/apidocs/org/apache/juneau/parser/ParserSession.html
+++ b/content/site/apidocs/org/apache/juneau/parser/ParserSession.html
@@ -272,7 +272,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--
">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetas-java.lang.reflect.Type:A-">getClassMetas</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau/BeanS
ession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../../../.
./org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanSession.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanSession.html#asMap--">asMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Object-org.apache.juneau.ClassMeta-">convertToType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getArgsClassMeta-java.lang.reflect.Type:A-">getArgsClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html
#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassLoader--">getClassLoader</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getLocale--">getLocale</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getMediaType--">getMediaType</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getStringBuilder--">getStringBuilder</a>, <a href="../../../../org/apache/juneau/BeanSession.html#getTimeZone--">getTimeZone</a>, <a href="../../../../org/apache/juneau
/BeanSession.html#isBean-java.lang.Class-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isDebug--">isDebug</a>, <a href="../../../../org/apache/juneau/BeanSession.html#isIgnoreUnknownBeanProperties--">isIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBean-java.lang.Object-java.lang.Class-">newBean</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#newBeanMap-java.lang.Object-java.lang.Class-">newBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanSession.html#returnStringBuilder-java.lang.StringBuilder-">returnStringBuilder</a>, <a href="../.
./../../org/apache/juneau/BeanSession.html#string--">string</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toArray-org.apache.juneau.ClassMeta-java.util.Collection-">toArray</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-">toBeanMap</a>, <a href="../../../../org/apache/juneau/BeanSession.html#toBeanMap-T-java.lang.Class-">toBeanMap</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Session">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/parser/ReaderParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/parser/ReaderParser.html b/content/site/apidocs/org/apache/juneau/parser/ReaderParser.html
index a4f5c57..ac021c4 100644
--- a/content/site/apidocs/org/apache/juneau/parser/ReaderParser.html
+++ b/content/site/apidocs/org/apache/juneau/parser/ReaderParser.html
@@ -205,7 +205,7 @@ extends <a href="../../../../org/apache/juneau/parser/Parser.html" title="class
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.ap
ache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/
Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.
apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParse-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">doParse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollect
ion-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.ju
neau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setPar
ent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/plaintext/PlainTextParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/plaintext/PlainTextParser.html b/content/site/apidocs/org/apache/juneau/plaintext/PlainTextParser.html
index bd0d34b..c4980ef 100644
--- a/content/site/apidocs/org/apache/juneau/plaintext/PlainTextParser.html
+++ b/content/site/apidocs/org/apache/juneau/plaintext/PlainTextParser.html
@@ -239,7 +239,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></h3>
-<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseArgs-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta:A-">doParseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lan
g.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parse
r/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-org.apache.juneau.ClassMeta:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a h
ref="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
+<code><a href="../../../../org/apache/juneau/parser/Parser.html#addListener-org.apache.juneau.parser.ParserListener-">addListener</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#convertAttrToType-org.apache.juneau.parser.ParserSession-java.lang.Object-java.lang.String-org.apache.juneau.ClassMeta-">convertAttrToType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.lang.Object-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoCollection-org.apache.juneau.parser.ParserSession-java.util.Collection-java.lang.reflect.Type-">doParseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#doParseIntoMap-org.apache.juneau.parser.ParserSession-ja
va.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getListeners--">getListeners</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#onUnknownProperty-org.apache.juneau.parser.ParserSession-java.lang.String-org.apache.juneau.BeanMap-int-int-">onUnknownProperty</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-org.apache.juneau.ClassMeta-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">parse</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#p
arseArgs-java.lang.Object-java.lang.reflect.Type:A-">parseArgs</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoCollection-java.lang.Object-java.util.Collection-java.lang.reflect.Type-">parseIntoCollection</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseIntoMap-java.lang.Object-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">parseIntoMap</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#parseSession-org.apache.juneau.parser.ParserSession-org.apache.juneau.ClassMeta-">parseSession</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setName-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setName</a>, <a href="../../../../org/apache/juneau/parser/Parser.html#setParent-org.apache.juneau.ClassMeta-java.lang.Object-java.lang.Object-">setParent</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/rest/ReaderResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/ReaderResource.html b/content/site/apidocs/org/apache/juneau/rest/ReaderResource.html
index 521eb61..41b6bd9 100644
--- a/content/site/apidocs/org/apache/juneau/rest/ReaderResource.html
+++ b/content/site/apidocs/org/apache/juneau/rest/ReaderResource.html
@@ -161,7 +161,7 @@ implements <a href="../../../../org/apache/juneau/Writable.html" title="interfac
<tr class="altColor">
<td class="colFirst"><code> </code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/ReaderResource.html#ReaderResource-org.apache.juneau.MediaType-java.util.Map-org.apache.juneau.svl.VarResolverSession-java.lang.Object...-">ReaderResource</a></span>(<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a> mediaType,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> headers,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> headers,
<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> varSession,
<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>... contents)</code>
<div class="block">Constructor.</div>
@@ -266,7 +266,7 @@ implements <a href="../../../../org/apache/juneau/Writable.html" title="interfac
<li class="blockList">
<h4>ReaderResource</h4>
<pre>public <a href="../../../../src-html/org/apache/juneau/rest/ReaderResource.html#line.70">ReaderResource</a>(<a href="../../../../org/apache/juneau/MediaType.html" title="class in org.apache.juneau">MediaType</a> mediaType,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> headers,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> headers,
<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> varSession,
<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>... contents)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
[06/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/rest/RestRequest.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestRequest.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestRequest.html
index 2a06b2e..2371679 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestRequest.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestRequest.html
@@ -97,1931 +97,1985 @@
<span class="sourceLineNo">089</span> private ObjectMap headers;<a name="line.89"></a>
<span class="sourceLineNo">090</span> private ConfigFile cf;<a name="line.90"></a>
<span class="sourceLineNo">091</span> private Swagger swagger, fileSwagger;<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> * Constructor.<a name="line.94"></a>
-<span class="sourceLineNo">095</span> */<a name="line.95"></a>
-<span class="sourceLineNo">096</span> RestRequest(RestContext context, HttpServletRequest req) throws ServletException {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> super(req);<a name="line.97"></a>
-<span class="sourceLineNo">098</span> this.context = context;<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span> try {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> isPost = req.getMethod().equalsIgnoreCase("POST");<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> // If this is a POST, we want to parse the query parameters ourselves to prevent<a name="line.103"></a>
-<span class="sourceLineNo">104</span> // the servlet code from processing the HTTP body as URL-Encoded parameters.<a name="line.104"></a>
-<span class="sourceLineNo">105</span> if (isPost)<a name="line.105"></a>
-<span class="sourceLineNo">106</span> queryParams = context.getUrlEncodingParser().parseIntoSimpleMap(getQueryString());<a name="line.106"></a>
-<span class="sourceLineNo">107</span> else {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> queryParams = req.getParameterMap();<a name="line.108"></a>
-<span class="sourceLineNo">109</span> }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> // Get the HTTP method.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> // Can be overridden through a "method" GET attribute.<a name="line.112"></a>
-<span class="sourceLineNo">113</span> String _method = super.getMethod();<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span> String m = getQueryParameter("method");<a name="line.115"></a>
-<span class="sourceLineNo">116</span> if (context.allowMethodParam(m))<a name="line.116"></a>
-<span class="sourceLineNo">117</span> _method = m;<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> method = _method;<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> if (context.isAllowBodyParam()) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> String b = getQueryParameter("body");<a name="line.122"></a>
-<span class="sourceLineNo">123</span> if (b != null) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> setHeader("Content-Type", UonSerializer.DEFAULT.getResponseContentType());<a name="line.124"></a>
-<span class="sourceLineNo">125</span> this.body = b.getBytes(IOUtils.UTF8);<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><a name="line.128"></a>
-<span class="sourceLineNo">129</span> defaultServletHeaders = context.getDefaultRequestHeaders();<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> debug = "true".equals(getQueryParameter("debug", "false")) || "true".equals(getHeader("Debug", "false"));<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> } catch (RestException e) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> throw e;<a name="line.134"></a>
-<span class="sourceLineNo">135</span> } catch (Exception e) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> throw new ServletException(e);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> }<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> /*<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> */<a name="line.142"></a>
-<span class="sourceLineNo">143</span> @SuppressWarnings("hiding")<a name="line.143"></a>
-<span class="sourceLineNo">144</span> final void init(Method javaMethod, String pathRemainder, ObjectMap properties, Map<String,String> mDefaultRequestHeaders, String defaultCharset, SerializerGroup mSerializers, ParserGroup mParsers, UrlEncodingParser mUrlEncodingParser, EncoderGroup encoders) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> this.javaMethod = javaMethod;<a name="line.145"></a>
-<span class="sourceLineNo">146</span> this.pathRemainder = pathRemainder;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> this.properties = properties;<a name="line.147"></a>
-<span class="sourceLineNo">148</span> this.defaultMethodHeaders = mDefaultRequestHeaders;<a name="line.148"></a>
-<span class="sourceLineNo">149</span> this.serializerGroup = mSerializers;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> this.parserGroup = mParsers;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> this.urlEncodingParser = mUrlEncodingParser;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> this.beanSession = urlEncodingParser.getBeanContext().createSession();<a name="line.152"></a>
-<span class="sourceLineNo">153</span> this.defaultCharset = defaultCharset;<a name="line.153"></a>
-<span class="sourceLineNo">154</span> this.encoders = encoders;<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> if (debug) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> String msg = ""<a name="line.157"></a>
-<span class="sourceLineNo">158</span> + "\n=== HTTP Request (incoming) ===================================================="<a name="line.158"></a>
-<span class="sourceLineNo">159</span> + toString()<a name="line.159"></a>
-<span class="sourceLineNo">160</span> + "\n=== END ========================================================================";<a name="line.160"></a>
-<span class="sourceLineNo">161</span> context.getLogger().log(Level.WARNING, msg);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span> /**<a name="line.165"></a>
-<span class="sourceLineNo">166</span> * Returns a string of the form <js>"HTTP method-name full-url"</js><a name="line.166"></a>
-<span class="sourceLineNo">167</span> *<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * @return A description of the request.<a name="line.168"></a>
-<span class="sourceLineNo">169</span> */<a name="line.169"></a>
-<span class="sourceLineNo">170</span> public String getDescription() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> String qs = getQueryString();<a name="line.171"></a>
-<span class="sourceLineNo">172</span> return "HTTP " + getMethod() + " " + getRequestURI() + (qs == null ? "" : "?" + qs);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> //--------------------------------------------------------------------------------<a name="line.176"></a>
-<span class="sourceLineNo">177</span> // Properties<a name="line.177"></a>
-<span class="sourceLineNo">178</span> //--------------------------------------------------------------------------------<a name="line.178"></a>
+<span class="sourceLineNo">092</span> private String pageTitle, pageText, pageLinks;<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> * Constructor.<a name="line.95"></a>
+<span class="sourceLineNo">096</span> */<a name="line.96"></a>
+<span class="sourceLineNo">097</span> RestRequest(RestContext context, HttpServletRequest req) throws ServletException {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> super(req);<a name="line.98"></a>
+<span class="sourceLineNo">099</span> this.context = context;<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span> try {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> isPost = req.getMethod().equalsIgnoreCase("POST");<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span> // If this is a POST, we want to parse the query parameters ourselves to prevent<a name="line.104"></a>
+<span class="sourceLineNo">105</span> // the servlet code from processing the HTTP body as URL-Encoded parameters.<a name="line.105"></a>
+<span class="sourceLineNo">106</span> if (isPost)<a name="line.106"></a>
+<span class="sourceLineNo">107</span> queryParams = context.getUrlEncodingParser().parseIntoSimpleMap(getQueryString());<a name="line.107"></a>
+<span class="sourceLineNo">108</span> else {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> queryParams = req.getParameterMap();<a name="line.109"></a>
+<span class="sourceLineNo">110</span> }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> // Get the HTTP method.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> // Can be overridden through a "method" GET attribute.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> String _method = super.getMethod();<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> String m = getQueryParameter("method");<a name="line.116"></a>
+<span class="sourceLineNo">117</span> if (context.allowMethodParam(m))<a name="line.117"></a>
+<span class="sourceLineNo">118</span> _method = m;<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> method = _method;<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> if (context.isAllowBodyParam()) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> String b = getQueryParameter("body");<a name="line.123"></a>
+<span class="sourceLineNo">124</span> if (b != null) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> setHeader("Content-Type", UonSerializer.DEFAULT.getResponseContentType());<a name="line.125"></a>
+<span class="sourceLineNo">126</span> this.body = b.getBytes(IOUtils.UTF8);<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><a name="line.129"></a>
+<span class="sourceLineNo">130</span> defaultServletHeaders = context.getDefaultRequestHeaders();<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> debug = "true".equals(getQueryParameter("debug", "false")) || "true".equals(getHeader("Debug", "false"));<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> } catch (RestException e) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> throw e;<a name="line.135"></a>
+<span class="sourceLineNo">136</span> } catch (Exception e) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> throw new ServletException(e);<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><a name="line.140"></a>
+<span class="sourceLineNo">141</span> /*<a name="line.141"></a>
+<span class="sourceLineNo">142</span> * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.142"></a>
+<span class="sourceLineNo">143</span> */<a name="line.143"></a>
+<span class="sourceLineNo">144</span> @SuppressWarnings("hiding")<a name="line.144"></a>
+<span class="sourceLineNo">145</span> final void init(Method javaMethod, String pathRemainder, ObjectMap properties, Map<String,String> mDefaultRequestHeaders, String defaultCharset, SerializerGroup mSerializers, ParserGroup mParsers, UrlEncodingParser mUrlEncodingParser, EncoderGroup encoders, String pageTitle, String pageText, String pageLinks) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> this.javaMethod = javaMethod;<a name="line.146"></a>
+<span class="sourceLineNo">147</span> this.pathRemainder = pathRemainder;<a name="line.147"></a>
+<span class="sourceLineNo">148</span> this.properties = properties;<a name="line.148"></a>
+<span class="sourceLineNo">149</span> this.defaultMethodHeaders = mDefaultRequestHeaders;<a name="line.149"></a>
+<span class="sourceLineNo">150</span> this.serializerGroup = mSerializers;<a name="line.150"></a>
+<span class="sourceLineNo">151</span> this.parserGroup = mParsers;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> this.urlEncodingParser = mUrlEncodingParser;<a name="line.152"></a>
+<span class="sourceLineNo">153</span> this.beanSession = urlEncodingParser.getBeanContext().createSession();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> this.defaultCharset = defaultCharset;<a name="line.154"></a>
+<span class="sourceLineNo">155</span> this.encoders = encoders;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> this.pageTitle = pageTitle;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> this.pageText = pageText;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> this.pageLinks = pageLinks;<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span> if (debug) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> String msg = ""<a name="line.161"></a>
+<span class="sourceLineNo">162</span> + "\n=== HTTP Request (incoming) ===================================================="<a name="line.162"></a>
+<span class="sourceLineNo">163</span> + toString()<a name="line.163"></a>
+<span class="sourceLineNo">164</span> + "\n=== END ========================================================================";<a name="line.164"></a>
+<span class="sourceLineNo">165</span> context.getLogger().log(Level.WARNING, msg);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> }<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> /**<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * Returns a string of the form <js>"HTTP method-name full-url"</js><a name="line.170"></a>
+<span class="sourceLineNo">171</span> *<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * @return A description of the request.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> */<a name="line.173"></a>
+<span class="sourceLineNo">174</span> public String getDescription() {<a name="line.174"></a>
+<span class="sourceLineNo">175</span> String qs = getQueryString();<a name="line.175"></a>
+<span class="sourceLineNo">176</span> return "HTTP " + getMethod() + " " + getRequestURI() + (qs == null ? "" : "?" + qs);<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> /**<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * Servlet calls this method to initialize the properties.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> */<a name="line.182"></a>
-<span class="sourceLineNo">183</span> RestRequest setProperties(ObjectMap properties) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> this.properties = properties;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> return this;<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Retrieve the properties active for this request.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * <p><a name="line.190"></a>
-<span class="sourceLineNo">191</span> * These properties can be modified by the request.<a name="line.191"></a>
-<span class="sourceLineNo">192</span> *<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * @return The properties active for this request.<a name="line.193"></a>
-<span class="sourceLineNo">194</span> */<a name="line.194"></a>
-<span class="sourceLineNo">195</span> public ObjectMap getProperties() {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> return this.properties;<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> //--------------------------------------------------------------------------------<a name="line.200"></a>
-<span class="sourceLineNo">201</span> // Headers<a name="line.201"></a>
-<span class="sourceLineNo">202</span> //--------------------------------------------------------------------------------<a name="line.202"></a>
+<span class="sourceLineNo">180</span> //--------------------------------------------------------------------------------<a name="line.180"></a>
+<span class="sourceLineNo">181</span> // Properties<a name="line.181"></a>
+<span class="sourceLineNo">182</span> //--------------------------------------------------------------------------------<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> /**<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * Servlet calls this method to initialize the properties.<a name="line.185"></a>
+<span class="sourceLineNo">186</span> */<a name="line.186"></a>
+<span class="sourceLineNo">187</span> RestRequest setProperties(ObjectMap properties) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> this.properties = properties;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> return this;<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * Retrieve the properties active for this request.<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * <p><a name="line.194"></a>
+<span class="sourceLineNo">195</span> * These properties can be modified by the request.<a name="line.195"></a>
+<span class="sourceLineNo">196</span> *<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * @return The properties active for this request.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> */<a name="line.198"></a>
+<span class="sourceLineNo">199</span> public ObjectMap getProperties() {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> return this.properties;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> /**<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * Sets a request header value.<a name="line.205"></a>
-<span class="sourceLineNo">206</span> *<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * @param name The header name.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * @param value The header value.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> */<a name="line.209"></a>
-<span class="sourceLineNo">210</span> public void setHeader(String name, Object value) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> if (overriddenHeaders == null)<a name="line.211"></a>
-<span class="sourceLineNo">212</span> overriddenHeaders = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> overriddenHeaders.put(name, StringUtils.toString(value));<a name="line.213"></a>
-<span class="sourceLineNo">214</span> }<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> /**<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * Returns the specified header value, or <jk>null</jk> if the header doesn't exist.<a name="line.218"></a>
-<span class="sourceLineNo">219</span> * <p><a name="line.219"></a>
-<span class="sourceLineNo">220</span> * If {@code allowHeaderParams} init parameter is <jk>true</jk>, then first looks for {@code &HeaderName=x} in the URL query string.<a name="line.220"></a>
-<span class="sourceLineNo">221</span> */<a name="line.221"></a>
-<span class="sourceLineNo">222</span> @Override /* ServletRequest */<a name="line.222"></a>
-<span class="sourceLineNo">223</span> public String getHeader(String name) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> return getHeader(name, (String)null);<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> /**<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * Returns the specified header value, or a default value if the header doesn't exist.<a name="line.228"></a>
-<span class="sourceLineNo">229</span> * <p><a name="line.229"></a>
-<span class="sourceLineNo">230</span> * If {@code allowHeaderParams} init parameter is <jk>true</jk>, then first looks for {@code &HeaderName=x} in the URL query string.<a name="line.230"></a>
-<span class="sourceLineNo">231</span> *<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * @param name The HTTP header name.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * @param def The default value to return if the header value isn't found.<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * @return The header value, or the default value if the header isn't present.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> */<a name="line.235"></a>
-<span class="sourceLineNo">236</span> public String getHeader(String name, String def) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> String h = getOverriddenHeader(name);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (h != null)<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return h;<a name="line.239"></a>
-<span class="sourceLineNo">240</span> h = super.getHeader(name);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> if (h != null && ! h.isEmpty())<a name="line.241"></a>
-<span class="sourceLineNo">242</span> return h;<a name="line.242"></a>
-<span class="sourceLineNo">243</span> if (defaultMethodHeaders != null) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> h = defaultMethodHeaders.get(name);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> if (h != null)<a name="line.245"></a>
-<span class="sourceLineNo">246</span> return h;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> h = defaultServletHeaders.get(name);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> if (h != null)<a name="line.249"></a>
-<span class="sourceLineNo">250</span> return h;<a name="line.250"></a>
-<span class="sourceLineNo">251</span> return def;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> }<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span> /**<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * Returns the specified header value converted to a POJO.<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * <p><a name="line.256"></a>
-<span class="sourceLineNo">257</span> * The type can be any POJO type convertable from a <code>String</code><a name="line.257"></a>
-<span class="sourceLineNo">258</span> * (See <a class="doclink" href="package-summary.html#PojosConvertableFromString">POJOs Convertable From Strings</a>).<a name="line.258"></a>
-<span class="sourceLineNo">259</span> * <p><a name="line.259"></a>
-<span class="sourceLineNo">260</span> * <h5 class='section'>Examples:</h5><a name="line.260"></a>
-<span class="sourceLineNo">261</span> * <p class='bcode'><a name="line.261"></a>
-<span class="sourceLineNo">262</span> * <jc>// Parse into an integer.</jc><a name="line.262"></a>
-<span class="sourceLineNo">263</span> * <jk>int</jk> myheader = req.getHeader(<js>"My-Header"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> *<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * <jc>// Parse a UUID.</jc><a name="line.265"></a>
-<span class="sourceLineNo">266</span> * UUID myheader = req.getHeader(<js>"My-Header"</js>, UUID.<jk>class</jk>);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * </p><a name="line.267"></a>
+<span class="sourceLineNo">204</span> //--------------------------------------------------------------------------------<a name="line.204"></a>
+<span class="sourceLineNo">205</span> // Headers<a name="line.205"></a>
+<span class="sourceLineNo">206</span> //--------------------------------------------------------------------------------<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> /**<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * Sets a request header value.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> *<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * @param name The header name.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * @param value The header value.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> */<a name="line.213"></a>
+<span class="sourceLineNo">214</span> public void setHeader(String name, Object value) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> if (overriddenHeaders == null)<a name="line.215"></a>
+<span class="sourceLineNo">216</span> overriddenHeaders = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> overriddenHeaders.put(name, StringUtils.toString(value));<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span> /**<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * Returns the specified header value, or <jk>null</jk> if the header doesn't exist.<a name="line.222"></a>
+<span class="sourceLineNo">223</span> * <p><a name="line.223"></a>
+<span class="sourceLineNo">224</span> * If {@code allowHeaderParams} init parameter is <jk>true</jk>, then first looks for {@code &HeaderName=x} in the URL query string.<a name="line.224"></a>
+<span class="sourceLineNo">225</span> */<a name="line.225"></a>
+<span class="sourceLineNo">226</span> @Override /* ServletRequest */<a name="line.226"></a>
+<span class="sourceLineNo">227</span> public String getHeader(String name) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> return getHeader(name, (String)null);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span> /**<a name="line.231"></a>
+<span class="sourceLineNo">232</span> * Returns the specified header value, or a default value if the header doesn't exist.<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * <p><a name="line.233"></a>
+<span class="sourceLineNo">234</span> * If {@code allowHeaderParams} init parameter is <jk>true</jk>, then first looks for {@code &HeaderName=x} in the URL query string.<a name="line.234"></a>
+<span class="sourceLineNo">235</span> *<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * @param name The HTTP header name.<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * @param def The default value to return if the header value isn't found.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * @return The header value, or the default value if the header isn't present.<a name="line.238"></a>
+<span class="sourceLineNo">239</span> */<a name="line.239"></a>
+<span class="sourceLineNo">240</span> public String getHeader(String name, String def) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> String h = getOverriddenHeader(name);<a name="line.241"></a>
+<span class="sourceLineNo">242</span> if (h != null)<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return h;<a name="line.243"></a>
+<span class="sourceLineNo">244</span> h = super.getHeader(name);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> if (h != null && ! h.isEmpty())<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return h;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> if (defaultMethodHeaders != null) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> h = defaultMethodHeaders.get(name);<a name="line.248"></a>
+<span class="sourceLineNo">249</span> if (h != null)<a name="line.249"></a>
+<span class="sourceLineNo">250</span> return h;<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span> h = defaultServletHeaders.get(name);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (h != null)<a name="line.253"></a>
+<span class="sourceLineNo">254</span> return h;<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return def;<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> /**<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * Returns the specified header value converted to a POJO.<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * <p><a name="line.260"></a>
+<span class="sourceLineNo">261</span> * The type can be any POJO type convertable from a <code>String</code><a name="line.261"></a>
+<span class="sourceLineNo">262</span> * (See <a class="doclink" href="package-summary.html#PojosConvertableFromString">POJOs Convertable From Strings</a>).<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * <p><a name="line.263"></a>
+<span class="sourceLineNo">264</span> * <h5 class='section'>Examples:</h5><a name="line.264"></a>
+<span class="sourceLineNo">265</span> * <p class='bcode'><a name="line.265"></a>
+<span class="sourceLineNo">266</span> * <jc>// Parse into an integer.</jc><a name="line.266"></a>
+<span class="sourceLineNo">267</span> * <jk>int</jk> myheader = req.getHeader(<js>"My-Header"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.267"></a>
<span class="sourceLineNo">268</span> *<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * @param name The HTTP header name.<a name="line.269"></a>
-<span class="sourceLineNo">270</span> * @param type The class type to convert the header value to.<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * @param <T> The class type to convert the header value to.<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * @return The parameter value converted to the specified class type.<a name="line.272"></a>
-<span class="sourceLineNo">273</span> */<a name="line.273"></a>
-<span class="sourceLineNo">274</span> public <T> T getHeader(String name, Class<T> type) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> String h = getHeader(name);<a name="line.275"></a>
-<span class="sourceLineNo">276</span> return beanSession.convertToType(h, type);<a name="line.276"></a>
-<span class="sourceLineNo">277</span> }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> /**<a name="line.279"></a>
-<span class="sourceLineNo">280</span> * Same as {@link #getHeader(String, Class)} but returns a default value if not found.<a name="line.280"></a>
-<span class="sourceLineNo">281</span> *<a name="line.281"></a>
-<span class="sourceLineNo">282</span> * @param name The HTTP header name.<a name="line.282"></a>
-<span class="sourceLineNo">283</span> * @param def The default value if the header was not specified or is <jk>null</jk>.<a name="line.283"></a>
-<span class="sourceLineNo">284</span> * @param type The class type to convert the header value to.<a name="line.284"></a>
-<span class="sourceLineNo">285</span> * @param <T> The class type to convert the header value to.<a name="line.285"></a>
-<span class="sourceLineNo">286</span> * @return The parameter value converted to the specified class type.<a name="line.286"></a>
-<span class="sourceLineNo">287</span> */<a name="line.287"></a>
-<span class="sourceLineNo">288</span> public <T> T getHeader(String name, T def, Class<T> type) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> String h = getHeader(name);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> if (h == null)<a name="line.290"></a>
-<span class="sourceLineNo">291</span> return def;<a name="line.291"></a>
-<span class="sourceLineNo">292</span> return beanSession.convertToType(h, type);<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> /**<a name="line.295"></a>
-<span class="sourceLineNo">296</span> * Returns the specified header value converted to a POJO.<a name="line.296"></a>
-<span class="sourceLineNo">297</span> * <p><a name="line.297"></a>
-<span class="sourceLineNo">298</span> * The type can be any POJO type convertable from a <code>String</code><a name="line.298"></a>
-<span class="sourceLineNo">299</span> * (See <a class="doclink" href="package-summary.html#PojosConvertableFromString">POJOs Convertable From Strings</a>).<a name="line.299"></a>
-<span class="sourceLineNo">300</span> * <p><a name="line.300"></a>
-<span class="sourceLineNo">301</span> * <h5 class='section'>Examples:</h5><a name="line.301"></a>
-<span class="sourceLineNo">302</span> * <p class='bcode'><a name="line.302"></a>
-<span class="sourceLineNo">303</span> * <jc>// Parse into a linked-list of strings.</jc><a name="line.303"></a>
-<span class="sourceLineNo">304</span> * List&lt;String&gt; myheader = req.getHeader(<js>"My-Header"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.304"></a>
-<span class="sourceLineNo">305</span> * </p><a name="line.305"></a>
-<span class="sourceLineNo">306</span> *<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * @param name The HTTP header name.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * @param type The type of object to create.<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * <br>Ignored if the main type is not a map or collection.<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * @param <T> The class type to convert the header value to.<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * @return The parameter value converted to the specified class type.<a name="line.314"></a>
-<span class="sourceLineNo">315</span> */<a name="line.315"></a>
-<span class="sourceLineNo">316</span> public <T> T getHeader(String name, Type type, Type...args) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> String h = getHeader(name);<a name="line.317"></a>
-<span class="sourceLineNo">318</span> return (T)beanSession.convertToType(null, h, beanSession.getClassMeta(type, args));<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span> /**<a name="line.321"></a>
-<span class="sourceLineNo">322</span> * Returns all the request headers as an {@link ObjectMap}.<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * <p><a name="line.323"></a>
-<span class="sourceLineNo">324</span> * Altering entries in this map does not alter headers in the underlying request.<a name="line.324"></a>
-<span class="sourceLineNo">325</span> *<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * @return The request headers. Never <jk>null</jk>.<a name="line.326"></a>
-<span class="sourceLineNo">327</span> */<a name="line.327"></a>
-<span class="sourceLineNo">328</span> public ObjectMap getHeaders() {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> if (headers == null) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> headers = new ObjectMap();<a name="line.330"></a>
-<span class="sourceLineNo">331</span> for (Enumeration<String> e = getHeaderNames(); e.hasMoreElements();) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> String key = e.nextElement();<a name="line.332"></a>
-<span class="sourceLineNo">333</span> headers.put(key, getHeader(key));<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span> return headers;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> @Override /* ServletRequest */<a name="line.339"></a>
-<span class="sourceLineNo">340</span> public Enumeration<String> getHeaders(String name) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> String h = getOverriddenHeader(name);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> if (h != null)<a name="line.342"></a>
-<span class="sourceLineNo">343</span> return enumeration(singleton(h));<a name="line.343"></a>
-<span class="sourceLineNo">344</span> return super.getHeaders(name);<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> /**<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * Returns the <code>Content-Type</code> header value on the request, stripped<a name="line.348"></a>
-<span class="sourceLineNo">349</span> * of any parameters such as <js>";charset=X"</js>.<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * <p><a name="line.350"></a>
-<span class="sourceLineNo">351</span> * Example: <js>"text/json"</js>.<a name="line.351"></a>
-<span class="sourceLineNo">352</span> * <p><a name="line.352"></a>
-<span class="sourceLineNo">353</span> * If the content type is not specified, and the content is specified via a<a name="line.353"></a>
-<span class="sourceLineNo">354</span> * <code>&amp;body</code> query parameter, the content type is assumed to be<a name="line.354"></a>
-<span class="sourceLineNo">355</span> * <js>"text/uon"</js>. Otherwise, the content type is assumed to be <js>"text/json"</js>.<a name="line.355"></a>
-<span class="sourceLineNo">356</span> *<a name="line.356"></a>
-<span class="sourceLineNo">357</span> * @return The <code>Content-Type</code> media-type header value on the request.<a name="line.357"></a>
-<span class="sourceLineNo">358</span> */<a name="line.358"></a>
-<span class="sourceLineNo">359</span> public MediaType getMediaType() {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> String cm = getHeader("Content-Type");<a name="line.360"></a>
-<span class="sourceLineNo">361</span> if (cm == null) {<a name="line.361"></a>
-<span class="sourceLineNo">362</span> if (body != null)<a name="line.362"></a>
-<span class="sourceLineNo">363</span> return MediaType.UON;<a name="line.363"></a>
-<span class="sourceLineNo">364</span> return MediaType.JSON;<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span> return MediaType.forString(cm);<a name="line.366"></a>
-<span class="sourceLineNo">367</span> }<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span> /**<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * Returns the <code>Time-Zone</code> header value on the request if there is one.<a name="line.370"></a>
-<span class="sourceLineNo">371</span> * <p><a name="line.371"></a>
-<span class="sourceLineNo">372</span> * Example: <js>"GMT"</js>.<a name="line.372"></a>
-<span class="sourceLineNo">373</span> *<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * @return The <code>Time-Zone</code> header value on the request, or <jk>null</jk> if not present.<a name="line.374"></a>
-<span class="sourceLineNo">375</span> */<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public TimeZone getTimeZone() {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> String tz = getHeader("Time-Zone");<a name="line.377"></a>
-<span class="sourceLineNo">378</span> if (tz != null)<a name="line.378"></a>
-<span class="sourceLineNo">379</span> return TimeZone.getTimeZone(tz);<a name="line.379"></a>
-<span class="sourceLineNo">380</span> return null;<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> /**<a name="line.383"></a>
-<span class="sourceLineNo">384</span> * Returns the media types that are valid for <code>Content-Type</code> headers on the request.<a name="line.384"></a>
-<span class="sourceLineNo">385</span> *<a name="line.385"></a>
-<span class="sourceLineNo">386</span> * @return The set of media types registered in the parser group of this request.<a name="line.386"></a>
-<span class="sourceLineNo">387</span> */<a name="line.387"></a>
-<span class="sourceLineNo">388</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> return parserGroup.getSupportedMediaTypes();<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> /**<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * Sets the charset to expect on the request body.<a name="line.393"></a>
-<span class="sourceLineNo">394</span> */<a name="line.394"></a>
-<span class="sourceLineNo">395</span> @Override /* ServletRequest */<a name="line.395"></a>
-<span class="sourceLineNo">396</span> public void setCharacterEncoding(String charset) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span> this.charset = charset;<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> /**<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * Returns the charset specified on the <code>Content-Type</code> header, or <js>"UTF-8"</js> if not specified.<a name="line.401"></a>
-<span class="sourceLineNo">402</span> */<a name="line.402"></a>
-<span class="sourceLineNo">403</span> @Override /* ServletRequest */<a name="line.403"></a>
-<span class="sourceLineNo">404</span> public String getCharacterEncoding() {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> if (charset == null) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> // Determine charset<a name="line.406"></a>
-<span class="sourceLineNo">407</span> // NOTE: Don't use super.getCharacterEncoding() because the spec is implemented inconsistently.<a name="line.407"></a>
-<span class="sourceLineNo">408</span> // Jetty returns the default charset instead of null if the character is not specified on the request.<a name="line.408"></a>
-<span class="sourceLineNo">409</span> String h = getHeader("Content-Type");<a name="line.409"></a>
-<span class="sourceLineNo">410</span> if (h != null) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> int i = h.indexOf(";charset=");<a name="line.411"></a>
-<span class="sourceLineNo">412</span> if (i > 0)<a name="line.412"></a>
-<span class="sourceLineNo">413</span> charset = h.substring(i+9).trim();<a name="line.413"></a>
-<span class="sourceLineNo">414</span> }<a name="line.414"></a>
-<span class="sourceLineNo">415</span> if (charset == null)<a name="line.415"></a>
-<span class="sourceLineNo">416</span> charset = defaultCharset;<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (! Charset.isSupported(charset))<a name="line.417"></a>
-<span class="sourceLineNo">418</span> throw new RestException(SC_UNSUPPORTED_MEDIA_TYPE, "Unsupported charset in header ''Content-Type'': ''{0}''", h);<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span> return charset;<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> @Override /* ServletRequest */<a name="line.423"></a>
-<span class="sourceLineNo">424</span> public Locale getLocale() {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> String h = getOverriddenHeader("Accept-Language");<a name="line.425"></a>
-<span class="sourceLineNo">426</span> if (h != null) {<a name="line.426"></a>
-<span class="sourceLineNo">427</span> MediaRange[] mr = MediaRange.parse(h);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> if (mr.length > 0)<a name="line.428"></a>
-<span class="sourceLineNo">429</span> return toLocale(mr[0].getMediaType().getType());<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span> return super.getLocale();<a name="line.431"></a>
-<span class="sourceLineNo">432</span> }<a name="line.432"></a>
-<span class="sourceLineNo">433</span><a name="line.433"></a>
-<span class="sourceLineNo">434</span> @Override /* ServletRequest */<a name="line.434"></a>
-<span class="sourceLineNo">435</span> public Enumeration<Locale> getLocales() {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> String h = getOverriddenHeader("Accept-Language");<a name="line.436"></a>
-<span class="sourceLineNo">437</span> if (h != null) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> MediaRange[] mr = MediaRange.parse(h);<a name="line.438"></a>
-<span class="sourceLineNo">439</span> if (mr.length > 0) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> List<Locale> l = new ArrayList<Locale>(mr.length);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> for (MediaRange r : mr)<a name="line.441"></a>
-<span class="sourceLineNo">442</span> l.add(toLocale(r.getMediaType().getType()));<a name="line.442"></a>
-<span class="sourceLineNo">443</span> return enumeration(l);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> }<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> return super.getLocales();<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> //--------------------------------------------------------------------------------<a name="line.450"></a>
-<span class="sourceLineNo">451</span> // Query parameters<a name="line.451"></a>
-<span class="sourceLineNo">452</span> //--------------------------------------------------------------------------------<a name="line.452"></a>
+<span class="sourceLineNo">269</span> * <jc>// Parse a UUID.</jc><a name="line.269"></a>
+<span class="sourceLineNo">270</span> * UUID myheader = req.getHeader(<js>"My-Header"</js>, UUID.<jk>class</jk>);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * </p><a name="line.271"></a>
+<span class="sourceLineNo">272</span> *<a name="line.272"></a>
+<span class="sourceLineNo">273</span> * @param name The HTTP header name.<a name="line.273"></a>
+<span class="sourceLineNo">274</span> * @param type The class type to convert the header value to.<a name="line.274"></a>
+<span class="sourceLineNo">275</span> * @param <T> The class type to convert the header value to.<a name="line.275"></a>
+<span class="sourceLineNo">276</span> * @return The parameter value converted to the specified class type.<a name="line.276"></a>
+<span class="sourceLineNo">277</span> */<a name="line.277"></a>
+<span class="sourceLineNo">278</span> public <T> T getHeader(String name, Class<T> type) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> String h = getHeader(name);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> return beanSession.convertToType(h, type);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> /**<a name="line.283"></a>
+<span class="sourceLineNo">284</span> * Same as {@link #getHeader(String, Class)} but returns a default value if not found.<a name="line.284"></a>
+<span class="sourceLineNo">285</span> *<a name="line.285"></a>
+<span class="sourceLineNo">286</span> * @param name The HTTP header name.<a name="line.286"></a>
+<span class="sourceLineNo">287</span> * @param def The default value if the header was not specified or is <jk>null</jk>.<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * @param type The class type to convert the header value to.<a name="line.288"></a>
+<span class="sourceLineNo">289</span> * @param <T> The class type to convert the header value to.<a name="line.289"></a>
+<span class="sourceLineNo">290</span> * @return The parameter value converted to the specified class type.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> */<a name="line.291"></a>
+<span class="sourceLineNo">292</span> public <T> T getHeader(String name, T def, Class<T> type) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> String h = getHeader(name);<a name="line.293"></a>
+<span class="sourceLineNo">294</span> if (h == null)<a name="line.294"></a>
+<span class="sourceLineNo">295</span> return def;<a name="line.295"></a>
+<span class="sourceLineNo">296</span> return beanSession.convertToType(h, type);<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> /**<a name="line.299"></a>
+<span class="sourceLineNo">300</span> * Returns the specified header value converted to a POJO.<a name="line.300"></a>
+<span class="sourceLineNo">301</span> * <p><a name="line.301"></a>
+<span class="sourceLineNo">302</span> * The type can be any POJO type convertable from a <code>String</code><a name="line.302"></a>
+<span class="sourceLineNo">303</span> * (See <a class="doclink" href="package-summary.html#PojosConvertableFromString">POJOs Convertable From Strings</a>).<a name="line.303"></a>
+<span class="sourceLineNo">304</span> * <p><a name="line.304"></a>
+<span class="sourceLineNo">305</span> * <h5 class='section'>Examples:</h5><a name="line.305"></a>
+<span class="sourceLineNo">306</span> * <p class='bcode'><a name="line.306"></a>
+<span class="sourceLineNo">307</span> * <jc>// Parse into a linked-list of strings.</jc><a name="line.307"></a>
+<span class="sourceLineNo">308</span> * List&lt;String&gt; myheader = req.getHeader(<js>"My-Header"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * </p><a name="line.309"></a>
+<span class="sourceLineNo">310</span> *<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * @param name The HTTP header name.<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * @param type The type of object to create.<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.313"></a>
+<span class="sourceLineNo">314</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.314"></a>
+<span class="sourceLineNo">315</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.315"></a>
+<span class="sourceLineNo">316</span> * <br>Ignored if the main type is not a map or collection.<a name="line.316"></a>
+<span class="sourceLineNo">317</span> * @param <T> The class type to convert the header value to.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * @return The parameter value converted to the specified class type.<a name="line.318"></a>
+<span class="sourceLineNo">319</span> */<a name="line.319"></a>
+<span class="sourceLineNo">320</span> public <T> T getHeader(String name, Type type, Type...args) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> String h = getHeader(name);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> return (T)beanSession.convertToType(null, h, beanSession.getClassMeta(type, args));<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> /**<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * Returns all the request headers as an {@link ObjectMap}.<a name="line.326"></a>
+<span class="sourceLineNo">327</span> * <p><a name="line.327"></a>
+<span class="sourceLineNo">328</span> * Altering entries in this map does not alter headers in the underlying request.<a name="line.328"></a>
+<span class="sourceLineNo">329</span> *<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * @return The request headers. Never <jk>null</jk>.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> */<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public ObjectMap getHeaders() {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> if (headers == null) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> headers = new ObjectMap();<a name="line.334"></a>
+<span class="sourceLineNo">335</span> for (Enumeration<String> e = getHeaderNames(); e.hasMoreElements();) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> String key = e.nextElement();<a name="line.336"></a>
+<span class="sourceLineNo">337</span> headers.put(key, getHeader(key));<a name="line.337"></a>
+<span class="sourceLineNo">338</span> }<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span> return headers;<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> @Override /* ServletRequest */<a name="line.343"></a>
+<span class="sourceLineNo">344</span> public Enumeration<String> getHeaders(String name) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span> String h = getOverriddenHeader(name);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> if (h != null)<a name="line.346"></a>
+<span class="sourceLineNo">347</span> return enumeration(singleton(h));<a name="line.347"></a>
+<span class="sourceLineNo">348</span> return super.getHeaders(name);<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> /**<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * Returns the <code>Content-Type</code> header value on the request, stripped<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * of any parameters such as <js>";charset=X"</js>.<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * <p><a name="line.354"></a>
+<span class="sourceLineNo">355</span> * Example: <js>"text/json"</js>.<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * <p><a name="line.356"></a>
+<span class="sourceLineNo">357</span> * If the content type is not specified, and the content is specified via a<a name="line.357"></a>
+<span class="sourceLineNo">358</span> * <code>&amp;body</code> query parameter, the content type is assumed to be<a name="line.358"></a>
+<span class="sourceLineNo">359</span> * <js>"text/uon"</js>. Otherwise, the content type is assumed to be <js>"text/json"</js>.<a name="line.359"></a>
+<span class="sourceLineNo">360</span> *<a name="line.360"></a>
+<span class="sourceLineNo">361</span> * @return The <code>Content-Type</code> media-type header value on the request.<a name="line.361"></a>
+<span class="sourceLineNo">362</span> */<a name="line.362"></a>
+<span class="sourceLineNo">363</span> public MediaType getMediaType() {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> String cm = getHeader("Content-Type");<a name="line.364"></a>
+<span class="sourceLineNo">365</span> if (cm == null) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> if (body != null)<a name="line.366"></a>
+<span class="sourceLineNo">367</span> return MediaType.UON;<a name="line.367"></a>
+<span class="sourceLineNo">368</span> return MediaType.JSON;<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span> return MediaType.forString(cm);<a name="line.370"></a>
+<span class="sourceLineNo">371</span> }<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span> /**<a name="line.373"></a>
+<span class="sourceLineNo">374</span> * Returns the <code>Time-Zone</code> header value on the request if there is one.<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * <p><a name="line.375"></a>
+<span class="sourceLineNo">376</span> * Example: <js>"GMT"</js>.<a name="line.376"></a>
+<span class="sourceLineNo">377</span> *<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * @return The <code>Time-Zone</code> header value on the request, or <jk>null</jk> if not present.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public TimeZone getTimeZone() {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> String tz = getHeader("Time-Zone");<a name="line.381"></a>
+<span class="sourceLineNo">382</span> if (tz != null)<a name="line.382"></a>
+<span class="sourceLineNo">383</span> return TimeZone.getTimeZone(tz);<a name="line.383"></a>
+<span class="sourceLineNo">384</span> return null;<a name="line.384"></a>
+<span class="sourceLineNo">385</span> }<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span> /**<a name="line.387"></a>
+<span class="sourceLineNo">388</span> * Returns the media types that are valid for <code>Content-Type</code> headers on the request.<a name="line.388"></a>
+<span class="sourceLineNo">389</span> *<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * @return The set of media types registered in the parser group of this request.<a name="line.390"></a>
+<span class="sourceLineNo">391</span> */<a name="line.391"></a>
+<span class="sourceLineNo">392</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.392"></a>
+<span class="sourceLineNo">393</span> return parserGroup.getSupportedMediaTypes();<a name="line.393"></a>
+<span class="sourceLineNo">394</span> }<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span> /**<a name="line.396"></a>
+<span class="sourceLineNo">397</span> * Sets the charset to expect on the request body.<a name="line.397"></a>
+<span class="sourceLineNo">398</span> */<a name="line.398"></a>
+<span class="sourceLineNo">399</span> @Override /* ServletRequest */<a name="line.399"></a>
+<span class="sourceLineNo">400</span> public void setCharacterEncoding(String charset) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> this.charset = charset;<a name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span> /**<a name="line.404"></a>
+<span class="sourceLineNo">405</span> * Returns the charset specified on the <code>Content-Type</code> header, or <js>"UTF-8"</js> if not specified.<a name="line.405"></a>
+<span class="sourceLineNo">406</span> */<a name="line.406"></a>
+<span class="sourceLineNo">407</span> @Override /* ServletRequest */<a name="line.407"></a>
+<span class="sourceLineNo">408</span> public String getCharacterEncoding() {<a name="line.408"></a>
+<span class="sourceLineNo">409</span> if (charset == null) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> // Determine charset<a name="line.410"></a>
+<span class="sourceLineNo">411</span> // NOTE: Don't use super.getCharacterEncoding() because the spec is implemented inconsistently.<a name="line.411"></a>
+<span class="sourceLineNo">412</span> // Jetty returns the default charset instead of null if the character is not specified on the request.<a name="line.412"></a>
+<span class="sourceLineNo">413</span> String h = getHeader("Content-Type");<a name="line.413"></a>
+<span class="sourceLineNo">414</span> if (h != null) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> int i = h.indexOf(";charset=");<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (i > 0)<a name="line.416"></a>
+<span class="sourceLineNo">417</span> charset = h.substring(i+9).trim();<a name="line.417"></a>
+<span class="sourceLineNo">418</span> }<a name="line.418"></a>
+<span class="sourceLineNo">419</span> if (charset == null)<a name="line.419"></a>
+<span class="sourceLineNo">420</span> charset = defaultCharset;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> if (! Charset.isSupported(charset))<a name="line.421"></a>
+<span class="sourceLineNo">422</span> throw new RestException(SC_UNSUPPORTED_MEDIA_TYPE, "Unsupported charset in header ''Content-Type'': ''{0}''", h);<a name="line.422"></a>
+<span class="sourceLineNo">423</span> }<a name="line.423"></a>
+<span class="sourceLineNo">424</span> return charset;<a name="line.424"></a>
+<span class="sourceLineNo">425</span> }<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> @Override /* ServletRequest */<a name="line.427"></a>
+<span class="sourceLineNo">428</span> public Locale getLocale() {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> String h = getOverriddenHeader("Accept-Language");<a name="line.429"></a>
+<span class="sourceLineNo">430</span> if (h != null) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> MediaRange[] mr = MediaRange.parse(h);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> if (mr.length > 0)<a name="line.432"></a>
+<span class="sourceLineNo">433</span> return toLocale(mr[0].getMediaType().getType());<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> return super.getLocale();<a name="line.435"></a>
+<span class="sourceLineNo">436</span> }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span> @Override /* ServletRequest */<a name="line.438"></a>
+<span class="sourceLineNo">439</span> public Enumeration<Locale> getLocales() {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> String h = getOverriddenHeader("Accept-Language");<a name="line.440"></a>
+<span class="sourceLineNo">441</span> if (h != null) {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> MediaRange[] mr = MediaRange.parse(h);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> if (mr.length > 0) {<a name="line.443"></a>
+<span class="sourceLineNo">444</span> List<Locale> l = new ArrayList<Locale>(mr.length);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> for (MediaRange r : mr)<a name="line.445"></a>
+<span class="sourceLineNo">446</span> l.add(toLocale(r.getMediaType().getType()));<a name="line.446"></a>
+<span class="sourceLineNo">447</span> return enumeration(l);<a name="line.447"></a>
+<span class="sourceLineNo">448</span> }<a name="line.448"></a>
+<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">450</span> return super.getLocales();<a name="line.450"></a>
+<span class="sourceLineNo">451</span> }<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> /**<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * Sets a request query parameter value.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> *<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * @param name The parameter name.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @param value The parameter value.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> */<a name="line.459"></a>
-<span class="sourceLineNo">460</span> public void setQueryParameter(String name, Object value) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> if (overriddenQueryParams == null)<a name="line.461"></a>
-<span class="sourceLineNo">462</span> overriddenQueryParams = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> overriddenQueryParams.put(name, value == null ? null : value.toString());<a name="line.463"></a>
-<span class="sourceLineNo">464</span> }<a name="line.464"></a>
-<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span> /**<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * Returns a query parameter value.<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * <p><a name="line.468"></a>
-<span class="sourceLineNo">469</span> * Same as {@link #getParameter(String)} except only looks in the URL string, not parameters from URL-Encoded FORM posts.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * <p><a name="line.470"></a>
-<span class="sourceLineNo">471</span> * This method can be used to retrieve a parameter without triggering the underlying servlet API to load and parse the request body.<a name="line.471"></a>
-<span class="sourceLineNo">472</span> *<a name="line.472"></a>
-<span class="sourceLineNo">473</span> * @param name The URL parameter name.<a name="line.473"></a>
-<span class="sourceLineNo">474</span> * @return The parameter value, or <jk>null</jk> if parameter not specified or has no value (e.g. <js>"&amp;foo"</js>.<a name="line.474"></a>
-<span class="sourceLineNo">475</span> */<a name="line.475"></a>
-<span class="sourceLineNo">476</span> public String getQueryParameter(String name) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> String s = null;<a name="line.477"></a>
-<span class="sourceLineNo">478</span> if (overriddenQueryParams != null)<a name="line.478"></a>
-<span class="sourceLineNo">479</span> s = overriddenQueryParams.get(name);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> if (s != null)<a name="line.480"></a>
-<span class="sourceLineNo">481</span> return s;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> String[] v = queryParams.get(name);<a name="line.482"></a>
-<span class="sourceLineNo">483</span> if (v == null || v.length == 0)<a name="line.483"></a>
-<span class="sourceLineNo">484</span> return null;<a name="line.484"></a>
-<span class="sourceLineNo">485</span> if (v.length == 1 && v[0] != null && v[0].isEmpty()) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> // Fix for behavior difference between Tomcat and WAS.<a name="line.486"></a>
-<span class="sourceLineNo">487</span> // getParameter("foo") on "&foo" in Tomcat returns "".<a name="line.487"></a>
-<span class="sourceLineNo">488</span> // getParameter("foo") on "&foo" in WAS returns null.<a name="line.488"></a>
-<span class="sourceLineNo">489</span> if (queryParams.containsKey(name))<a name="line.489"></a>
-<span class="sourceLineNo">490</span> return null;<a name="line.490"></a>
-<span class="sourceLineNo">491</span> }<a name="line.491"></a>
-<span class="sourceLineNo">492</span> return v[0];<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> /**<a name="line.495"></a>
-<span class="sourceLineNo">496</span> * Same as {@link #getQueryParameter(String)} but returns the specified default value if the query parameter was not specified.<a name="line.496"></a>
-<span class="sourceLineNo">497</span> *<a name="line.497"></a>
-<span class="sourceLineNo">498</span> * @param name The URL parameter name.<a name="line.498"></a>
-<span class="sourceLineNo">499</span> * @param def The default value.<a name="line.499"></a>
-<span class="sourceLineNo">500</span> * @return The parameter value, or the default value if parameter not specified or has no value (e.g. <js>"&amp;foo"</js>.<a name="line.500"></a>
-<span class="sourceLineNo">501</span> */<a name="line.501"></a>
-<span class="sourceLineNo">502</span> public String getQueryParameter(String name, String def) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span> String s = getQueryParameter(name);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> return s == null ? def : s;<a name="line.504"></a>
-<span class="sourceLineNo">505</span> }<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span> /**<a name="line.507"></a>
-<span class="sourceLineNo">508</span> * Returns the specified query parameter value converted to a POJO.<a name="line.508"></a>
-<span class="sourceLineNo">509</span> * <p><a name="line.509"></a>
-<span class="sourceLineNo">510</span> * This method can be used to retrieve a parameter without triggering the underlying servlet API to load and parse the request body.<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * <p><a name="line.511"></a>
-<span class="sourceLineNo">512</span> * <h5 class='section'>Examples:</h5><a name="line.512"></a>
-<span class="sourceLineNo">513</span> * <p class='bcode'><a name="line.513"></a>
-<span class="sourceLineNo">514</span> * <jc>// Parse into an integer.</jc><a name="line.514"></a>
-<span class="sourceLineNo">515</span> * <jk>int</jk> myparam = req.getQueryParameter(<js>"myparam"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> *<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * <jc>// Parse into an int array.</jc><a name="line.517"></a>
-<span class="sourceLineNo">518</span> * <jk>int</jk>[] myparam = req.getQueryParameter(<js>"myparam"</js>, <jk>int</jk>[].<jk>class</jk>);<a name="line.518"></a>
-<span class="sourceLineNo">519</span><a name="line.519"></a>
-<span class="sourceLineNo">520</span> * <jc>// Parse into a bean.</jc><a name="line.520"></a>
-<span class="sourceLineNo">521</span> * MyBean myparam = req.getQueryParameter(<js>"myparam"</js>, MyBean.<jk>class</jk>);<a name="line.521"></a>
-<span class="sourceLineNo">522</span> *<a name="line.522"></a>
-<span class="sourceLineNo">523</span> * <jc>// Parse into a linked-list of objects.</jc><a name="line.523"></a>
-<span class="sourceLineNo">524</span> * List myparam = req.getQueryParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> *<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * <jc>// Parse into a map of object keys/values.</jc><a name="line.526"></a>
-<span class="sourceLineNo">527</span> * Map myparam = req.getQueryParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * </p><a name="line.528"></a>
+<span class="sourceLineNo">454</span> //--------------------------------------------------------------------------------<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // Query parameters<a name="line.455"></a>
+<span class="sourceLineNo">456</span> //--------------------------------------------------------------------------------<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> /**<a name="line.458"></a>
+<span class="sourceLineNo">459</span> * Sets a request query parameter value.<a name="line.459"></a>
+<span class="sourceLineNo">460</span> *<a name="line.460"></a>
+<span class="sourceLineNo">461</span> * @param name The parameter name.<a name="line.461"></a>
+<span class="sourceLineNo">462</span> * @param value The parameter value.<a name="line.462"></a>
+<span class="sourceLineNo">463</span> */<a name="line.463"></a>
+<span class="sourceLineNo">464</span> public void setQueryParameter(String name, Object value) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> if (overriddenQueryParams == null)<a name="line.465"></a>
+<span class="sourceLineNo">466</span> overriddenQueryParams = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> overriddenQueryParams.put(name, value == null ? null : value.toString());<a name="line.467"></a>
+<span class="sourceLineNo">468</span> }<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span> /**<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * Returns a query parameter value.<a name="line.471"></a>
+<span class="sourceLineNo">472</span> * <p><a name="line.472"></a>
+<span class="sourceLineNo">473</span> * Same as {@link #getParameter(String)} except only looks in the URL string, not parameters from URL-Encoded FORM posts.<a name="line.473"></a>
+<span class="sourceLineNo">474</span> * <p><a name="line.474"></a>
+<span class="sourceLineNo">475</span> * This method can be used to retrieve a parameter without triggering the underlying servlet API to load and parse the request body.<a name="line.475"></a>
+<span class="sourceLineNo">476</span> *<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @param name The URL parameter name.<a name="line.477"></a>
+<span class="sourceLineNo">478</span> * @return The parameter value, or <jk>null</jk> if parameter not specified or has no value (e.g. <js>"&amp;foo"</js>.<a name="line.478"></a>
+<span class="sourceLineNo">479</span> */<a name="line.479"></a>
+<span class="sourceLineNo">480</span> public String getQueryParameter(String name) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> String s = null;<a name="line.481"></a>
+<span class="sourceLineNo">482</span> if (overriddenQueryParams != null)<a name="line.482"></a>
+<span class="sourceLineNo">483</span> s = overriddenQueryParams.get(name);<a name="line.483"></a>
+<span class="sourceLineNo">484</span> if (s != null)<a name="line.484"></a>
+<span class="sourceLineNo">485</span> return s;<a name="line.485"></a>
+<span class="sourceLineNo">486</span> String[] v = queryParams.get(name);<a name="line.486"></a>
+<span class="sourceLineNo">487</span> if (v == null || v.length == 0)<a name="line.487"></a>
+<span class="sourceLineNo">488</span> return null;<a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (v.length == 1 && v[0] != null && v[0].isEmpty()) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> // Fix for behavior difference between Tomcat and WAS.<a name="line.490"></a>
+<span class="sourceLineNo">491</span> // getParameter("foo") on "&foo" in Tomcat returns "".<a name="line.491"></a>
+<span class="sourceLineNo">492</span> // getParameter("foo") on "&foo" in WAS returns null.<a name="line.492"></a>
+<span class="sourceLineNo">493</span> if (queryParams.containsKey(name))<a name="line.493"></a>
+<span class="sourceLineNo">494</span> return null;<a name="line.494"></a>
+<span class="sourceLineNo">495</span> }<a name="line.495"></a>
+<span class="sourceLineNo">496</span> return v[0];<a name="line.496"></a>
+<span class="sourceLineNo">497</span> }<a name="line.497"></a>
+<span class="sourceLineNo">498</span><a name="line.498"></a>
+<span class="sourceLineNo">499</span> /**<a name="line.499"></a>
+<span class="sourceLineNo">500</span> * Same as {@link #getQueryParameter(String)} but returns the specified default value if the query parameter was not specified.<a name="line.500"></a>
+<span class="sourceLineNo">501</span> *<a name="line.501"></a>
+<span class="sourceLineNo">502</span> * @param name The URL parameter name.<a name="line.502"></a>
+<span class="sourceLineNo">503</span> * @param def The default value.<a name="line.503"></a>
+<span class="sourceLineNo">504</span> * @return The parameter value, or the default value if parameter not specified or has no value (e.g. <js>"&amp;foo"</js>.<a name="line.504"></a>
+<span class="sourceLineNo">505</span> */<a name="line.505"></a>
+<span class="sourceLineNo">506</span> public String getQueryParameter(String name, String def) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span> String s = getQueryParameter(name);<a name="line.507"></a>
+<span class="sourceLineNo">508</span> return s == null ? def : s;<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span> /**<a name="line.511"></a>
+<span class="sourceLineNo">512</span> * Returns the specified query parameter value converted to a POJO.<a name="line.512"></a>
+<span class="sourceLineNo">513</span> * <p><a name="line.513"></a>
+<span class="sourceLineNo">514</span> * This method can be used to retrieve a parameter without triggering the underlying servlet API to load and parse the request body.<a name="line.514"></a>
+<span class="sourceLineNo">515</span> * <p><a name="line.515"></a>
+<span class="sourceLineNo">516</span> * <h5 class='section'>Examples:</h5><a name="line.516"></a>
+<span class="sourceLineNo">517</span> * <p class='bcode'><a name="line.517"></a>
+<span class="sourceLineNo">518</span> * <jc>// Parse into an integer.</jc><a name="line.518"></a>
+<span class="sourceLineNo">519</span> * <jk>int</jk> myparam = req.getQueryParameter(<js>"myparam"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.519"></a>
+<span class="sourceLineNo">520</span> *<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * <jc>// Parse into an int array.</jc><a name="line.521"></a>
+<span class="sourceLineNo">522</span> * <jk>int</jk>[] myparam = req.getQueryParameter(<js>"myparam"</js>, <jk>int</jk>[].<jk>class</jk>);<a name="line.522"></a>
+<span class="sourceLineNo">523</span><a name="line.523"></a>
+<span class="sourceLineNo">524</span> * <jc>// Parse into a bean.</jc><a name="line.524"></a>
+<span class="sourceLineNo">525</span> * MyBean myparam = req.getQueryParameter(<js>"myparam"</js>, MyBean.<jk>class</jk>);<a name="line.525"></a>
+<span class="sourceLineNo">526</span> *<a name="line.526"></a>
+<span class="sourceLineNo">527</span> * <jc>// Parse into a linked-list of objects.</jc><a name="line.527"></a>
+<span class="sourceLineNo">528</span> * List myparam = req.getQueryParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>);<a name="line.528"></a>
<span class="sourceLineNo">529</span> *<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * @param name The parameter name.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * @param type The class type to convert the parameter value to.<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * @param <T> The class type to convert the parameter value to.<a name="line.532"></a>
-<span class="sourceLineNo">533</span> * @return The parameter value converted to the specified class type.<a name="line.533"></a>
-<span class="sourceLineNo">534</span> * @throws ParseException<a name="line.534"></a>
-<span class="sourceLineNo">535</span> */<a name="line.535"></a>
-<span class="sourceLineNo">536</span> public <T> T getQueryParameter(String name, Class<T> type) throws ParseException {<a name="line.536"></a>
-<span class="sourceLineNo">537</span> return getQueryParameter(name, beanSession.getClassMeta(type));<a name="line.537"></a>
-<span class="sourceLineNo">538</span>
<TRUNCATED>
[28/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html b/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
index 3a15d4a..35470d0 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
@@ -62,7 +62,7 @@
<span class="sourceLineNo">054</span><a name="line.54"></a>
<span class="sourceLineNo">055</span> /** Class categories. */<a name="line.55"></a>
<span class="sourceLineNo">056</span> enum ClassCategory {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> MAP, COLLECTION, CLASS, NUMBER, DECIMAL, BOOLEAN, CHAR, DATE, ARRAY, ENUM, OTHER, CHARSEQ, STR, OBJ, URI, BEANMAP, READER, INPUTSTREAM, VOID<a name="line.57"></a>
+<span class="sourceLineNo">057</span> MAP, COLLECTION, CLASS, NUMBER, DECIMAL, BOOLEAN, CHAR, DATE, ARRAY, ENUM, OTHER, CHARSEQ, STR, OBJ, URI, BEANMAP, READER, INPUTSTREAM, VOID, ARGS<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> final Class<T> innerClass; // The class being wrapped.<a name="line.60"></a>
@@ -114,1475 +114,1556 @@
<span class="sourceLineNo">106</span> private final Throwable initException; // Any exceptions thrown in the init() method.<a name="line.106"></a>
<span class="sourceLineNo">107</span> private final InvocationHandler invocationHandler; // The invocation handler for this class (if it has one).<a name="line.107"></a>
<span class="sourceLineNo">108</span> private final BeanRegistry beanRegistry; // The bean registry of this class meta (if it has one).<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> private static final Boolean BOOLEAN_DEFAULT = false;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> private static final Character CHARACTER_DEFAULT = (char)0;<a name="line.111"></a>
-<span class="sourceLineNo">112</span> private static final Short SHORT_DEFAULT = (short)0;<a name="line.112"></a>
-<span class="sourceLineNo">113</span> private static final Integer INTEGER_DEFAULT = 0;<a name="line.113"></a>
-<span class="sourceLineNo">114</span> private static final Long LONG_DEFAULT = 0l;<a name="line.114"></a>
-<span class="sourceLineNo">115</span> private static final Float FLOAT_DEFAULT = 0f;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> private static final Double DOUBLE_DEFAULT = 0d;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private static final Byte BYTE_DEFAULT = (byte)0;<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * Construct a new {@code ClassMeta} based on the specified {@link Class}.<a name="line.120"></a>
-<span class="sourceLineNo">121</span> *<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * @param innerClass The class being wrapped.<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @param beanContext The bean context that created this object.<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @param implClass For interfaces and abstract classes, this represents the "real" class to instantiate.<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * Can be <jk>null</jk>.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * @param beanFilter The {@link BeanFilter} programmatically associated with this class.<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * Can be <jk>null</jk>.<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * @param pojoSwap The {@link PojoSwap} programmatically associated with this class.<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * Can be <jk>null</jk>.<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * @param childPojoSwap The child {@link PojoSwap PojoSwaps} programmatically associated with this class.<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * These are the <code>PojoSwaps</code> that have normal classes that are subclasses of this class.<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * Can be <jk>null</jk>.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * @param delayedInit Don't call init() in constructor.<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * Used for delayed initialization when the possibility of class reference loops exist.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> */<a name="line.135"></a>
-<span class="sourceLineNo">136</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.136"></a>
-<span class="sourceLineNo">137</span> ClassMeta(Class<T> innerClass, BeanContext beanContext, Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?> pojoSwap, PojoSwap<?,?>[] childPojoSwaps) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> this.innerClass = innerClass;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> this.beanContext = beanContext;<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span> // We always immediately add this class meta to the bean context cache so that we can resolve recursive references.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> if (beanContext != null && beanContext.cmCache != null)<a name="line.142"></a>
-<span class="sourceLineNo">143</span> beanContext.cmCache.put(innerClass, this);<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> ClassMetaBuilder<T> builder = new ClassMetaBuilder(innerClass, beanContext, implClass, beanFilter, pojoSwap, childPojoSwaps);<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> this.cc = builder.cc;<a name="line.147"></a>
-<span class="sourceLineNo">148</span> this.isDelegate = builder.isDelegate;<a name="line.148"></a>
-<span class="sourceLineNo">149</span> this.fromStringMethod = builder.fromStringMethod;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> this.swapMethod = builder.swapMethod;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> this.unswapMethod = builder.unswapMethod;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> this.swapMethodType = builder.swapMethodType;<a name="line.152"></a>
-<span class="sourceLineNo">153</span> this.parentPropertyMethod = builder.parentPropertyMethod;<a name="line.153"></a>
-<span class="sourceLineNo">154</span> this.namePropertyMethod = builder.namePropertyMethod;<a name="line.154"></a>
-<span class="sourceLineNo">155</span> this.noArgConstructor = builder.noArgConstructor;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> this.stringConstructor = builder.stringConstructor;<a name="line.156"></a>
-<span class="sourceLineNo">157</span> this.swapConstructor = builder.swapConstructor;<a name="line.157"></a>
-<span class="sourceLineNo">158</span> this.numberConstructor = builder.numberConstructor;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> this.numberConstructorType = builder.numberConstructorType;<a name="line.159"></a>
-<span class="sourceLineNo">160</span> this.primitiveDefault = builder.primitiveDefault;<a name="line.160"></a>
-<span class="sourceLineNo">161</span> this.publicMethods = builder.publicMethods;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> this.remoteableMethods = builder.remoteableMethods;<a name="line.162"></a>
-<span class="sourceLineNo">163</span> this.proxyableMethods = builder.proxyableMethods;<a name="line.163"></a>
-<span class="sourceLineNo">164</span> this.beanFilter = beanFilter;<a name="line.164"></a>
-<span class="sourceLineNo">165</span> this.pojoSwap = builder.pojoSwap;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> this.extMeta = new MetadataMap();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> this.keyType = builder.keyType;<a name="line.167"></a>
-<span class="sourceLineNo">168</span> this.valueType = builder.valueType;<a name="line.168"></a>
-<span class="sourceLineNo">169</span> this.elementType = builder.elementType;<a name="line.169"></a>
-<span class="sourceLineNo">170</span> this.notABeanReason = builder.notABeanReason;<a name="line.170"></a>
-<span class="sourceLineNo">171</span> this.beanMeta = builder.beanMeta;<a name="line.171"></a>
-<span class="sourceLineNo">172</span> this.initException = builder.initException;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> this.dictionaryName = builder.dictionaryName;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> this.resolvedDictionaryName = builder.resolvedDictionaryName;<a name="line.174"></a>
-<span class="sourceLineNo">175</span> this.serializedClassMeta = builder.serializedClassMeta;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> this.invocationHandler = builder.invocationHandler;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> this.beanRegistry = builder.beanRegistry;<a name="line.177"></a>
-<span class="sourceLineNo">178</span> this.isMemberClass = builder.isMemberClass;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> this.isAbstract = builder.isAbstract;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> this.implClass = builder.implClass;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> this.childUnswapMap = builder.childUnswapMap;<a name="line.181"></a>
-<span class="sourceLineNo">182</span> this.childSwapMap = builder.childSwapMap;<a name="line.182"></a>
-<span class="sourceLineNo">183</span> this.childPojoSwaps = builder.childPojoSwaps;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> /**<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * Copy constructor.<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * Used for creating Map and Collection class metas that shouldn't be cached.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> */<a name="line.189"></a>
-<span class="sourceLineNo">190</span> ClassMeta(ClassMeta<T> mainType, ClassMeta<?> keyType, ClassMeta<?> valueType, ClassMeta<?> elementType) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> this.innerClass = mainType.innerClass;<a name="line.191"></a>
-<span class="sourceLineNo">192</span> this.implClass = mainType.implClass;<a name="line.192"></a>
-<span class="sourceLineNo">193</span> this.childPojoSwaps = mainType.childPojoSwaps;<a name="line.193"></a>
-<span class="sourceLineNo">194</span> this.childSwapMap = mainType.childSwapMap;<a name="line.194"></a>
-<span class="sourceLineNo">195</span> this.childUnswapMap = mainType.childUnswapMap;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> this.cc = mainType.cc;<a name="line.196"></a>
-<span class="sourceLineNo">197</span> this.fromStringMethod = mainType.fromStringMethod;<a name="line.197"></a>
-<span class="sourceLineNo">198</span> this.noArgConstructor = mainType.noArgConstructor;<a name="line.198"></a>
-<span class="sourceLineNo">199</span> this.stringConstructor = mainType.stringConstructor;<a name="line.199"></a>
-<span class="sourceLineNo">200</span> this.numberConstructor = mainType.numberConstructor;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> this.swapConstructor = mainType.swapConstructor;<a name="line.201"></a>
-<span class="sourceLineNo">202</span> this.swapMethodType = mainType.swapMethodType;<a name="line.202"></a>
-<span class="sourceLineNo">203</span> this.numberConstructorType = mainType.numberConstructorType;<a name="line.203"></a>
-<span class="sourceLineNo">204</span> this.swapMethod = mainType.swapMethod;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> this.unswapMethod = mainType.unswapMethod;<a name="line.205"></a>
-<span class="sourceLineNo">206</span> this.namePropertyMethod = mainType.namePropertyMethod;<a name="line.206"></a>
-<span class="sourceLineNo">207</span> this.parentPropertyMethod = mainType.parentPropertyMethod;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> this.isDelegate = mainType.isDelegate;<a name="line.208"></a>
-<span class="sourceLineNo">209</span> this.isAbstract = mainType.isAbstract;<a name="line.209"></a>
-<span class="sourceLineNo">210</span> this.isMemberClass = mainType.isMemberClass;<a name="line.210"></a>
-<span class="sourceLineNo">211</span> this.primitiveDefault = mainType.primitiveDefault;<a name="line.211"></a>
-<span class="sourceLineNo">212</span> this.remoteableMethods = mainType.remoteableMethods;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> this.proxyableMethods = mainType.proxyableMethods;<a name="line.213"></a>
-<span class="sourceLineNo">214</span> this.publicMethods = mainType.publicMethods;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> this.beanContext = mainType.beanContext;<a name="line.215"></a>
-<span class="sourceLineNo">216</span> this.serializedClassMeta = this;<a name="line.216"></a>
-<span class="sourceLineNo">217</span> this.elementType = elementType;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> this.keyType = keyType;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> this.valueType = valueType;<a name="line.219"></a>
-<span class="sourceLineNo">220</span> this.invocationHandler = mainType.invocationHandler;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> this.beanMeta = mainType.beanMeta;<a name="line.221"></a>
-<span class="sourceLineNo">222</span> this.dictionaryName = mainType.dictionaryName;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> this.resolvedDictionaryName = mainType.resolvedDictionaryName;<a name="line.223"></a>
-<span class="sourceLineNo">224</span> this.notABeanReason = mainType.notABeanReason;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> this.pojoSwap = mainType.pojoSwap;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> this.beanFilter = mainType.beanFilter;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> this.extMeta = mainType.extMeta;<a name="line.227"></a>
-<span class="sourceLineNo">228</span> this.initException = mainType.initException;<a name="line.228"></a>
-<span class="sourceLineNo">229</span> this.beanRegistry = mainType.beanRegistry;<a name="line.229"></a>
-<span class="sourceLineNo">230</span> }<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span> @SuppressWarnings({"unchecked","rawtypes","hiding"})<a name="line.232"></a>
-<span class="sourceLineNo">233</span> private class ClassMetaBuilder<T> {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> Class<T> innerClass;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> Class<? extends T> implClass;<a name="line.235"></a>
-<span class="sourceLineNo">236</span> BeanContext beanContext;<a name="line.236"></a>
-<span class="sourceLineNo">237</span> ClassCategory cc = ClassCategory.OTHER;<a name="line.237"></a>
-<span class="sourceLineNo">238</span> boolean<a name="line.238"></a>
-<span class="sourceLineNo">239</span> isDelegate = false,<a name="line.239"></a>
-<span class="sourceLineNo">240</span> isMemberClass = false,<a name="line.240"></a>
-<span class="sourceLineNo">241</span> isAbstract = false;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> Method<a name="line.242"></a>
-<span class="sourceLineNo">243</span> fromStringMethod = null,<a name="line.243"></a>
-<span class="sourceLineNo">244</span> swapMethod = null,<a name="line.244"></a>
-<span class="sourceLineNo">245</span> unswapMethod = null,<a name="line.245"></a>
-<span class="sourceLineNo">246</span> parentPropertyMethod = null,<a name="line.246"></a>
-<span class="sourceLineNo">247</span> namePropertyMethod = null;<a name="line.247"></a>
-<span class="sourceLineNo">248</span> Constructor<T><a name="line.248"></a>
-<span class="sourceLineNo">249</span> noArgConstructor = null,<a name="line.249"></a>
-<span class="sourceLineNo">250</span> stringConstructor = null,<a name="line.250"></a>
-<span class="sourceLineNo">251</span> swapConstructor = null,<a name="line.251"></a>
-<span class="sourceLineNo">252</span> numberConstructor = null;<a name="line.252"></a>
-<span class="sourceLineNo">253</span> Class<?><a name="line.253"></a>
-<span class="sourceLineNo">254</span> swapMethodType = null,<a name="line.254"></a>
-<span class="sourceLineNo">255</span> numberConstructorType = null;<a name="line.255"></a>
-<span class="sourceLineNo">256</span> Object primitiveDefault = null;<a name="line.256"></a>
-<span class="sourceLineNo">257</span> Map<String,Method><a name="line.257"></a>
-<span class="sourceLineNo">258</span> publicMethods = new LinkedHashMap<String,Method>(),<a name="line.258"></a>
-<span class="sourceLineNo">259</span> remoteableMethods = null,<a name="line.259"></a>
-<span class="sourceLineNo">260</span> proxyableMethods = null;<a name="line.260"></a>
-<span class="sourceLineNo">261</span> ClassMeta<?><a name="line.261"></a>
-<span class="sourceLineNo">262</span> keyType = null,<a name="line.262"></a>
-<span class="sourceLineNo">263</span> valueType = null,<a name="line.263"></a>
-<span class="sourceLineNo">264</span> elementType = null,<a name="line.264"></a>
-<span class="sourceLineNo">265</span> serializedClassMeta = null;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> String<a name="line.266"></a>
-<span class="sourceLineNo">267</span> notABeanReason = null,<a name="line.267"></a>
-<span class="sourceLineNo">268</span> dictionaryName = null,<a name="line.268"></a>
-<span class="sourceLineNo">269</span> resolvedDictionaryName = null;<a name="line.269"></a>
-<span class="sourceLineNo">270</span> Throwable initException = null;<a name="line.270"></a>
-<span class="sourceLineNo">271</span> BeanMeta beanMeta = null;<a name="line.271"></a>
-<span class="sourceLineNo">272</span> PojoSwap pojoSwap = null;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> InvocationHandler invocationHandler = null;<a name="line.273"></a>
-<span class="sourceLineNo">274</span> BeanRegistry beanRegistry = null;<a name="line.274"></a>
-<span class="sourceLineNo">275</span> PojoSwap<?,?>[] childPojoSwaps;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> ConcurrentHashMap<Class<?>,PojoSwap<?,?>><a name="line.276"></a>
-<span class="sourceLineNo">277</span> childSwapMap,<a name="line.277"></a>
-<span class="sourceLineNo">278</span> childUnswapMap;<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> private ClassMetaBuilder(Class<T> innerClass, BeanContext beanContext, Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?> pojoSwap, PojoSwap<?,?>[] childPojoSwaps) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> this.innerClass = innerClass;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> this.beanContext = beanContext;<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> this.implClass = implClass;<a name="line.284"></a>
-<span class="sourceLineNo">285</span> this.childPojoSwaps = childPojoSwaps;<a name="line.285"></a>
-<span class="sourceLineNo">286</span> this.childSwapMap = childPojoSwaps == null ? null : new ConcurrentHashMap<Class<?>,PojoSwap<?,?>>();<a name="line.286"></a>
-<span class="sourceLineNo">287</span> this.childUnswapMap = childPojoSwaps == null ? null : new ConcurrentHashMap<Class<?>,PojoSwap<?,?>>();<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> Class<T> c = innerClass;<a name="line.289"></a>
-<span class="sourceLineNo">290</span> if (c.isPrimitive()) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> if (c == Boolean.TYPE)<a name="line.291"></a>
-<span class="sourceLineNo">292</span> cc = BOOLEAN;<a name="line.292"></a>
-<span class="sourceLineNo">293</span> else if (c == Byte.TYPE || c == Short.TYPE || c == Integer.TYPE || c == Long.TYPE || c == Float.TYPE || c == Double.TYPE) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> if (c == Float.TYPE || c == Double.TYPE)<a name="line.294"></a>
-<span class="sourceLineNo">295</span> cc = DECIMAL;<a name="line.295"></a>
-<span class="sourceLineNo">296</span> else<a name="line.296"></a>
-<span class="sourceLineNo">297</span> cc = NUMBER;<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span> else if (c == Character.TYPE)<a name="line.299"></a>
-<span class="sourceLineNo">300</span> cc = CHAR;<a name="line.300"></a>
-<span class="sourceLineNo">301</span> else if (c == void.class || c == Void.class)<a name="line.301"></a>
-<span class="sourceLineNo">302</span> cc = VOID;<a name="line.302"></a>
-<span class="sourceLineNo">303</span> } else {<a name="line.303"></a>
-<span class="sourceLineNo">304</span> if (isParentClass(Delegate.class, c))<a name="line.304"></a>
-<span class="sourceLineNo">305</span> isDelegate = true;<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> if (c == Object.class)<a name="line.307"></a>
-<span class="sourceLineNo">308</span> cc = OBJ;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> else if (c.isEnum())<a name="line.309"></a>
-<span class="sourceLineNo">310</span> cc = ENUM;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> else if (c.equals(Class.class))<a name="line.311"></a>
-<span class="sourceLineNo">312</span> cc = CLASS;<a name="line.312"></a>
-<span class="sourceLineNo">313</span> else if (isParentClass(CharSequence.class, c)) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> if (c.equals(String.class))<a name="line.314"></a>
-<span class="sourceLineNo">315</span> cc = STR;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> else<a name="line.316"></a>
-<span class="sourceLineNo">317</span> cc = CHARSEQ;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> }<a name="line.318"></a>
-<span class="sourceLineNo">319</span> else if (isParentClass(Number.class, c)) {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> if (isParentClass(Float.class, c) || isParentClass(Double.class, c))<a name="line.320"></a>
-<span class="sourceLineNo">321</span> cc = DECIMAL;<a name="line.321"></a>
-<span class="sourceLineNo">322</span> else<a name="line.322"></a>
-<span class="sourceLineNo">323</span> cc = NUMBER;<a name="line.323"></a>
-<span class="sourceLineNo">324</span> }<a name="line.324"></a>
-<span class="sourceLineNo">325</span> else if (isParentClass(Collection.class, c))<a name="line.325"></a>
-<span class="sourceLineNo">326</span> cc = COLLECTION;<a name="line.326"></a>
-<span class="sourceLineNo">327</span> else if (isParentClass(Map.class, c)) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> if (isParentClass(BeanMap.class, c))<a name="line.328"></a>
-<span class="sourceLineNo">329</span> cc = BEANMAP;<a name="line.329"></a>
-<span class="sourceLineNo">330</span> else<a name="line.330"></a>
-<span class="sourceLineNo">331</span> cc = MAP;<a name="line.331"></a>
-<span class="sourceLineNo">332</span> }<a name="line.332"></a>
-<span class="sourceLineNo">333</span> else if (c == Character.class)<a name="line.333"></a>
-<span class="sourceLineNo">334</span> cc = CHAR;<a name="line.334"></a>
-<span class="sourceLineNo">335</span> else if (c == Boolean.class)<a name="line.335"></a>
-<span class="sourceLineNo">336</span> cc = BOOLEAN;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> else if (isParentClass(Date.class, c) || isParentClass(Calendar.class, c))<a name="line.337"></a>
-<span class="sourceLineNo">338</span> cc = DATE;<a name="line.338"></a>
-<span class="sourceLineNo">339</span> else if (c.isArray())<a name="line.339"></a>
-<span class="sourceLineNo">340</span> cc = ARRAY;<a name="line.340"></a>
-<span class="sourceLineNo">341</span> else if (isParentClass(URL.class, c) || isParentClass(URI.class, c) || c.isAnnotationPresent(org.apache.juneau.annotation.URI.class))<a name="line.341"></a>
-<span class="sourceLineNo">342</span> cc = URI;<a name="line.342"></a>
-<span class="sourceLineNo">343</span> else if (isParentClass(Reader.class, c))<a name="line.343"></a>
-<span class="sourceLineNo">344</span> cc = READER;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> else if (isParentClass(InputStream.class, c))<a name="line.345"></a>
-<span class="sourceLineNo">346</span> cc = INPUTSTREAM;<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> isMemberClass = c.isMemberClass() && ! isStatic(c);<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> // Find static fromString(String) or equivalent method.<a name="line.351"></a>
-<span class="sourceLineNo">352</span> // fromString() must be checked before valueOf() so that Enum classes can create their own<a name="line.352"></a>
-<span class="sourceLineNo">353</span> // specialized fromString() methods to override the behavior of Enum.valueOf(String).<a name="line.353"></a>
-<span class="sourceLineNo">354</span> // valueOf() is used by enums.<a name="line.354"></a>
-<span class="sourceLineNo">355</span> // parse() is used by the java logging Level class.<a name="line.355"></a>
-<span class="sourceLineNo">356</span> // forName() is used by Class and Charset<a name="line.356"></a>
-<span class="sourceLineNo">357</span> for (String methodName : new String[]{"fromString","valueOf","parse","parseString","forName","forString"}) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> if (fromStringMethod == null) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> for (Method m : c.getMethods()) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> if (isStatic(m) && isPublic(m) && isNotDeprecated(m)) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> String mName = m.getName();<a name="line.361"></a>
-<span class="sourceLineNo">362</span> if (mName.equals(methodName) && m.getReturnType() == c) {<a name="line.362"></a>
-<span class="sourceLineNo">363</span> Class<?>[] args = m.getParameterTypes();<a name="line.363"></a>
-<span class="sourceLineNo">364</span> if (args.length == 1 && args[0] == String.class) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> fromStringMethod = m;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> break;<a name="line.366"></a>
-<span class="sourceLineNo">367</span> }<a name="line.367"></a>
-<span class="sourceLineNo">368</span> }<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span> }<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> // Special cases<a name="line.374"></a>
-<span class="sourceLineNo">375</span> try {<a name="line.375"></a>
-<span class="sourceLineNo">376</span> if (c == TimeZone.class)<a name="line.376"></a>
-<span class="sourceLineNo">377</span> fromStringMethod = c.getMethod("getTimeZone", String.class);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> else if (c == Locale.class)<a name="line.378"></a>
-<span class="sourceLineNo">379</span> fromStringMethod = LocaleAsString.class.getMethod("fromString", String.class);<a name="line.379"></a>
-<span class="sourceLineNo">380</span> } catch (NoSuchMethodException e1) {}<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span> // Find swap() method if present.<a name="line.382"></a>
-<span class="sourceLineNo">383</span> for (Method m : c.getMethods()) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> if (isPublic(m) && isNotDeprecated(m) && ! isStatic(m)) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> String mName = m.getName();<a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (mName.equals("swap")) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> Class<?>[] pt = m.getParameterTypes();<a name="line.387"></a>
-<span class="sourceLineNo">388</span> if (pt.length == 1 && pt[0] == BeanSession.class) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> swapMethod = m;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> swapMethodType = m.getReturnType();<a name="line.390"></a>
-<span class="sourceLineNo">391</span> break;<a name="line.391"></a>
-<span class="sourceLineNo">392</span> }<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span> // Find unswap() method if present.<a name="line.396"></a>
-<span class="sourceLineNo">397</span> if (swapMethod != null) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> for (Method m : c.getMethods()) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span> if (isPublic(m) && isNotDeprecated(m) && isStatic(m)) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> String mName = m.getName();<a name="line.400"></a>
-<span class="sourceLineNo">401</span> if (mName.equals("unswap")) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> Class<?>[] pt = m.getParameterTypes();<a name="line.402"></a>
-<span class="sourceLineNo">403</span> if (pt.length == 2 && pt[0] == BeanSession.class && pt[1] == swapMethodType) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> unswapMethod = m;<a name="line.404"></a>
-<span class="sourceLineNo">405</span> break;<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span> }<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span> }<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span> // Find @NameProperty and @ParentProperty methods if present.<a name="line.412"></a>
-<span class="sourceLineNo">413</span> for (Method m : c.getDeclaredMethods()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> if (m.isAnnotationPresent(ParentProperty.class) && m.getParameterTypes().length == 1) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> m.setAccessible(true);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> parentPropertyMethod = m;<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span> if (m.isAnnotationPresent(NameProperty.class) && m.getParameterTypes().length == 1) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> m.setAccessible(true);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> namePropertyMethod = m;<a name="line.420"></a>
+<span class="sourceLineNo">109</span> private final ClassMeta<?>[] args; // Arg types if this is an array of args.<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> private static final Boolean BOOLEAN_DEFAULT = false;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> private static final Character CHARACTER_DEFAULT = (char)0;<a name="line.112"></a>
+<span class="sourceLineNo">113</span> private static final Short SHORT_DEFAULT = (short)0;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> private static final Integer INTEGER_DEFAULT = 0;<a name="line.114"></a>
+<span class="sourceLineNo">115</span> private static final Long LONG_DEFAULT = 0l;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> private static final Float FLOAT_DEFAULT = 0f;<a name="line.116"></a>
+<span class="sourceLineNo">117</span> private static final Double DOUBLE_DEFAULT = 0d;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> private static final Byte BYTE_DEFAULT = (byte)0;<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> /**<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * Construct a new {@code ClassMeta} based on the specified {@link Class}.<a name="line.121"></a>
+<span class="sourceLineNo">122</span> *<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * @param innerClass The class being wrapped.<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * @param beanContext The bean context that created this object.<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * @param implClass For interfaces and abstract classes, this represents the "real" class to instantiate.<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * Can be <jk>null</jk>.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @param beanFilter The {@link BeanFilter} programmatically associated with this class.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * Can be <jk>null</jk>.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> * @param pojoSwap The {@link PojoSwap} programmatically associated with this class.<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * Can be <jk>null</jk>.<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * @param childPojoSwap The child {@link PojoSwap PojoSwaps} programmatically associated with this class.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * These are the <code>PojoSwaps</code> that have normal classes that are subclasses of this class.<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * Can be <jk>null</jk>.<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * @param delayedInit Don't call init() in constructor.<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * Used for delayed initialization when the possibility of class reference loops exist.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> */<a name="line.136"></a>
+<span class="sourceLineNo">137</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.137"></a>
+<span class="sourceLineNo">138</span> ClassMeta(Class<T> innerClass, BeanContext beanContext, Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?> pojoSwap, PojoSwap<?,?>[] childPojoSwaps) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> this.innerClass = innerClass;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> this.beanContext = beanContext;<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span> // We always immediately add this class meta to the bean context cache so that we can resolve recursive references.<a name="line.142"></a>
+<span class="sourceLineNo">143</span> if (beanContext != null && beanContext.cmCache != null)<a name="line.143"></a>
+<span class="sourceLineNo">144</span> beanContext.cmCache.put(innerClass, this);<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span> ClassMetaBuilder<T> builder = new ClassMetaBuilder(innerClass, beanContext, implClass, beanFilter, pojoSwap, childPojoSwaps);<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span> this.cc = builder.cc;<a name="line.148"></a>
+<span class="sourceLineNo">149</span> this.isDelegate = builder.isDelegate;<a name="line.149"></a>
+<span class="sourceLineNo">150</span> this.fromStringMethod = builder.fromStringMethod;<a name="line.150"></a>
+<span class="sourceLineNo">151</span> this.swapMethod = builder.swapMethod;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> this.unswapMethod = builder.unswapMethod;<a name="line.152"></a>
+<span class="sourceLineNo">153</span> this.swapMethodType = builder.swapMethodType;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> this.parentPropertyMethod = builder.parentPropertyMethod;<a name="line.154"></a>
+<span class="sourceLineNo">155</span> this.namePropertyMethod = builder.namePropertyMethod;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> this.noArgConstructor = builder.noArgConstructor;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> this.stringConstructor = builder.stringConstructor;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> this.swapConstructor = builder.swapConstructor;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> this.numberConstructor = builder.numberConstructor;<a name="line.159"></a>
+<span class="sourceLineNo">160</span> this.numberConstructorType = builder.numberConstructorType;<a name="line.160"></a>
+<span class="sourceLineNo">161</span> this.primitiveDefault = builder.primitiveDefault;<a name="line.161"></a>
+<span class="sourceLineNo">162</span> this.publicMethods = builder.publicMethods;<a name="line.162"></a>
+<span class="sourceLineNo">163</span> this.remoteableMethods = builder.remoteableMethods;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> this.proxyableMethods = builder.proxyableMethods;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> this.beanFilter = beanFilter;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> this.pojoSwap = builder.pojoSwap;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> this.extMeta = new MetadataMap();<a name="line.167"></a>
+<span class="sourceLineNo">168</span> this.keyType = builder.keyType;<a name="line.168"></a>
+<span class="sourceLineNo">169</span> this.valueType = builder.valueType;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> this.elementType = builder.elementType;<a name="line.170"></a>
+<span class="sourceLineNo">171</span> this.notABeanReason = builder.notABeanReason;<a name="line.171"></a>
+<span class="sourceLineNo">172</span> this.beanMeta = builder.beanMeta;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> this.initException = builder.initException;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> this.dictionaryName = builder.dictionaryName;<a name="line.174"></a>
+<span class="sourceLineNo">175</span> this.resolvedDictionaryName = builder.resolvedDictionaryName;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> this.serializedClassMeta = builder.serializedClassMeta;<a name="line.176"></a>
+<span class="sourceLineNo">177</span> this.invocationHandler = builder.invocationHandler;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> this.beanRegistry = builder.beanRegistry;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> this.isMemberClass = builder.isMemberClass;<a name="line.179"></a>
+<span class="sourceLineNo">180</span> this.isAbstract = builder.isAbstract;<a name="line.180"></a>
+<span class="sourceLineNo">181</span> this.implClass = builder.implClass;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> this.childUnswapMap = builder.childUnswapMap;<a name="line.182"></a>
+<span class="sourceLineNo">183</span> this.childSwapMap = builder.childSwapMap;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> this.childPojoSwaps = builder.childPojoSwaps;<a name="line.184"></a>
+<span class="sourceLineNo">185</span> this.args = null;<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> /**<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * Copy constructor.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * Used for creating Map and Collection class metas that shouldn't be cached.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> */<a name="line.191"></a>
+<span class="sourceLineNo">192</span> ClassMeta(ClassMeta<T> mainType, ClassMeta<?> keyType, ClassMeta<?> valueType, ClassMeta<?> elementType) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> this.innerClass = mainType.innerClass;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> this.implClass = mainType.implClass;<a name="line.194"></a>
+<span class="sourceLineNo">195</span> this.childPojoSwaps = mainType.childPojoSwaps;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> this.childSwapMap = mainType.childSwapMap;<a name="line.196"></a>
+<span class="sourceLineNo">197</span> this.childUnswapMap = mainType.childUnswapMap;<a name="line.197"></a>
+<span class="sourceLineNo">198</span> this.cc = mainType.cc;<a name="line.198"></a>
+<span class="sourceLineNo">199</span> this.fromStringMethod = mainType.fromStringMethod;<a name="line.199"></a>
+<span class="sourceLineNo">200</span> this.noArgConstructor = mainType.noArgConstructor;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> this.stringConstructor = mainType.stringConstructor;<a name="line.201"></a>
+<span class="sourceLineNo">202</span> this.numberConstructor = mainType.numberConstructor;<a name="line.202"></a>
+<span class="sourceLineNo">203</span> this.swapConstructor = mainType.swapConstructor;<a name="line.203"></a>
+<span class="sourceLineNo">204</span> this.swapMethodType = mainType.swapMethodType;<a name="line.204"></a>
+<span class="sourceLineNo">205</span> this.numberConstructorType = mainType.numberConstructorType;<a name="line.205"></a>
+<span class="sourceLineNo">206</span> this.swapMethod = mainType.swapMethod;<a name="line.206"></a>
+<span class="sourceLineNo">207</span> this.unswapMethod = mainType.unswapMethod;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> this.namePropertyMethod = mainType.namePropertyMethod;<a name="line.208"></a>
+<span class="sourceLineNo">209</span> this.parentPropertyMethod = mainType.parentPropertyMethod;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> this.isDelegate = mainType.isDelegate;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> this.isAbstract = mainType.isAbstract;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> this.isMemberClass = mainType.isMemberClass;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> this.primitiveDefault = mainType.primitiveDefault;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> this.remoteableMethods = mainType.remoteableMethods;<a name="line.214"></a>
+<span class="sourceLineNo">215</span> this.proxyableMethods = mainType.proxyableMethods;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> this.publicMethods = mainType.publicMethods;<a name="line.216"></a>
+<span class="sourceLineNo">217</span> this.beanContext = mainType.beanContext;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> this.serializedClassMeta = this;<a name="line.218"></a>
+<span class="sourceLineNo">219</span> this.elementType = elementType;<a name="line.219"></a>
+<span class="sourceLineNo">220</span> this.keyType = keyType;<a name="line.220"></a>
+<span class="sourceLineNo">221</span> this.valueType = valueType;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> this.invocationHandler = mainType.invocationHandler;<a name="line.222"></a>
+<span class="sourceLineNo">223</span> this.beanMeta = mainType.beanMeta;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> this.dictionaryName = mainType.dictionaryName;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> this.resolvedDictionaryName = mainType.resolvedDictionaryName;<a name="line.225"></a>
+<span class="sourceLineNo">226</span> this.notABeanReason = mainType.notABeanReason;<a name="line.226"></a>
+<span class="sourceLineNo">227</span> this.pojoSwap = mainType.pojoSwap;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> this.beanFilter = mainType.beanFilter;<a name="line.228"></a>
+<span class="sourceLineNo">229</span> this.extMeta = mainType.extMeta;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> this.initException = mainType.initException;<a name="line.230"></a>
+<span class="sourceLineNo">231</span> this.beanRegistry = mainType.beanRegistry;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> this.args = null;<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> /**<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * Constructor for args-arrays.<a name="line.236"></a>
+<span class="sourceLineNo">237</span> */<a name="line.237"></a>
+<span class="sourceLineNo">238</span> @SuppressWarnings("unchecked")<a name="line.238"></a>
+<span class="sourceLineNo">239</span> ClassMeta(ClassMeta<?>[] args) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> this.innerClass = (Class<T>) Object[].class;<a name="line.240"></a>
+<span class="sourceLineNo">241</span> this.args = args;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> this.implClass = null;<a name="line.242"></a>
+<span class="sourceLineNo">243</span> this.childPojoSwaps = null;<a name="line.243"></a>
+<span class="sourceLineNo">244</span> this.childSwapMap = null;<a name="line.244"></a>
+<span class="sourceLineNo">245</span> this.childUnswapMap = null;<a name="line.245"></a>
+<span class="sourceLineNo">246</span> this.cc = ARGS;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> this.fromStringMethod = null;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> this.noArgConstructor = null;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> this.stringConstructor = null;<a name="line.249"></a>
+<span class="sourceLineNo">250</span> this.numberConstructor = null;<a name="line.250"></a>
+<span class="sourceLineNo">251</span> this.swapConstructor = null;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> this.swapMethodType = null;<a name="line.252"></a>
+<span class="sourceLineNo">253</span> this.numberConstructorType = null;<a name="line.253"></a>
+<span class="sourceLineNo">254</span> this.swapMethod = null;<a name="line.254"></a>
+<span class="sourceLineNo">255</span> this.unswapMethod = null;<a name="line.255"></a>
+<span class="sourceLineNo">256</span> this.namePropertyMethod = null;<a name="line.256"></a>
+<span class="sourceLineNo">257</span> this.parentPropertyMethod = null;<a name="line.257"></a>
+<span class="sourceLineNo">258</span> this.isDelegate = false;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> this.isAbstract = false;<a name="line.259"></a>
+<span class="sourceLineNo">260</span> this.isMemberClass = false;<a name="line.260"></a>
+<span class="sourceLineNo">261</span> this.primitiveDefault = null;<a name="line.261"></a>
+<span class="sourceLineNo">262</span> this.remoteableMethods = null;<a name="line.262"></a>
+<span class="sourceLineNo">263</span> this.proxyableMethods = null;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> this.publicMethods = null;<a name="line.264"></a>
+<span class="sourceLineNo">265</span> this.beanContext = null;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> this.serializedClassMeta = this;<a name="line.266"></a>
+<span class="sourceLineNo">267</span> this.elementType = null;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> this.keyType = null;<a name="line.268"></a>
+<span class="sourceLineNo">269</span> this.valueType = null;<a name="line.269"></a>
+<span class="sourceLineNo">270</span> this.invocationHandler = null;<a name="line.270"></a>
+<span class="sourceLineNo">271</span> this.beanMeta = null;<a name="line.271"></a>
+<span class="sourceLineNo">272</span> this.dictionaryName = null;<a name="line.272"></a>
+<span class="sourceLineNo">273</span> this.resolvedDictionaryName = null;<a name="line.273"></a>
+<span class="sourceLineNo">274</span> this.notABeanReason = null;<a name="line.274"></a>
+<span class="sourceLineNo">275</span> this.pojoSwap = null;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> this.beanFilter = null;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> this.extMeta = new MetadataMap();<a name="line.277"></a>
+<span class="sourceLineNo">278</span> this.initException = null;<a name="line.278"></a>
+<span class="sourceLineNo">279</span> this.beanRegistry = null;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> @SuppressWarnings({"unchecked","rawtypes","hiding"})<a name="line.282"></a>
+<span class="sourceLineNo">283</span> private class ClassMetaBuilder<T> {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> Class<T> innerClass;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> Class<? extends T> implClass;<a name="line.285"></a>
+<span class="sourceLineNo">286</span> BeanContext beanContext;<a name="line.286"></a>
+<span class="sourceLineNo">287</span> ClassCategory cc = ClassCategory.OTHER;<a name="line.287"></a>
+<span class="sourceLineNo">288</span> boolean<a name="line.288"></a>
+<span class="sourceLineNo">289</span> isDelegate = false,<a name="line.289"></a>
+<span class="sourceLineNo">290</span> isMemberClass = false,<a name="line.290"></a>
+<span class="sourceLineNo">291</span> isAbstract = false;<a name="line.291"></a>
+<span class="sourceLineNo">292</span> Method<a name="line.292"></a>
+<span class="sourceLineNo">293</span> fromStringMethod = null,<a name="line.293"></a>
+<span class="sourceLineNo">294</span> swapMethod = null,<a name="line.294"></a>
+<span class="sourceLineNo">295</span> unswapMethod = null,<a name="line.295"></a>
+<span class="sourceLineNo">296</span> parentPropertyMethod = null,<a name="line.296"></a>
+<span class="sourceLineNo">297</span> namePropertyMethod = null;<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Constructor<T><a name="line.298"></a>
+<span class="sourceLineNo">299</span> noArgConstructor = null,<a name="line.299"></a>
+<span class="sourceLineNo">300</span> stringConstructor = null,<a name="line.300"></a>
+<span class="sourceLineNo">301</span> swapConstructor = null,<a name="line.301"></a>
+<span class="sourceLineNo">302</span> numberConstructor = null;<a name="line.302"></a>
+<span class="sourceLineNo">303</span> Class<?><a name="line.303"></a>
+<span class="sourceLineNo">304</span> swapMethodType = null,<a name="line.304"></a>
+<span class="sourceLineNo">305</span> numberConstructorType = null;<a name="line.305"></a>
+<span class="sourceLineNo">306</span> Object primitiveDefault = null;<a name="line.306"></a>
+<span class="sourceLineNo">307</span> Map<String,Method><a name="line.307"></a>
+<span class="sourceLineNo">308</span> publicMethods = new LinkedHashMap<String,Method>(),<a name="line.308"></a>
+<span class="sourceLineNo">309</span> remoteableMethods = null,<a name="line.309"></a>
+<span class="sourceLineNo">310</span> proxyableMethods = null;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> ClassMeta<?><a name="line.311"></a>
+<span class="sourceLineNo">312</span> keyType = null,<a name="line.312"></a>
+<span class="sourceLineNo">313</span> valueType = null,<a name="line.313"></a>
+<span class="sourceLineNo">314</span> elementType = null,<a name="line.314"></a>
+<span class="sourceLineNo">315</span> serializedClassMeta = null;<a name="line.315"></a>
+<span class="sourceLineNo">316</span> String<a name="line.316"></a>
+<span class="sourceLineNo">317</span> notABeanReason = null,<a name="line.317"></a>
+<span class="sourceLineNo">318</span> dictionaryName = null,<a name="line.318"></a>
+<span class="sourceLineNo">319</span> resolvedDictionaryName = null;<a name="line.319"></a>
+<span class="sourceLineNo">320</span> Throwable initException = null;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> BeanMeta beanMeta = null;<a name="line.321"></a>
+<span class="sourceLineNo">322</span> PojoSwap pojoSwap = null;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> InvocationHandler invocationHandler = null;<a name="line.323"></a>
+<span class="sourceLineNo">324</span> BeanRegistry beanRegistry = null;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> PojoSwap<?,?>[] childPojoSwaps;<a name="line.325"></a>
+<span class="sourceLineNo">326</span> ConcurrentHashMap<Class<?>,PojoSwap<?,?>><a name="line.326"></a>
+<span class="sourceLineNo">327</span> childSwapMap,<a name="line.327"></a>
+<span class="sourceLineNo">328</span> childUnswapMap;<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span> private ClassMetaBuilder(Class<T> innerClass, BeanContext beanContext, Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?> pojoSwap, PojoSwap<?,?>[] childPojoSwaps) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> this.innerClass = innerClass;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> this.beanContext = beanContext;<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> this.implClass = implClass;<a name="line.334"></a>
+<span class="sourceLineNo">335</span> this.childPojoSwaps = childPojoSwaps;<a name="line.335"></a>
+<span class="sourceLineNo">336</span> this.childSwapMap = childPojoSwaps == null ? null : new ConcurrentHashMap<Class<?>,PojoSwap<?,?>>();<a name="line.336"></a>
+<span class="sourceLineNo">337</span> this.childUnswapMap = childPojoSwaps == null ? null : new ConcurrentHashMap<Class<?>,PojoSwap<?,?>>();<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> Class<T> c = innerClass;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> if (c.isPrimitive()) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> if (c == Boolean.TYPE)<a name="line.341"></a>
+<span class="sourceLineNo">342</span> cc = BOOLEAN;<a name="line.342"></a>
+<span class="sourceLineNo">343</span> else if (c == Byte.TYPE || c == Short.TYPE || c == Integer.TYPE || c == Long.TYPE || c == Float.TYPE || c == Double.TYPE) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> if (c == Float.TYPE || c == Double.TYPE)<a name="line.344"></a>
+<span class="sourceLineNo">345</span> cc = DECIMAL;<a name="line.345"></a>
+<span class="sourceLineNo">346</span> else<a name="line.346"></a>
+<span class="sourceLineNo">347</span> cc = NUMBER;<a name="line.347"></a>
+<span class="sourceLineNo">348</span> }<a name="line.348"></a>
+<span class="sourceLineNo">349</span> else if (c == Character.TYPE)<a name="line.349"></a>
+<span class="sourceLineNo">350</span> cc = CHAR;<a name="line.350"></a>
+<span class="sourceLineNo">351</span> else if (c == void.class || c == Void.class)<a name="line.351"></a>
+<span class="sourceLineNo">352</span> cc = VOID;<a name="line.352"></a>
+<span class="sourceLineNo">353</span> } else {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> if (isParentClass(Delegate.class, c))<a name="line.354"></a>
+<span class="sourceLineNo">355</span> isDelegate = true;<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> if (c == Object.class)<a name="line.357"></a>
+<span class="sourceLineNo">358</span> cc = OBJ;<a name="line.358"></a>
+<span class="sourceLineNo">359</span> else if (c.isEnum())<a name="line.359"></a>
+<span class="sourceLineNo">360</span> cc = ENUM;<a name="line.360"></a>
+<span class="sourceLineNo">361</span> else if (c.equals(Class.class))<a name="line.361"></a>
+<span class="sourceLineNo">362</span> cc = CLASS;<a name="line.362"></a>
+<span class="sourceLineNo">363</span> else if (isParentClass(CharSequence.class, c)) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> if (c.equals(String.class))<a name="line.364"></a>
+<span class="sourceLineNo">365</span> cc = STR;<a name="line.365"></a>
+<span class="sourceLineNo">366</span> else<a name="line.366"></a>
+<span class="sourceLineNo">367</span> cc = CHARSEQ;<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span> else if (isParentClass(Number.class, c)) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> if (isParentClass(Float.class, c) || isParentClass(Double.class, c))<a name="line.370"></a>
+<span class="sourceLineNo">371</span> cc = DECIMAL;<a name="line.371"></a>
+<span class="sourceLineNo">372</span> else<a name="line.372"></a>
+<span class="sourceLineNo">373</span> cc = NUMBER;<a name="line.373"></a>
+<span class="sourceLineNo">374</span> }<a name="line.374"></a>
+<span class="sourceLineNo">375</span> else if (isParentClass(Collection.class, c))<a name="line.375"></a>
+<span class="sourceLineNo">376</span> cc = COLLECTION;<a name="line.376"></a>
+<span class="sourceLineNo">377</span> else if (isParentClass(Map.class, c)) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span> if (isParentClass(BeanMap.class, c))<a name="line.378"></a>
+<span class="sourceLineNo">379</span> cc = BEANMAP;<a name="line.379"></a>
+<span class="sourceLineNo">380</span> else<a name="line.380"></a>
+<span class="sourceLineNo">381</span> cc = MAP;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span> else if (c == Character.class)<a name="line.383"></a>
+<span class="sourceLineNo">384</span> cc = CHAR;<a name="line.384"></a>
+<span class="sourceLineNo">385</span> else if (c == Boolean.class)<a name="line.385"></a>
+<span class="sourceLineNo">386</span> cc = BOOLEAN;<a name="line.386"></a>
+<span class="sourceLineNo">387</span> else if (isParentClass(Date.class, c) || isParentClass(Calendar.class, c))<a name="line.387"></a>
+<span class="sourceLineNo">388</span> cc = DATE;<a name="line.388"></a>
+<span class="sourceLineNo">389</span> else if (c.isArray())<a name="line.389"></a>
+<span class="sourceLineNo">390</span> cc = ARRAY;<a name="line.390"></a>
+<span class="sourceLineNo">391</span> else if (isParentClass(URL.class, c) || isParentClass(URI.class, c) || c.isAnnotationPresent(org.apache.juneau.annotation.URI.class))<a name="line.391"></a>
+<span class="sourceLineNo">392</span> cc = URI;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> else if (isParentClass(Reader.class, c))<a name="line.393"></a>
+<span class="sourceLineNo">394</span> cc = READER;<a name="line.394"></a>
+<span class="sourceLineNo">395</span> else if (isParentClass(InputStream.class, c))<a name="line.395"></a>
+<span class="sourceLineNo">396</span> cc = INPUTSTREAM;<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span> isMemberClass = c.isMemberClass() && ! isStatic(c);<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> // Find static fromString(String) or equivalent method.<a name="line.401"></a>
+<span class="sourceLineNo">402</span> // fromString() must be checked before valueOf() so that Enum classes can create their own<a name="line.402"></a>
+<span class="sourceLineNo">403</span> // specialized fromString() methods to override the behavior of Enum.valueOf(String).<a name="line.403"></a>
+<span class="sourceLineNo">404</span> // valueOf() is used by enums.<a name="line.404"></a>
+<span class="sourceLineNo">405</span> // parse() is used by the java logging Level class.<a name="line.405"></a>
+<span class="sourceLineNo">406</span> // forName() is used by Class and Charset<a name="line.406"></a>
+<span class="sourceLineNo">407</span> for (String methodName : new String[]{"fromString","valueOf","parse","parseString","forName","forString"}) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> if (fromStringMethod == null) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span> for (Method m : c.getMethods()) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> if (isStatic(m) && isPublic(m) && isNotDeprecated(m)) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span> String mName = m.getName();<a name="line.411"></a>
+<span class="sourceLineNo">412</span> if (mName.equals(methodName) && m.getReturnType() == c) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> Class<?>[] args = m.getParameterTypes();<a name="line.413"></a>
+<span class="sourceLineNo">414</span> if (args.length == 1 && args[0] == String.class) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> fromStringMethod = m;<a name="line.415"></a>
+<span class="sourceLineNo">416</span> break;<a name="line.416"></a>
+<span class="sourceLineNo">417</span> }<a name="line.417"></a>
+<span class="sourceLineNo">418</span> }<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
<span class="sourceLineNo">421</span> }<a name="line.421"></a>
<span class="sourceLineNo">422</span> }<a name="line.422"></a>
<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span> // Note: Primitive types are normally abstract.<a name="line.424"></a>
-<span class="sourceLineNo">425</span> isAbstract = Modifier.isAbstract(c.getModifiers()) && ! c.isPrimitive();<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span> // Find constructor(String) method if present.<a name="line.427"></a>
-<span class="sourceLineNo">428</span> for (Constructor cs : c.getConstructors()) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> if (isPublic(cs) && isNotDeprecated(cs)) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> Class<?>[] args = cs.getParameterTypes();<a name="line.430"></a>
-<span class="sourceLineNo">431</span> if (args.length == (isMemberClass ? 1 : 0) && c != Object.class && ! isAbstract) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> noArgConstructor = cs;<a name="line.432"></a>
-<span class="sourceLineNo">433</span> } else if (args.length == (isMemberClass ? 2 : 1)) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Class<?> arg = args[(isMemberClass ? 1 : 0)];<a name="line.434"></a>
-<span class="sourceLineNo">435</span> if (arg == String.class)<a name="line.435"></a>
-<span class="sourceLineNo">436</span> stringConstructor = cs;<a name="line.436"></a>
-<span class="sourceLineNo">437</span> else if (swapMethodType != null && swapMethodType.isAssignableFrom(arg))<a name="line.437"></a>
-<span class="sourceLineNo">438</span> swapConstructor = cs;<a name="line.438"></a>
-<span class="sourceLineNo">439</span> else if (cc != NUMBER && (Number.class.isAssignableFrom(arg) || (arg.isPrimitive() && (arg == int.class || arg == short.class || arg == long.class || arg == float.class || arg == double.class)))) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> numberConstructor = cs;<a name="line.440"></a>
-<span class="sourceLineNo">441</span> numberConstructorType = ClassUtils.getWrapperIfPrimitive(arg);<a name="line.441"></a>
+<span class="sourceLineNo">424</span> // Special cases<a name="line.424"></a>
+<span class="sourceLineNo">425</span> try {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (c == TimeZone.class)<a name="line.426"></a>
+<span class="sourceLineNo">427</span> fromStringMethod = c.getMethod("getTimeZone", String.class);<a name="line.427"></a>
+<span class="sourceLineNo">428</span> else if (c == Locale.class)<a name="line.428"></a>
+<span class="sourceLineNo">429</span> fromStringMethod = LocaleAsString.class.getMethod("fromString", String.class);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> } catch (NoSuchMethodException e1) {}<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span> // Find swap() method if present.<a name="line.432"></a>
+<span class="sourceLineNo">433</span> for (Method m : c.getMethods()) {<a name="line.433"></a>
+<span class="sourceLineNo">434</span> if (isPublic(m) && isNotDeprecated(m) && ! isStatic(m)) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> String mName = m.getName();<a name="line.435"></a>
+<span class="sourceLineNo">436</span> if (mName.equals("swap")) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span> Class<?>[] pt = m.getParameterTypes();<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (pt.length == 1 && pt[0] == BeanSession.class) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> swapMethod = m;<a name="line.439"></a>
+<span class="sourceLineNo">440</span> swapMethodType = m.getReturnType();<a name="line.440"></a>
+<span class="sourceLineNo">441</span> break;<a name="line.441"></a>
<span class="sourceLineNo">442</span> }<a name="line.442"></a>
<span class="sourceLineNo">443</span> }<a name="line.443"></a>
<span class="sourceLineNo">444</span> }<a name="line.444"></a>
<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span> if (c.isPrimitive()) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span> if (c == Boolean.TYPE)<a name="line.448"></a>
-<span class="sourceLineNo">449</span> primitiveDefault = BOOLEAN_DEFAULT;<a name="line.449"></a>
-<span class="sourceLineNo">450</span> else if (c == Character.TYPE)<a name="line.450"></a>
-<span class="sourceLineNo">451</span> primitiveDefault = CHARACTER_DEFAULT;<a name="line.451"></a>
-<span class="sourceLineNo">452</span> else if (c == Short.TYPE)<a name="line.452"></a>
-<span class="sourceLineNo">453</span> primitiveDefault = SHORT_DEFAULT;<a name="line.453"></a>
-<span class="sourceLineNo">454</span> else if (c == Integer.TYPE)<a name="line.454"></a>
-<span class="sourceLineNo">455</span> primitiveDefault = INTEGER_DEFAULT;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> else if (c == Long.TYPE)<a name="line.456"></a>
-<span class="sourceLineNo">457</span> primitiveDefault = LONG_DEFAULT;<a name="line.457"></a>
-<span class="sourceLineNo">458</span> else if (c == Float.TYPE)<a name="line.458"></a>
-<span class="sourceLineNo">459</span> primitiveDefault = FLOAT_DEFAULT;<a name="line.459"></a>
-<span class="sourceLineNo">460</span> else if (c == Double.TYPE)<a name="line.460"></a>
-<span class="sourceLineNo">461</span> primitiveDefault = DOUBLE_DEFAULT;<a name="line.461"></a>
-<span class="sourceLineNo">462</span> else if (c == Byte.TYPE)<a name="line.462"></a>
-<span class="sourceLineNo">463</span> primitiveDefault = BYTE_DEFAULT;<a name="line.463"></a>
-<span class="sourceLineNo">464</span> } else {<a name="line.464"></a>
-<span class="sourceLineNo">465</span> if (c == Boolean.class)<a name="line.465"></a>
-<span class="sourceLineNo">466</span> primitiveDefault = BOOLEAN_DEFAULT;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> else if (c == Character.class)<a name="line.467"></a>
-<span class="sourceLineNo">468</span> primitiveDefault = CHARACTER_DEFAULT;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> else if (c == Short.class)<a name="line.469"></a>
-<span class="sourceLineNo">470</span> primitiveDefault = SHORT_DEFAULT;<a name="line.470"></a>
-<span class="sourceLineNo">471</span> else if (c == Integer.class)<a name="line.471"></a>
-<span class="sourceLineNo">472</span> primitiveDefault = INTEGER_DEFAULT;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> else if (c == Long.class)<a name="line.473"></a>
-<span class="sourceLineNo">474</span> primitiveDefault = LONG_DEFAULT;<a name="line.474"></a>
-<span class="sourceLineNo">475</span> else if (c == Float.class)<a name="line.475"></a>
-<span class="sourceLineNo">476</span> primitiveDefault = FLOAT_DEFAULT;<a name="line.476"></a>
-<span class="sourceLineNo">477</span> else if (c == Double.class)<a name="line.477"></a>
-<span class="sourceLineNo">478</span> primitiveDefault = DOUBLE_DEFAULT;<a name="line.478"></a>
-<span class="sourceLineNo">479</span> else if (c == Byte.class)<a name="line.479"></a>
-<span class="sourceLineNo">480</span> primitiveDefault = BYTE_DEFAULT;<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span> for (Method m : c.getMethods())<a name="line.483"></a>
-<span class="sourceLineNo">484</span> if (isPublic(m) && isNotDeprecated(m))<a name="line.484"></a>
-<span class="sourceLineNo">485</span> publicMethods.put(ClassUtils.getMethodSignature(m), m);<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span> if (c.getAnnotation(Remoteable.class) != null) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> remoteableMethods = proxyableMethods = publicMethods;<a name="line.488"></a>
-<span class="sourceLineNo">489</span> } else {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> for (Method m : c.getMethods()) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> if (m.getAnnotation(Remoteable.class) != null) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> if (remoteableMethods == null)<a name="line.492"></a>
-<span class="sourceLineNo">493</span> remoteableMethods = new LinkedHashMap<String,Method>();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> remoteableMethods.put(ClassUtils.getMethodSignature(m), m);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span> }<a name="line.496"></a>
-<span class="sourceLineNo">497</span> proxyableMethods = (remoteableMethods != null ? remoteableMethods : publicMethods);<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span> if (innerClass != Object.class) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> noArgConstructor = (Constructor<T>)findNoArgConstructor(implClass == null ? innerClass : implClass, Visibility.PUBLIC);<a name="line.501"></a>
-<span class="sourceLineNo">502</span> }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span> if (beanFilter == null)<a name="line.504"></a>
-<span class="sourceLineNo">505</span> beanFilter = findBeanFilter();<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span> if (swapMethod != null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span> final Method fSwapMethod = swapMethod;<a name="line.508"></a>
-<span class="sourceLineNo">509</span> final Method fUnswapMethod = unswapMethod;<a name="line.509"></a>
-<span class="sourceLineNo">510</span> final Constructor<T> fSwapConstructor = swapConstructor;<a name="line.510"></a>
-<span class="sourceLineNo">511</span> this.pojoSwap = new PojoSwap<T,Object>(c, swapMethod.getReturnType()) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> @Override<a name="line.512"></a>
-<span class="sourceLineNo">513</span> public Object swap(BeanSession session, Object o) throws SerializeException {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> try {<a name="line.514"></a>
-<span class="sourceLineNo">515</span> return fSwapMethod.invoke(o, session);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> } catch (Exception e) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span> throw new SerializeException(e);<a name="line.517"></a>
-<span class="sourceLineNo">518</span> }<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> @Override<a name="line.520"></a>
-<span class="sourceLineNo">521</span> public T unswap(BeanSession session, Object f, ClassMeta<?> hint) throws ParseException {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> try {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> if (fUnswapMethod != null)<a name="line.523"></a>
-<span class="sourceLineNo">524</span> return (T)fUnswapMethod.invoke(null, session, f);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> if (fSwapConstructor != null)<a name="line.525"></a>
-<span class="sourceLineNo">526</span> return fSwapConstructor.newInstance(f);<a name="line.526"></a>
-<span class="sourceLineNo">527</span> return super.unswap(session, f, hint);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> } catch (Exception e) {<a name="line.528"></a>
-<span class="sourceLineNo">529</span> throw new ParseException(e);<a name="line.529"></a>
-<span class="sourceLineNo">530</span> }<a name="line.530"></a>
-<span class="sourceLineNo">531</span> }<a name="line.531"></a>
-<span class="sourceLineNo">532</span> };<a name="line.532"></a>
-<span class="sourceLineNo">533</span> }<a name="line.533"></a>
-<span class="sourceLineNo">534</span> if (this.pojoSwap == null)<a name="line.534"></a>
-<span class="sourceLineNo">535</span> this.pojoSwap = findPojoSwap();<a name="line.535"></a>
-<span class="sourceLineNo">536</span> if (this.pojoSwap == null)<a name="line.536"></a>
-<span class="sourceLineNo">537</span> this.pojoSwap = pojoSwap;<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> try {<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> // If this is an array, get the element type.<a name="line.541"></a>
-<span class="sourceLineNo">542</span> if (cc == ARRAY)<a name="line.542"></a>
-<span class="sourceLineNo">543</span> elementType = findClassMeta(innerClass.getComponentType());<a name="line.543"></a>
-<span class="sourceLineNo">544</span><a name="line.544"></a>
-<span class="sourceLineNo">545</span> // If this is a MAP, see if it's parameterized (e.g. AddressBook extends HashMap<String,Person>)<a name="line.545"></a>
-<span class="sourceLineNo">546</span> else if (cc == MAP) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> ClassMeta[] parameters = findParameters();<a name="line.547"></a>
-<span class="sourceLineNo">548</span> if (parameters != null && parameters.length == 2) {<a name="line.548"></a>
-<span class="sourceLineNo">549</span> keyType = parameters[0];<a name="line.549"></a>
-<span class="sourceLineNo">550</span> valueType = parameters[1];<a name="line.550"></a>
-<span class="sourceLineNo">551</span> } else {<a name="line.551"></a>
-<span class="sourceLineNo">552</span> keyType = findClassMeta(Object.class);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> valueType = findClassMeta(Object.class);<a name="line.553"></a>
-<span class="sourceLineNo">554</span> }<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
+<span class="sourceLineNo">446</span> // Find unswap() method if present.<a name="line.446"></a>
+<span class="sourceLineNo">447</span> if (swapMethod != null) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> for (Method m : c.getMethods()) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> if (isPublic(m) && isNotDeprecated(m) && isStatic(m)) {<a name="line.449"></a>
+<span class="sourceLineNo">450</span> String mName = m.getName();<a name="line.450"></a>
+<span class="sourceLineNo">451</span> if (mName.equals("unswap")) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> Class<?>[] pt = m.getParameterTypes();<a name="line.452"></a>
+<span class="sourceLineNo">453</span> if (pt.length == 2 && pt[0] == BeanSession.class && pt[1] == swapMethodType) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> unswapMethod = m;<a name="line.454"></a>
+<span class="sourceLineNo">455</span> break;<a name="line.455"></a>
+<span class="sourceLineNo">456</span> }<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> }<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
+<span class="sourceLineNo">462</span> // Find @NameProperty and @ParentProperty methods if present.<a name="line.462"></a>
+<span class="sourceLineNo">463</span> for (Method m : c.getDeclaredMethods()) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span> if (m.isAnnotationPresent(ParentProperty.class) && m.getParameterTypes().length == 1) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> m.setAccessible(true);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> parentPropertyMethod = m;<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span> if (m.isAnnotationPresent(NameProperty.class) && m.getParameterTypes().length == 1) {<a name="line.468"></a>
+<span class="sourceLineNo">469</span> m.setAccessible(true);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> namePropertyMethod = m;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span> }<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> // Note: Primitive types are normally abstract.<a name="line.474"></a>
+<span class="sourceLineNo">475</span> isAbstract = Modifier.isAbstract(c.getModifiers()) && ! c.isPrimitive();<a name="line.475"></a>
+<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">477</span> // Find constructor(String) method if present.<a name="line.477"></a>
+<span class="sourceLineNo">478</span> for (Constructor cs : c.getConstructors()) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> if (isPublic(cs) && isNotDeprecated(cs)) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> Class<?>[] args = cs.getParameterTypes();<a name="line.480"></a>
+<span class="sourceLineNo">481</span> if (args.length == (isMemberClass ? 1 : 0) && c != Object.class && ! isAbstract) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span> noArgConstructor = cs;<a name="line.482"></a>
+<span class="sourceLineNo">483</span> } else if (args.length == (isMemberClass ? 2 : 1)) {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> Class<?> arg = args[(isMemberClass ? 1 : 0)];<a name="line.484"></a>
+<span class="sourceLineNo">485</span> if (arg == String.class)<a name="line.485"></a>
+<span class="sourceLineNo">486</span> stringConstructor = cs;<a name="line.486"></a>
+<span class="sourceLineNo">487</span> else if (swapMethodType != null && swapMethodType.isAssignableFrom(arg))<a name="line.487"></a>
+<span class="sourceLineNo">488</span> swapConstructor = cs;<a name="line.488"></a>
+<span class="sourceLineNo">489</span> else if (cc != NUMBER && (Number.class.isAssignableFrom(arg) || (arg.isPrimitive() && (arg == int.class || arg == short.class || arg == long.class || arg == float.class || arg == double.class)))) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> numberConstructor = cs;<a name="line.490"></a>
+<span class="sourceLineNo">491</span> numberConstructorType = ClassUtils.getWrapperIfPrimitive(arg);<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span> }<a name="line.493"></a>
+<span class="sourceLineNo">494<
<TRUNCATED>
[48/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/org/apache/juneau/ClassMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ClassMeta.html b/content/site/apidocs/org/apache/juneau/ClassMeta.html
index 0bd6ec3..6ec478a 100644
--- a/content/site/apidocs/org/apache/juneau/ClassMeta.html
+++ b/content/site/apidocs/org/apache/juneau/ClassMeta.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -197,379 +197,397 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
</td>
</tr>
<tr id="i7" class="rowColor">
+<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getArg-int-">getArg</a></span>(int index)</code>
+<div class="block">Returns the argument metadata at the specified index if this is an args metadata object.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getArgs--">getArgs</a></span>()</code>
+<div class="block">Returns the argument types of this meta.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getBeanContext--">getBeanContext</a></span>()</code>
<div class="block">Returns the <a href="../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau"><code>BeanContext</code></a> that created this object.</div>
</td>
</tr>
-<tr id="i8" class="altColor">
+<tr id="i10" class="altColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getBeanMeta--">getBeanMeta</a></span>()</code>
<div class="block">Returns the <a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau"><code>BeanMeta</code></a> associated with this class.</div>
</td>
</tr>
-<tr id="i9" class="rowColor">
+<tr id="i11" class="rowColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getBeanRegistry--">getBeanRegistry</a></span>()</code>
<div class="block">Returns the bean registry for this class.</div>
</td>
</tr>
-<tr id="i10" class="altColor">
+<tr id="i12" class="altColor">
<td class="colFirst"><code>protected <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><?,?></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getChildPojoSwapForSwap-java.lang.Class-">getChildPojoSwapForSwap</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> normalClass)</code>
<div class="block">Returns the <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> where the specified class is the same/subclass of the normal class of
one of the child pojo swaps associated with this class.</div>
</td>
</tr>
-<tr id="i11" class="rowColor">
+<tr id="i13" class="rowColor">
<td class="colFirst"><code>protected <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><?,?></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getChildPojoSwapForUnswap-java.lang.Class-">getChildPojoSwapForUnswap</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> swapClass)</code>
<div class="block">Returns the <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> where the specified class is the same/subclass of the swap class of
one of the child pojo swaps associated with this class.</div>
</td>
</tr>
-<tr id="i12" class="altColor">
+<tr id="i14" class="altColor">
<td class="colFirst"><code>org.apache.juneau.ClassMeta.ClassCategory</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getClassCategory--">getClassCategory</a></span>()</code>
<div class="block">Returns the category of this class.</div>
</td>
</tr>
-<tr id="i13" class="rowColor">
+<tr id="i15" class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getConstructor--">getConstructor</a></span>()</code>
<div class="block">Returns the no-arg constructor for this class.</div>
</td>
</tr>
-<tr id="i14" class="altColor">
+<tr id="i16" 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/ClassMeta.html#getDictionaryName--">getDictionaryName</a></span>()</code>
<div class="block">Returns the bean dictionary name associated with this class.</div>
</td>
</tr>
-<tr id="i15" class="rowColor">
+<tr id="i17" class="rowColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getElementType--">getElementType</a></span>()</code>
<div class="block">For array and <code>Collection</code> types, returns the class type of the components of the array or <code>Collection</code>.</div>
</td>
</tr>
-<tr id="i16" class="altColor">
+<tr id="i18" class="altColor">
<td class="colFirst"><code><M extends <a href="../../../org/apache/juneau/ClassMetaExtended.html" title="class in org.apache.juneau">ClassMetaExtended</a>><br>M</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getExtendedMeta-java.lang.Class-">getExtendedMeta</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><M> c)</code>
<div class="block">Returns the language-specified extended metadata on this class.</div>
</td>
</tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
<td class="colFirst"><code><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></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getInitException--">getInitException</a></span>()</code>
<div class="block">Returns any exception that was throw in the <code>init()</code> method.</div>
</td>
</tr>
-<tr id="i18" class="altColor">
+<tr id="i20" 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><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getInnerClass--">getInnerClass</a></span>()</code>
<div class="block">Returns the <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> object that this class type wraps.</div>
</td>
</tr>
-<tr id="i19" class="rowColor">
+<tr id="i21" class="rowColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getKeyType--">getKeyType</a></span>()</code>
<div class="block">For <code>Map</code> types, returns the class type of the keys of the <code>Map</code>.</div>
</td>
</tr>
-<tr id="i20" class="altColor">
+<tr id="i22" class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getNameProperty--">getNameProperty</a></span>()</code>
<div class="block">Returns the method annotated with <a href="../../../org/apache/juneau/annotation/NameProperty.html" title="annotation in org.apache.juneau.annotation"><code>@NameProperty</code></a>.</div>
</td>
</tr>
-<tr id="i21" class="rowColor">
+<tr id="i23" 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="http://docs.oracle.com/javase/7/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getNewInstanceFromNumberClass--">getNewInstanceFromNumberClass</a></span>()</code>
<div class="block">Returns the class type of the parameter of the numeric constructor.</div>
</td>
</tr>
-<tr id="i22" class="altColor">
+<tr id="i24" 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/ClassMeta.html#getNotABeanReason--">getNotABeanReason</a></span>()</code>
<div class="block">Returns the reason why this class is not a bean, or <jk>null</jk> if it is a bean.</div>
</td>
</tr>
-<tr id="i23" class="rowColor">
+<tr id="i25" class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getParentProperty--">getParentProperty</a></span>()</code>
<div class="block">Returns the method annotated with <a href="../../../org/apache/juneau/annotation/ParentProperty.html" title="annotation in org.apache.juneau.annotation"><code>@ParentProperty</code></a>.</div>
</td>
</tr>
-<tr id="i24" class="altColor">
+<tr id="i26" class="altColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>,?></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getPojoSwap--">getPojoSwap</a></span>()</code>
<div class="block">Returns the <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> associated with this class.</div>
</td>
</tr>
-<tr id="i25" class="rowColor">
+<tr id="i27" class="rowColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getPrimitiveDefault--">getPrimitiveDefault</a></span>()</code>
<div class="block">Returns the default value for primitives such as <jk>int</jk> or <jk>Integer</jk>.</div>
</td>
</tr>
-<tr id="i26" class="altColor">
+<tr id="i28" class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getProxyableMethods--">getProxyableMethods</a></span>()</code>
<div class="block">All methods on this class that can be exposed as a proxy method.</div>
</td>
</tr>
-<tr id="i27" class="rowColor">
+<tr id="i29" class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/InvocationHandler.html?is-external=true" title="class or interface in java.lang.reflect">InvocationHandler</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getProxyInvocationHandler--">getProxyInvocationHandler</a></span>()</code>
<div class="block">Returns the interface proxy invocation handler for this class.</div>
</td>
</tr>
-<tr id="i28" class="altColor">
+<tr id="i30" class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getPublicMethods--">getPublicMethods</a></span>()</code>
<div class="block">All public methods on this class including static methods.</div>
</td>
</tr>
-<tr id="i29" class="rowColor">
+<tr id="i31" 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/ClassMeta.html#getReadableName--">getReadableName</a></span>()</code>
<div class="block">Returns a readable name for this class (e.g.</div>
</td>
</tr>
-<tr id="i30" class="altColor">
+<tr id="i32" class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getRemoteableMethods--">getRemoteableMethods</a></span>()</code>
<div class="block">All methods on this class annotated with <a href="../../../org/apache/juneau/annotation/Remoteable.html" title="annotation in org.apache.juneau.annotation"><code>@Remotable</code></a>, or all public methods if class is annotated.</div>
</td>
</tr>
-<tr id="i31" class="rowColor">
+<tr id="i33" 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/ClassMeta.html#getResolvedDictionaryName--">getResolvedDictionaryName</a></span>()</code>
<div class="block">Returns the resolved bean dictionary name associated with this class.</div>
</td>
</tr>
-<tr id="i32" class="altColor">
+<tr id="i34" class="altColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getSerializedClassMeta--">getSerializedClassMeta</a></span>()</code>
<div class="block">Returns the serialized (swapped) form of this class if there is an <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> associated with it.</div>
</td>
</tr>
-<tr id="i33" class="rowColor">
+<tr id="i35" class="rowColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#getValueType--">getValueType</a></span>()</code>
<div class="block">For <code>Map</code> types, returns the class type of the values of the <code>Map</code>.</div>
</td>
</tr>
-<tr id="i34" class="altColor">
+<tr id="i36" class="altColor">
<td class="colFirst"><code>protected boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#hasChildPojoSwaps--">hasChildPojoSwaps</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class or any child classes has a <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> associated with it.</div>
</td>
</tr>
-<tr id="i35" class="rowColor">
+<tr id="i37" class="rowColor">
<td class="colFirst"><code>int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#hashCode--">hashCode</a></span>()</code> </td>
</tr>
-<tr id="i36" class="altColor">
+<tr id="i38" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isAbstract--">isAbstract</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is abstract.</div>
</td>
</tr>
-<tr id="i37" class="rowColor">
+<tr id="i39" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isArgs--">isArgs</a></span>()</code>
+<div class="block">Returns <jk>true</jk> if this metadata represents an array of argument types.</div>
+</td>
+</tr>
+<tr id="i40" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isArray--">isArray</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is an array.</div>
</td>
</tr>
-<tr id="i38" class="altColor">
+<tr id="i41" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isAssignableFrom-java.lang.Class-">isAssignableFrom</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</code>
<div class="block">Returns <jk>true</jk> if this class is a superclass of or the same as the specified class.</div>
</td>
</tr>
-<tr id="i39" class="rowColor">
+<tr id="i42" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isBean--">isBean</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a bean.</div>
</td>
</tr>
-<tr id="i40" class="altColor">
+<tr id="i43" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isBeanMap--">isBeanMap</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="../../../org/apache/juneau/BeanMap.html" title="class in org.apache.juneau"><code>BeanMap</code></a>.</div>
</td>
</tr>
-<tr id="i41" class="rowColor">
+<tr id="i44" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isBoolean--">isBoolean</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang"><code>Boolean</code></a>.</div>
</td>
</tr>
-<tr id="i42" class="altColor">
+<tr id="i45" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isChar--">isChar</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Character.html?is-external=true" title="class or interface in java.lang"><code>Character</code></a>.</div>
</td>
</tr>
-<tr id="i43" class="rowColor">
+<tr id="i46" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isCharSequence--">isCharSequence</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang"><code>CharSequence</code></a>.</div>
</td>
</tr>
-<tr id="i44" class="altColor">
+<tr id="i47" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isClass--">isClass</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a>.</div>
</td>
</tr>
-<tr id="i45" class="rowColor">
+<tr id="i48" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isCollection--">isCollection</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a>.</div>
</td>
</tr>
-<tr id="i46" class="altColor">
+<tr id="i49" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isCollectionOrArray--">isCollectionOrArray</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a> or is an array.</div>
</td>
</tr>
-<tr id="i47" class="rowColor">
+<tr id="i50" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isDate--">isDate</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Date</code></a> or <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util"><code>Calendar</code></a>.</div>
</td>
</tr>
-<tr id="i48" class="altColor">
+<tr id="i51" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isDecimal--">isDecimal</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Float.html?is-external=true" title="class or interface in java.lang"><code>Float</code></a> or <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Double.html?is-external=true" title="class or interface in java.lang"><code>Double</code></a>.</div>
</td>
</tr>
-<tr id="i49" class="rowColor">
+<tr id="i52" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isDelegate--">isDelegate</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class implements <a href="../../../org/apache/juneau/Delegate.html" title="interface in org.apache.juneau"><code>Delegate</code></a>, meaning
it's a representation of some other object.</div>
</td>
</tr>
-<tr id="i50" class="altColor">
+<tr id="i53" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isEnum--">isEnum</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><code>Enum</code></a>.</div>
</td>
</tr>
-<tr id="i51" class="rowColor">
+<tr id="i54" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isInputStream--">isInputStream</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is an <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io"><code>InputStream</code></a>.</div>
</td>
</tr>
-<tr id="i52" class="altColor">
+<tr id="i55" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isInstance-java.lang.Object-">isInstance</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</code>
<div class="block">Returns <jk>true</jk> if the specified object is an instance of this class.</div>
</td>
</tr>
-<tr id="i53" class="rowColor">
+<tr id="i56" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isInstanceOf-java.lang.Class-">isInstanceOf</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</code>
<div class="block">Returns <jk>true</jk> if this class is a subclass of or the same as the specified class.</div>
</td>
</tr>
-<tr id="i54" class="altColor">
+<tr id="i57" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isMap--">isMap</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a>.</div>
</td>
</tr>
-<tr id="i55" class="rowColor">
+<tr id="i58" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isMapOrBean--">isMapOrBean</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> or it's a bean.</div>
</td>
</tr>
-<tr id="i56" class="altColor">
+<tr id="i59" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isMemberClass--">isMemberClass</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is an inner class.</div>
</td>
</tr>
-<tr id="i57" class="rowColor">
+<tr id="i60" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isNotObject--">isNotObject</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is not <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><code>Object</code></a>.</div>
</td>
</tr>
-<tr id="i58" class="altColor">
+<tr id="i61" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isNullable--">isNullable</a></span>()</code>
<div class="block">Returns <jk>true</jk> if instance of this object can be <jk>null</jk>.</div>
</td>
</tr>
-<tr id="i59" class="rowColor">
+<tr id="i62" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isNumber--">isNumber</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang"><code>Number</code></a>.</div>
</td>
</tr>
-<tr id="i60" class="altColor">
+<tr id="i63" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isObject--">isObject</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><code>Object</code></a>.</div>
</td>
</tr>
-<tr id="i61" class="rowColor">
+<tr id="i64" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isPrimitive--">isPrimitive</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a primitive.</div>
</td>
</tr>
-<tr id="i62" class="altColor">
+<tr id="i65" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isReader--">isReader</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a>.</div>
</td>
</tr>
-<tr id="i63" class="rowColor">
+<tr id="i66" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isRemoteable--">isRemoteable</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class or one of it's methods are annotated with <a href="../../../org/apache/juneau/annotation/Remoteable.html" title="annotation in org.apache.juneau.annotation"><code>@Remotable</code></a>.</div>
</td>
</tr>
-<tr id="i64" class="altColor">
+<tr id="i67" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isString--">isString</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.</div>
</td>
</tr>
-<tr id="i65" class="rowColor">
+<tr id="i68" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isUri--">isUri</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a> or <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>.</div>
</td>
</tr>
-<tr id="i66" class="altColor">
+<tr id="i69" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#isVoid--">isVoid</a></span>()</code>
<div class="block">Returns <jk>true</jk> if this class is <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Void.html?is-external=true" title="class or interface in java.lang"><code>Void</code></a> or <jk>void</jk>.</div>
</td>
</tr>
-<tr id="i67" class="rowColor">
+<tr id="i70" class="altColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#newInstance--">newInstance</a></span>()</code>
<div class="block">Create a new instance of the main class of this declared type.</div>
</td>
</tr>
-<tr id="i68" class="altColor">
+<tr id="i71" class="rowColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#newInstance-java.lang.Object-">newInstance</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer)</code>
<div class="block">Same as <a href="../../../org/apache/juneau/ClassMeta.html#newInstance--"><code>newInstance()</code></a> except for instantiating non-static member classes.</div>
</td>
</tr>
-<tr id="i69" class="rowColor">
+<tr id="i72" class="altColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#newInstanceFromNumber-org.apache.juneau.BeanSession-java.lang.Object-java.lang.Number-">newInstanceFromNumber</a></span>(<a href="../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a> session,
<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> outer,
@@ -577,31 +595,31 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<div class="block">Create a new instance of the main class of this declared type from a <code>Number</code> input.</div>
</td>
</tr>
-<tr id="i70" class="altColor">
+<tr id="i73" class="rowColor">
<td class="colFirst"><code><a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#newInstanceFromString-java.lang.Object-java.lang.String-">newInstanceFromString</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> arg)</code>
<div class="block">Create a new instance of the main class of this declared type from a <code>String</code> input.</div>
</td>
</tr>
-<tr id="i71" class="rowColor">
+<tr id="i74" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#same-org.apache.juneau.ClassMeta-">same</a></span>(<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> cm)</code>
<div class="block">Similar to <a href="../../../org/apache/juneau/ClassMeta.html#equals-java.lang.Object-"><code>equals(Object)</code></a> except primitive and Object types that are similar
are considered the same.</div>
</td>
</tr>
-<tr id="i72" class="altColor">
+<tr id="i75" 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/ClassMeta.html#toString--">toString</a></span>()</code> </td>
</tr>
-<tr id="i73" class="rowColor">
+<tr id="i76" 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/ClassMeta.html#toString-boolean-">toString</a></span>(boolean simple)</code>
<div class="block">Same as <a href="../../../org/apache/juneau/ClassMeta.html#toString--"><code>toString()</code></a> except use simple class names.</div>
</td>
</tr>
-<tr id="i74" class="altColor">
+<tr id="i77" class="rowColor">
<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang">StringBuilder</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/ClassMeta.html#toString-java.lang.StringBuilder-boolean-">toString</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang">StringBuilder</a> sb,
boolean simple)</code>
@@ -643,7 +661,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getDictionaryName</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/ClassMeta.html#line.657">getDictionaryName</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.707">getDictionaryName</a>()</pre>
<div class="block">Returns the bean dictionary name associated with this class.
<p>
The lexical name is defined by <a href="../../../org/apache/juneau/annotation/Bean.html#typeName--"><code>Bean.typeName()</code></a>.</div>
@@ -659,7 +677,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getResolvedDictionaryName</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/ClassMeta.html#line.669">getResolvedDictionaryName</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.719">getResolvedDictionaryName</a>()</pre>
<div class="block">Returns the resolved bean dictionary name associated with this class.
<p>
Unlike <a href="../../../org/apache/juneau/ClassMeta.html#getDictionaryName--"><code>getDictionaryName()</code></a>, this method automatically resolves multidimensional arrays
@@ -676,7 +694,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getBeanRegistry</h4>
-<pre>public <a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.682">getBeanRegistry</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.732">getBeanRegistry</a>()</pre>
<div class="block">Returns the bean registry for this class.
<p>
This bean registry contains names specified in the <a href="../../../org/apache/juneau/annotation/Bean.html#beanDictionary--"><code>Bean.beanDictionary()</code></a> annotation defined
@@ -694,7 +712,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getClassCategory</h4>
-<pre>public org.apache.juneau.ClassMeta.ClassCategory <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.691">getClassCategory</a>()</pre>
+<pre>public org.apache.juneau.ClassMeta.ClassCategory <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.741">getClassCategory</a>()</pre>
<div class="block">Returns the category of this class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -708,7 +726,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>isAssignableFrom</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.701">isAssignableFrom</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.751">isAssignableFrom</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</pre>
<div class="block">Returns <jk>true</jk> if this class is a superclass of or the same as the specified class.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -724,7 +742,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>isInstanceOf</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.711">isInstanceOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.761">isInstanceOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of or the same as the specified class.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -740,7 +758,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>hasChildPojoSwaps</h4>
-<pre>protected boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.723">hasChildPojoSwaps</a>()</pre>
+<pre>protected boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.773">hasChildPojoSwaps</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class or any child classes has a <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> associated with it.
<p>
Used when transforming bean properties to prevent having to look up transforms if we know for certain
@@ -757,7 +775,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getChildPojoSwapForSwap</h4>
-<pre>protected <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><?,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.734">getChildPojoSwapForSwap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> normalClass)</pre>
+<pre>protected <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><?,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.784">getChildPojoSwapForSwap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> normalClass)</pre>
<div class="block">Returns the <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> where the specified class is the same/subclass of the normal class of
one of the child pojo swaps associated with this class.</div>
<dl>
@@ -774,7 +792,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getChildPojoSwapForUnswap</h4>
-<pre>protected <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><?,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.761">getChildPojoSwapForUnswap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> swapClass)</pre>
+<pre>protected <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><?,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.811">getChildPojoSwapForUnswap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> swapClass)</pre>
<div class="block">Returns the <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> where the specified class is the same/subclass of the swap class of
one of the child pojo swaps associated with this class.</div>
<dl>
@@ -791,7 +809,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>findNoArgConstructor</h4>
-<pre>protected static <T> <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends T> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.792">findNoArgConstructor</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c,
+<pre>protected static <T> <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends T> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.842">findNoArgConstructor</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c,
<a href="../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a> v)</pre>
<div class="block">Locates the no-arg constructor for the specified class.
Constructor must match the visibility requirements specified by parameter 'v'.
@@ -812,7 +830,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getInnerClass</h4>
-<pre>public <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><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.810">getInnerClass</a>()</pre>
+<pre>public <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><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.860">getInnerClass</a>()</pre>
<div class="block">Returns the <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> object that this class type wraps.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -827,7 +845,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<li class="blockList">
<h4>getSerializedClassMeta</h4>
<pre><a href="../../../org/apache/juneau/annotation/BeanIgnore.html" title="annotation in org.apache.juneau.annotation">@BeanIgnore</a>
-public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.820">getSerializedClassMeta</a>()</pre>
+public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.870">getSerializedClassMeta</a>()</pre>
<div class="block">Returns the serialized (swapped) form of this class if there is an <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> associated with it.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -841,7 +859,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getElementType</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.829">getElementType</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.879">getElementType</a>()</pre>
<div class="block">For array and <code>Collection</code> types, returns the class type of the components of the array or <code>Collection</code>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -855,7 +873,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getKeyType</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.838">getKeyType</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.888">getKeyType</a>()</pre>
<div class="block">For <code>Map</code> types, returns the class type of the keys of the <code>Map</code>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -869,7 +887,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getValueType</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.847">getValueType</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.897">getValueType</a>()</pre>
<div class="block">For <code>Map</code> types, returns the class type of the values of the <code>Map</code>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -883,7 +901,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isDelegate</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.857">isDelegate</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.907">isDelegate</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class implements <a href="../../../org/apache/juneau/Delegate.html" title="interface in org.apache.juneau"><code>Delegate</code></a>, meaning
it's a representation of some other object.</div>
<dl>
@@ -898,7 +916,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isMap</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.866">isMap</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.916">isMap</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -912,7 +930,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isMapOrBean</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.875">isMapOrBean</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.925">isMapOrBean</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> or it's a bean.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -926,7 +944,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isBeanMap</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.884">isBeanMap</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.934">isBeanMap</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="../../../org/apache/juneau/BeanMap.html" title="class in org.apache.juneau"><code>BeanMap</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -940,7 +958,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isCollection</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.893">isCollection</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.943">isCollection</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -954,7 +972,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isCollectionOrArray</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.902">isCollectionOrArray</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.952">isCollectionOrArray</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a> or is an array.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -968,7 +986,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isClass</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.911">isClass</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.961">isClass</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -982,7 +1000,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isEnum</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.920">isEnum</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.970">isEnum</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><code>Enum</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -996,7 +1014,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isArray</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.929">isArray</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.979">isArray</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is an array.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1010,7 +1028,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isBean</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.938">isBean</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.988">isBean</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a bean.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1024,7 +1042,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isObject</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.947">isObject</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.997">isObject</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><code>Object</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1038,7 +1056,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isNotObject</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.956">isNotObject</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1006">isNotObject</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is not <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><code>Object</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1052,7 +1070,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isNumber</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.965">isNumber</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1015">isNumber</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang"><code>Number</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1066,7 +1084,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isDecimal</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.974">isDecimal</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1024">isDecimal</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Float.html?is-external=true" title="class or interface in java.lang"><code>Float</code></a> or <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Double.html?is-external=true" title="class or interface in java.lang"><code>Double</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1080,7 +1098,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isBoolean</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.983">isBoolean</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1033">isBoolean</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang"><code>Boolean</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1094,7 +1112,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isCharSequence</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.992">isCharSequence</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1042">isCharSequence</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang"><code>CharSequence</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1108,7 +1126,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isString</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1001">isString</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1051">isString</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1122,7 +1140,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isChar</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1010">isChar</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1060">isChar</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Character.html?is-external=true" title="class or interface in java.lang"><code>Character</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1136,7 +1154,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isPrimitive</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1019">isPrimitive</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1069">isPrimitive</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a primitive.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1150,7 +1168,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isDate</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1028">isDate</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1078">isDate</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Date</code></a> or <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util"><code>Calendar</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1164,7 +1182,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isUri</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1037">isUri</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1087">isUri</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a> or <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1178,7 +1196,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isReader</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1046">isReader</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1096">isReader</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1192,7 +1210,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isInputStream</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1055">isInputStream</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1105">isInputStream</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is an <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io"><code>InputStream</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1206,7 +1224,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isVoid</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1064">isVoid</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1114">isVoid</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Void.html?is-external=true" title="class or interface in java.lang"><code>Void</code></a> or <jk>void</jk>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1214,13 +1232,59 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
</dl>
</li>
</ul>
+<a name="isArgs--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isArgs</h4>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1123">isArgs</a>()</pre>
+<div class="block">Returns <jk>true</jk> if this metadata represents an array of argument types.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if this metadata represents an array of argument types.</dd>
+</dl>
+</li>
+</ul>
+<a name="getArgs--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getArgs</h4>
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1132">getArgs</a>()</pre>
+<div class="block">Returns the argument types of this meta.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The argument types of this meta, or <jk>null</jk> if this isn't an array of argument types.</dd>
+</dl>
+</li>
+</ul>
+<a name="getArg-int-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getArg</h4>
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1143">getArg</a>(int index)</pre>
+<div class="block">Returns the argument metadata at the specified index if this is an args metadata object.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>index</code> - The argument index.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The The argument metadata. Never <jk>null</jk>.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../org/apache/juneau/BeanRuntimeException.html" title="class in org.apache.juneau">BeanRuntimeException</a></code> - If this metadata object is not a list of arguments, or the index is out of range.</dd>
+</dl>
+</li>
+</ul>
<a name="isNullable--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>isNullable</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1076">isNullable</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1157">isNullable</a>()</pre>
<div class="block">Returns <jk>true</jk> if instance of this object can be <jk>null</jk>.
<p>
Objects can be <jk>null</jk>, but primitives cannot, except for chars which can be represented
@@ -1237,7 +1301,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isRemoteable</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1087">isRemoteable</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1168">isRemoteable</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class or one of it's methods are annotated with <a href="../../../org/apache/juneau/annotation/Remoteable.html" title="annotation in org.apache.juneau.annotation"><code>@Remotable</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1251,7 +1315,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isAbstract</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1095">isAbstract</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1176">isAbstract</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is abstract.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1265,7 +1329,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isMemberClass</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1103">isMemberClass</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1184">isMemberClass</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is an inner class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1279,7 +1343,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getRemoteableMethods</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1113">getRemoteableMethods</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1194">getRemoteableMethods</a>()</pre>
<div class="block">All methods on this class annotated with <a href="../../../org/apache/juneau/annotation/Remoteable.html" title="annotation in org.apache.juneau.annotation"><code>@Remotable</code></a>, or all public methods if class is annotated.
Keys are method signatures.</div>
<dl>
@@ -1294,7 +1358,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getProxyableMethods</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1124">getProxyableMethods</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1205">getProxyableMethods</a>()</pre>
<div class="block">All methods on this class that can be exposed as a proxy method.
<p>
Same as <a href="../../../org/apache/juneau/ClassMeta.html#getRemoteableMethods--"><code>getRemoteableMethods()</code></a> except returns all public methods if class is not annotated with <a href="../../../org/apache/juneau/annotation/Remoteable.html" title="annotation in org.apache.juneau.annotation"><code>@Remotable</code></a>.</div>
@@ -1310,7 +1374,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getPublicMethods</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1134">getPublicMethods</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1215">getPublicMethods</a>()</pre>
<div class="block">All public methods on this class including static methods.
Keys are method signatures.</div>
<dl>
@@ -1325,7 +1389,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getPojoSwap</h4>
-<pre>public <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1144">getPojoSwap</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1225">getPojoSwap</a>()</pre>
<div class="block">Returns the <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> associated with this class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1340,7 +1404,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getBeanMeta</h4>
-<pre>public <a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1154">getBeanMeta</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1235">getBeanMeta</a>()</pre>
<div class="block">Returns the <a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau"><code>BeanMeta</code></a> associated with this class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1355,7 +1419,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getConstructor</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1163">getConstructor</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1244">getConstructor</a>()</pre>
<div class="block">Returns the no-arg constructor for this class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1369,7 +1433,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getExtendedMeta</h4>
-<pre>public <M extends <a href="../../../org/apache/juneau/ClassMetaExtended.html" title="class in org.apache.juneau">ClassMetaExtended</a>> M <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1173">getExtendedMeta</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><M> c)</pre>
+<pre>public <M extends <a href="../../../org/apache/juneau/ClassMetaExtended.html" title="class in org.apache.juneau">ClassMetaExtended</a>> M <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1254">getExtendedMeta</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><M> c)</pre>
<div class="block">Returns the language-specified extended metadata on this class.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1385,7 +1449,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getProxyInvocationHandler</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/InvocationHandler.html?is-external=true" title="class or interface in java.lang.reflect">InvocationHandler</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1182">getProxyInvocationHandler</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/InvocationHandler.html?is-external=true" title="class or interface in java.lang.reflect">InvocationHandler</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1263">getProxyInvocationHandler</a>()</pre>
<div class="block">Returns the interface proxy invocation handler for this class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1399,7 +1463,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>canCreateNewInstance</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1191">canCreateNewInstance</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1272">canCreateNewInstance</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class has a no-arg constructor or invocation handler.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1413,7 +1477,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>canCreateNewInstance</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1211">canCreateNewInstance</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&
<TRUNCATED>