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/05/21 09:02:54 UTC

[01/39] incubator-juneau-website git commit: Javadoc updates.

Repository: incubator-juneau-website
Updated Branches:
  refs/heads/asf-site e53bcce45 -> 37ddf4343


http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlWriter.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlWriter.html
index 9d4216b..16ef244 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlWriter.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlWriter.html
@@ -22,628 +22,631 @@
 <span class="sourceLineNo">014</span><a name="line.14"></a>
 <span class="sourceLineNo">015</span>import java.io.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.serializer.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.xml.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> * Specialized writer for serializing XML.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * &lt;p&gt;<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;ul&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *    &lt;li&gt;This class is not intended for external use.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * &lt;/ul&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> */<a name="line.27"></a>
-<span class="sourceLineNo">028</span>public class XmlWriter extends SerializerWriter {<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>   private String defaultNsPrefix;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>   private boolean enableNs;<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>    * Constructor.<a name="line.34"></a>
-<span class="sourceLineNo">035</span>    *<a name="line.35"></a>
-<span class="sourceLineNo">036</span>    * @param out The wrapped writer.<a name="line.36"></a>
-<span class="sourceLineNo">037</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt; XML elements will be indented.<a name="line.37"></a>
-<span class="sourceLineNo">038</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings should be trimmed before they're serialized.<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    * @param quoteChar The quote character to use for attributes.  Should be &lt;js&gt;'\''&lt;/js&gt; or &lt;js&gt;'"'&lt;/js&gt;.<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    * @param relativeUriBase The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;).<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    * @param absolutePathUriBase The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;).<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    * @param enableNs Flag to indicate if XML namespaces are enabled.<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    * @param defaultNamespace The default namespace if XML namespaces are enabled.<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>   public XmlWriter(Writer out, boolean useWhitespace, boolean trimStrings, char quoteChar, String relativeUriBase, String absolutePathUriBase, boolean enableNs, Namespace defaultNamespace) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span>      super(out, useWhitespace, trimStrings, quoteChar, relativeUriBase, absolutePathUriBase);<a name="line.46"></a>
-<span class="sourceLineNo">047</span>      this.enableNs = enableNs;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>      this.defaultNsPrefix = defaultNamespace == null ? null : defaultNamespace.name;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   }<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>   /**<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * Writes an opening tag to the output:  &lt;code&gt;&lt;xt&gt;&amp;lt;ns:name&lt;/xt&gt;&lt;/code&gt;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    *<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    * @param name The element name.<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * @return This object (for method chaining).<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    * @throws IOException If a problem occurred.<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    */<a name="line.59"></a>
-<span class="sourceLineNo">060</span>   public XmlWriter oTag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      append('&lt;');<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      if (enableNs &amp;&amp; ns != null &amp;&amp; ! (ns.isEmpty() || ns.equals(defaultNsPrefix)))<a name="line.62"></a>
-<span class="sourceLineNo">063</span>         append(ns).append(':');<a name="line.63"></a>
-<span class="sourceLineNo">064</span>      if (needsEncoding)<a name="line.64"></a>
-<span class="sourceLineNo">065</span>         XmlUtils.encodeElementName(out, name);<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      else<a name="line.66"></a>
-<span class="sourceLineNo">067</span>         append(name);<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      return this;<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>    * Shortcut for &lt;code&gt;oTag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    *<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    * @param name The element name.<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    * @return This object (for method chaining).<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    * @throws IOException If a problem occurred.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    */<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   public XmlWriter oTag(String ns, String name) throws IOException {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      return oTag(ns, name, false);<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>    * Shortcut for &lt;code&gt;oTag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    *<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    * @param name The element name.<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    * @return This object (for method chaining).<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    * @throws IOException If a problem occurred.<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    */<a name="line.89"></a>
-<span class="sourceLineNo">090</span>   public XmlWriter oTag(String name) throws IOException {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      return oTag(null, name, false);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>   }<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>   /**<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    * Shortcut for &lt;code&gt;i(indent).oTag(ns, name, needsEncoding);&lt;/code&gt;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    *<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    * @param indent The number of prefix tabs to add.<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    * @param name The element name.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    * @return This object (for method chaining).<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    * @throws IOException If a problem occurred.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    */<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   public XmlWriter oTag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      return i(indent).oTag(ns, name, needsEncoding);<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>   /**<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    * Shortcut for &lt;code&gt;i(indent).oTag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    *<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    * @param indent The number of prefix tabs to add.<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    * @param name The element name.<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    * @return This object (for method chaining).<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    * @throws IOException If a problem occurred.<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    */<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   public XmlWriter oTag(int indent, String ns, String name) throws IOException {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      return i(indent).oTag(ns, name, false);<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>    * Shortcut for &lt;code&gt;i(indent).oTag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    *<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    * @param indent The number of prefix tabs to add.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    * @param name The element name.<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>    * @throws IOException If a problem occurred.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    */<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   public XmlWriter oTag(int indent, String name) throws IOException {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      return i(indent).oTag(null, name, false);<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>    * Closes a tag.<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    * Shortcut for &lt;code&gt;append(&lt;js&gt;'&gt;'&lt;/js&gt;);&lt;/code&gt;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    *<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    * @return This object (for method chaining).<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    * @throws IOException<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    */<a name="line.139"></a>
-<span class="sourceLineNo">140</span>   public XmlWriter cTag() throws IOException {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      append('&gt;');<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      return this;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>   /**<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    * Closes an empty tag.<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    * Shortcut for &lt;code&gt;append(&lt;js&gt;'/'&lt;/js&gt;).append(&lt;js&gt;'&gt;'&lt;/js&gt;);&lt;/code&gt;<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    *<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    * @return This object (for method chaining).<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    * @throws IOException<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    */<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   public XmlWriter ceTag() throws IOException {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      append('/').append('&gt;');<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return this;<a name="line.154"></a>
-<span class="sourceLineNo">155</span>   }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>   /**<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    * Writes a closed tag to the output:  &lt;code&gt;&lt;xt&gt;&amp;lt;ns:name/&amp;gt;&lt;/xt&gt;&lt;/code&gt;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    *<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    * @param name The element name.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    * @return This object (for method chaining).<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    * @throws IOException If a problem occurred.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   public XmlWriter tag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      append('&lt;');<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      if (enableNs &amp;&amp; ns != null &amp;&amp; ! (ns.isEmpty() || ns.equals(defaultNsPrefix)))<a name="line.168"></a>
-<span class="sourceLineNo">169</span>         append(ns).append(':');<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      if (needsEncoding)<a name="line.170"></a>
-<span class="sourceLineNo">171</span>         XmlUtils.encodeElementName(out, name);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      else<a name="line.172"></a>
-<span class="sourceLineNo">173</span>         append(name);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      return append('/').append('&gt;');<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>    * Shortcut for &lt;code&gt;tag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    *<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    * @param name The element name.<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>    * @throws IOException If a problem occurred.<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    */<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   public XmlWriter tag(String ns, String name) throws IOException {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      return tag(ns, name, false);<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>    * Shortcut for &lt;code&gt;tag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    *<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    * @param name The element name.<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>    * @throws IOException If a problem occurred.<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    */<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   public XmlWriter tag(String name) throws IOException {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      return tag(null, name, false);<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>    * Shortcut for &lt;code&gt;i(indent).tag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    *<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    * @param indent The number of prefix tabs to add.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    * @param name The element name.<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>    * @throws IOException If a problem occurred.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   public XmlWriter tag(int indent, String name) throws IOException {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      return i(indent).tag(name);<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>    * Shortcut for &lt;code&gt;i(indent).tag(ns, name, needsEncoding);&lt;/code&gt;<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    *<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    * @param indent The number of prefix tabs to add.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    * @param name The element name.<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<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>    * @throws IOException If a problem occurred.<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    */<a name="line.221"></a>
-<span class="sourceLineNo">222</span>   public XmlWriter tag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      return i(indent).tag(ns, name, needsEncoding);<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>   /**<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    * Shortcut for &lt;code&gt;i(indent).tag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    *<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    * @param indent The number of prefix tabs to add.<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    * @param name The element name.<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    * @return This object (for method chaining).<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    * @throws IOException If a problem occurred.<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    */<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   public XmlWriter tag(int indent, String ns, String name) throws IOException {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      return i(indent).tag(ns, name);<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><a name="line.239"></a>
-<span class="sourceLineNo">240</span>   /**<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    * Writes a start tag to the output:  &lt;code&gt;&lt;xt&gt;&amp;lt;ns:name&amp;gt;&lt;/xt&gt;&lt;/code&gt;<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    *<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    * @param name The element name.<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    * @return This object (for method chaining).<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    * @throws IOException If a problem occurred.<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    */<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   public XmlWriter sTag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      return oTag(ns, name, needsEncoding).append('&gt;');<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>   /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    * Shortcut for &lt;code&gt;sTag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    *<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    * @param name The element name.<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    * @return This object (for method chaining).<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    * @throws IOException If a problem occurred.<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    */<a name="line.260"></a>
-<span class="sourceLineNo">261</span>   public XmlWriter sTag(String ns, String name) throws IOException {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      return sTag(ns, name, false);<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>   /**<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    * Shortcut for &lt;code&gt;sTag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    *<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    * @param name The element name.<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>    * @throws IOException If a problem occurred.<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    */<a name="line.271"></a>
-<span class="sourceLineNo">272</span>   public XmlWriter sTag(String name) throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      return sTag(null, name);<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>    * Shortcut for &lt;code&gt;i(indent).sTag(ns, name, needsEncoding);&lt;/code&gt;<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    *<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    * @param indent The number of prefix tabs to add.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    * @param name The element name.<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<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>    * @throws IOException If a problem occurred.<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    */<a name="line.285"></a>
-<span class="sourceLineNo">286</span>   public XmlWriter sTag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      return i(indent).sTag(ns, name, needsEncoding);<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>    * Shortcut for &lt;code&gt;i(indent).sTag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    *<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    * @param indent The number of prefix tabs to add.<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    * @param name The element name.<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    * @return This object (for method chaining).<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    * @throws IOException If a problem occurred.<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    */<a name="line.298"></a>
-<span class="sourceLineNo">299</span>   public XmlWriter sTag(int indent, String ns, String name) throws IOException {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      return i(indent).sTag(ns, name, false);<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>    * Shortcut for &lt;code&gt;i(indent).sTag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    *<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    * @param indent The number of prefix tabs to add.<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    * @param name The element name.<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    * @return This object (for method chaining).<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    * @throws IOException If a problem occurred.<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    */<a name="line.310"></a>
-<span class="sourceLineNo">311</span>   public XmlWriter sTag(int indent, String name) throws IOException {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      return i(indent).sTag(null, name, false);<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><a name="line.315"></a>
-<span class="sourceLineNo">316</span>   /**<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    * Writes an end tag to the output:  &lt;code&gt;&lt;xt&gt;&amp;lt;/ns:name&amp;gt;&lt;/xt&gt;&lt;/code&gt;<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    *<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    * @param name The element name.<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    * @return This object (for method chaining).<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    * @throws IOException If a problem occurred.<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    */<a name="line.324"></a>
-<span class="sourceLineNo">325</span>   public XmlWriter eTag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      append('&lt;').append('/');<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      if (enableNs &amp;&amp; ns != null &amp;&amp; ! (ns.isEmpty() || ns.equals(defaultNsPrefix)))<a name="line.327"></a>
-<span class="sourceLineNo">328</span>         append(ns).append(':');<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      if (needsEncoding)<a name="line.329"></a>
-<span class="sourceLineNo">330</span>         XmlUtils.encodeElementName(out, name);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      else<a name="line.331"></a>
-<span class="sourceLineNo">332</span>         append(name);<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      return append('&gt;');<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>    * Shortcut for &lt;code&gt;eTag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    *<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    * @param name The element name.<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>    * @throws IOException If a problem occurred.<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    */<a name="line.343"></a>
-<span class="sourceLineNo">344</span>   public XmlWriter eTag(String ns, String name) throws IOException {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      return eTag(ns, name, false);<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>    * Shortcut for &lt;code&gt;eTag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    *<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    * @param name The element name.<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    * @return This object (for method chaining).<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    * @throws IOException If a problem occurred.<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    */<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   public XmlWriter eTag(String name) throws IOException {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      return eTag(null, name);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   }<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>    * Shortcut for &lt;code&gt;i(indent).eTag(ns, name, needsEncoding);&lt;/code&gt;<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    *<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    * @param indent The number of prefix tabs to add.<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    * @param name The element name.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<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>    * @throws IOException If a problem occurred.<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    */<a name="line.368"></a>
-<span class="sourceLineNo">369</span>   public XmlWriter eTag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      return i(indent).eTag(ns, name, needsEncoding);<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>    * Shortcut for &lt;code&gt;i(indent).eTag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    *<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    * @param indent The number of prefix tabs to add.<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    * @param name The element name.<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    * @return This object (for method chaining).<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    * @throws IOException If a problem occurred.<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    */<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   public XmlWriter eTag(int indent, String ns, String name) throws IOException {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      return i(indent).eTag(ns, name, false);<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>    * Shortcut for &lt;code&gt;i(indent).eTag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    *<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    * @param indent The number of prefix tabs to add.<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    * @param name The element name.<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>    * @throws IOException If a problem occurred.<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    */<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   public XmlWriter eTag(int indent, String name) throws IOException {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      return i(indent).eTag(name);<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>    * Writes an attribute to the output:  &lt;code&gt;&lt;xa&gt;ns:name&lt;/xa&gt;=&lt;xs&gt;'value'&lt;/xs&gt;&lt;/code&gt;<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    *<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    * @param name The attribute name.<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    * @param value The attribute value.<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, attribute name will be encoded.<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>    * @throws IOException If a problem occurred.<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    */<a name="line.407"></a>
-<span class="sourceLineNo">408</span>   public XmlWriter attr(String ns, String name, Object value, boolean needsEncoding) throws IOException {<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      oAttr(ns, name).q();<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      if (needsEncoding)<a name="line.410"></a>
-<span class="sourceLineNo">411</span>         encodeAttr(value);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      else<a name="line.412"></a>
-<span class="sourceLineNo">413</span>         append(value);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>      return q();<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>    * Shortcut for &lt;code&gt;attr(&lt;jk&gt;null&lt;/jk&gt;, name, value, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    *<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    * @param name The attribute name.<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    * @param value The attribute value.<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, attribute name will be encoded.<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>    * @throws IOException If a problem occurred.<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    */<a name="line.425"></a>
-<span class="sourceLineNo">426</span>   public XmlWriter attr(String name, Object value, boolean needsEncoding) throws IOException {<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      return attr(null, name, value, needsEncoding);<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>   /**<a name="line.430"></a>
-<span class="sourceLineNo">431</span>    * Shortcut for &lt;code&gt;attr(ns, name, value, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    *<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    * @param name The attribute name.<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    * @param value The attribute value.<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    * @return This object (for method chaining).<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    * @throws IOException If a problem occurred.<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    */<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   public XmlWriter attr(String ns, String name, Object value) throws IOException {<a name="line.439"></a>
-<span class="sourceLineNo">440</span>      return oAttr(ns, name).q().append(value).q();<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>   /**<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    * Same as {@link #attr(String, Object, boolean)}, except pass in a {@link Namespace} object for the namespace.<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    *<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    * @param name The attribute name.<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    * @param value The attribute value.<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    * @return This object (for method chaining).<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    * @throws IOException If a problem occurred.<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    */<a name="line.451"></a>
-<span class="sourceLineNo">452</span>   public XmlWriter attr(Namespace ns, String name, Object value) throws IOException {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      return oAttr(ns == null ? null : ns.name, name).q().append(value).q();<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>    * Shortcut for &lt;code&gt;attr(&lt;jk&gt;null&lt;/jk&gt;, name, value, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    *<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    * @param name The attribute name.<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    * @param value The attribute value.<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    * @return This object (for method chaining).<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    * @throws IOException If a problem occurred.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    */<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   public XmlWriter attr(String name, Object value) throws IOException {<a name="line.464"></a>
-<span class="sourceLineNo">465</span>      return attr((String)null, name, value);<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>   /**<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    * Writes an open-ended attribute to the output:  &lt;code&gt;&lt;xa&gt;ns:name&lt;/xa&gt;=&lt;/code&gt;<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    *<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    * @param name The attribute name.<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    * @return This object (for method chaining).<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    * @throws IOException If a problem occurred.<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    */<a name="line.476"></a>
-<span class="sourceLineNo">477</span>   public XmlWriter oAttr(String ns, String name) throws IOException {<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      append(' ');<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      if (enableNs &amp;&amp; ns != null &amp;&amp; ! (ns.isEmpty() || ns.equals(defaultNsPrefix)))<a name="line.479"></a>
-<span class="sourceLineNo">480</span>         append(ns).append(':');<a name="line.480"></a>
-<span class="sourceLineNo">481</span>      append(name).append('=');<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      return this;<a name="line.482"></a>
-<span class="sourceLineNo">483</span>   }<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>    * Writes an open-ended attribute to the output:  &lt;code&gt;&lt;xa&gt;ns:name&lt;/xa&gt;=&lt;/code&gt;<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    *<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    * @param name The attribute name.<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    * @return This object (for method chaining).<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    * @throws IOException If a problem occurred.<a name="line.491"></a>
-<span class="sourceLineNo">492</span>    */<a name="line.492"></a>
-<span class="sourceLineNo">493</span>   public XmlWriter oAttr(Namespace ns, String name) throws IOException {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>      return oAttr(ns == null ? null : ns.name, name);<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>   /**<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    * Writes an attribute with a URI value to the output:  &lt;code&gt;&lt;xa&gt;ns:name&lt;/xa&gt;=&lt;xs&gt;'uri-value'&lt;/xs&gt;&lt;/code&gt;<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    *<a name="line.499"></a>
-<span class="sourceLineNo">500</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    * @param name The attribute name.<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    * @param value The attribute value, convertable to a URI via &lt;code&gt;toString()&lt;/code&gt;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    * @return This object (for method chaining).<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    * @throws IOException If a problem occurred.<a name="line.504"></a>
-<span class="sourceLineNo">505</span>    */<a name="line.505"></a>
-<span class="sourceLineNo">506</span>   public XmlWriter attrUri(Namespace ns, String name, Object value) throws IOException {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      oAttr(ns, name).q().appendUri(value).q();<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      return this;<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>    * Writes an attribute with a URI value to the output:  &lt;code&gt;&lt;xa&gt;ns:name&lt;/xa&gt;=&lt;xs&gt;'uri-value'&lt;/xs&gt;&lt;/code&gt;<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    *<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    * @param name The attribute name.<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    * @param value The attribute value, convertable to a URI via &lt;code&gt;toString()&lt;/code&gt;<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    * @return This object (for method chaining).<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    * @throws IOException If a problem occurred.<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    */<a name="line.519"></a>
-<span class="sourceLineNo">520</span>   public XmlWriter attrUri(String ns, String name, Object value) throws IOException {<a name="line.520"></a>
-<span class="sourceLineNo">521</span>      oAttr(ns, name).q().appendUri(value).q();<a name="line.521"></a>
-<span class="sourceLineNo">522</span>      return this;<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>    * Shortcut for calling &lt;code&gt;text(o, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    *<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    * @param o The object being serialized.<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>    * @throws IOException If a problem occurred.<a name="line.530"></a>
-<span class="sourceLineNo">531</span>    */<a name="line.531"></a>
-<span class="sourceLineNo">532</span>   public XmlWriter text(Object o) throws IOException {<a name="line.532"></a>
-<span class="sourceLineNo">533</span>      text(o, false);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      return this;<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>    * Serializes and encodes the specified object as valid XML text.<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    *<a name="line.539"></a>
-<span class="sourceLineNo">540</span>    * @param o The object being serialized.<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    * @param preserveWhitespace If &lt;jk&gt;true&lt;/jk&gt;, then we're serializing {@link XmlFormat#MIXED_PWS} or {@link XmlFormat#TEXT_PWS} content.<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 IOException<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    */<a name="line.544"></a>
-<span class="sourceLineNo">545</span>   public XmlWriter text(Object o, boolean preserveWhitespace) throws IOException {<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      XmlUtils.encodeText(this, o, trimStrings, preserveWhitespace);<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      return this;<a name="line.547"></a>
-<span class="sourceLineNo">548</span>   }<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>    * Serializes and encodes the specified object as valid XML attribute name.<a name="line.551"></a>
-<span class="sourceLineNo">552</span>    *<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    * @param o The object being serialized.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    * @return This object (for method chaining).<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    * @throws IOException If a problem occurred.<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    */<a name="line.556"></a>
-<span class="sourceLineNo">557</span>   public XmlWriter encodeAttr(Object o) throws IOException {<a name="line.557"></a>
-<span class="sourceLineNo">558</span>      XmlUtils.encodeAttr(out, o);<a name="line.558"></a>
-<span class="sourceLineNo">559</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   public XmlWriter cr(int depth) throws IOException {<a name="line.563"></a>
-<span class="sourceLineNo">564</span>      super.cr(depth);<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>   @Override /* SerializerWriter */<a name="line.568"></a>
-<span class="sourceLineNo">569</span>   public XmlWriter appendln(int indent, String text) throws IOException {<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      super.appendln(indent, text);<a name="line.570"></a>
-<span class="sourceLineNo">571</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.574"></a>
-<span class="sourceLineNo">575</span>   public XmlWriter appendln(String text) throws IOException {<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      super.appendln(text);<a name="line.576"></a>
-<span class="sourceLineNo">577</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.580"></a>
-<span class="sourceLineNo">581</span>   public XmlWriter append(int indent, String text) throws IOException {<a name="line.581"></a>
-<span class="sourceLineNo">582</span>      super.append(indent, text);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      return this;<a name="line.583"></a>
-<span class="sourceLineNo">584</span>   }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>   @Override /* SerializerWriter */<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   public XmlWriter append(int indent, char c) throws IOException {<a name="line.587"></a>
-<span class="sourceLineNo">588</span>      super.append(indent, c);<a name="line.588"></a>
-<span class="sourceLineNo">589</span>      return this;<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   }<a name="line.590"></a>
-<span class="sourceLineNo">591</span><a name="line.591"></a>
-<span class="sourceLineNo">592</span>   @Override /* SerializerWriter */<a name="line.592"></a>
-<span class="sourceLineNo">593</span>   public XmlWriter s() throws IOException {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>      super.s();<a name="line.594"></a>
-<span class="sourceLineNo">595</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.598"></a>
-<span class="sourceLineNo">599</span>   public XmlWriter q() throws IOException {<a name="line.599"></a>
-<span class="sourceLineNo">600</span>      super.q();<a name="line.600"></a>
-<span class="sourceLineNo">601</span>      return this;<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   }<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>   @Override /* SerializerWriter */<a name="line.604"></a>
-<span class="sourceLineNo">605</span>   public XmlWriter i(int indent) throws IOException {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>      super.i(indent);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.610"></a>
-<span class="sourceLineNo">611</span>   public XmlWriter nl() throws IOException {<a name="line.611"></a>
-<span class="sourceLineNo">612</span>      super.nl();<a name="line.612"></a>
-<span class="sourceLineNo">613</span>      return this;<a name="line.613"></a>
-<span class="sourceLineNo">614</span>   }<a name="line.614"></a>
-<span class="sourceLineNo">615</span><a name="line.615"></a>
-<span class="sourceLineNo">616</span>   @Override /* SerializerWriter */<a name="line.616"></a>
-<span class="sourceLineNo">617</span>   public XmlWriter append(Object text) throws IOException {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      super.append(text);<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.622"></a>
-<span class="sourceLineNo">623</span>   public XmlWriter append(String text) throws IOException {<a name="line.623"></a>
-<span class="sourceLineNo">624</span>      super.append(text);<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.628"></a>
-<span class="sourceLineNo">629</span>   public XmlWriter append(char c) throws IOException {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>      out.write(c);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      return this;<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>   @Override /* Object */<a name="line.634"></a>
-<span class="sourceLineNo">635</span>   public String toString() {<a name="line.635"></a>
-<span class="sourceLineNo">636</span>      return out.toString();<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">017</span>import org.apache.juneau.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.serializer.*;<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> * Specialized writer for serializing XML.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * &lt;p&gt;<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * &lt;ul&gt;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *    &lt;li&gt;This class is not intended for external use.<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * &lt;/ul&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> */<a name="line.28"></a>
+<span class="sourceLineNo">029</span>public class XmlWriter extends SerializerWriter {<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>   private String defaultNsPrefix;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>   private boolean enableNs;<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>    * Constructor.<a name="line.35"></a>
+<span class="sourceLineNo">036</span>    *<a name="line.36"></a>
+<span class="sourceLineNo">037</span>    * @param out The wrapped writer.<a name="line.37"></a>
+<span class="sourceLineNo">038</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt; XML elements will be indented.<a name="line.38"></a>
+<span class="sourceLineNo">039</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings should be trimmed before they're serialized.<a name="line.39"></a>
+<span class="sourceLineNo">040</span>    * @param quoteChar The quote character to use for attributes.  Should be &lt;js&gt;'\''&lt;/js&gt; or &lt;js&gt;'"'&lt;/js&gt;.<a name="line.40"></a>
+<span class="sourceLineNo">041</span>    * @param relativeUriBase The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;).<a name="line.41"></a>
+<span class="sourceLineNo">042</span>    * @param absolutePathUriBase The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;).<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    * @param uriContext The URI context.<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    * @param enableNs Flag to indicate if XML namespaces are enabled.<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    * @param defaultNamespace The default namespace if XML namespaces are enabled.<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    */<a name="line.47"></a>
+<span class="sourceLineNo">048</span>   public XmlWriter(Writer out, boolean useWhitespace, boolean trimStrings, char quoteChar, String relativeUriBase, String absolutePathUriBase, UriContext uriContext, boolean enableNs, Namespace defaultNamespace) {<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      super(out, useWhitespace, trimStrings, quoteChar, relativeUriBase, absolutePathUriBase, uriContext);<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      this.enableNs = enableNs;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      this.defaultNsPrefix = defaultNamespace == null ? null : defaultNamespace.name;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   }<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>    * Writes an opening tag to the output:  &lt;code&gt;&lt;xt&gt;&amp;lt;ns:name&lt;/xt&gt;&lt;/code&gt;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    *<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    * @param name The element name.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * @return This object (for method chaining).<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    * @throws IOException If a problem occurred.<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    */<a name="line.62"></a>
+<span class="sourceLineNo">063</span>   public XmlWriter oTag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      append('&lt;');<a name="line.64"></a>
+<span class="sourceLineNo">065</span>      if (enableNs &amp;&amp; ns != null &amp;&amp; ! (ns.isEmpty() || ns.equals(defaultNsPrefix)))<a name="line.65"></a>
+<span class="sourceLineNo">066</span>         append(ns).append(':');<a name="line.66"></a>
+<span class="sourceLineNo">067</span>      if (needsEncoding)<a name="line.67"></a>
+<span class="sourceLineNo">068</span>         XmlUtils.encodeElementName(out, name);<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      else<a name="line.69"></a>
+<span class="sourceLineNo">070</span>         append(name);<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      return this;<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>    * Shortcut for &lt;code&gt;oTag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    *<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    * @param name The element name.<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>    * @throws IOException If a problem occurred.<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    */<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   public XmlWriter oTag(String ns, String name) throws IOException {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      return oTag(ns, name, false);<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>    * Shortcut for &lt;code&gt;oTag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    *<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    * @param name The element name.<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    * @return This object (for method chaining).<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    * @throws IOException If a problem occurred.<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    */<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   public XmlWriter oTag(String name) throws IOException {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      return oTag(null, name, false);<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>    * Shortcut for &lt;code&gt;i(indent).oTag(ns, name, needsEncoding);&lt;/code&gt;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    *<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    * @param indent The number of prefix tabs to add.<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    * @param name The element name.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<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>    * @throws IOException If a problem occurred.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    */<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   public XmlWriter oTag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      return i(indent).oTag(ns, name, needsEncoding);<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>    * Shortcut for &lt;code&gt;i(indent).oTag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    *<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    * @param indent The number of prefix tabs to add.<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    * @param name The element name.<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    * @return This object (for method chaining).<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    * @throws IOException If a problem occurred.<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    */<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   public XmlWriter oTag(int indent, String ns, String name) throws IOException {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      return i(indent).oTag(ns, name, false);<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>    * Shortcut for &lt;code&gt;i(indent).oTag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    *<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    * @param indent The number of prefix tabs to add.<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    * @param name The element name.<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    * @return This object (for method chaining).<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    * @throws IOException If a problem occurred.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    */<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   public XmlWriter oTag(int indent, String name) throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      return i(indent).oTag(null, name, false);<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>    * Closes a tag.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    * Shortcut for &lt;code&gt;append(&lt;js&gt;'&gt;'&lt;/js&gt;);&lt;/code&gt;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    *<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    * @return This object (for method chaining).<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 XmlWriter cTag() throws IOException {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      append('&gt;');<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      return this;<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>   /**<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    * Closes an empty tag.<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    * Shortcut for &lt;code&gt;append(&lt;js&gt;'/'&lt;/js&gt;).append(&lt;js&gt;'&gt;'&lt;/js&gt;);&lt;/code&gt;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    *<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    * @return This object (for method chaining).<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    * @throws IOException<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    */<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   public XmlWriter ceTag() throws IOException {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      append('/').append('&gt;');<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      return this;<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>   /**<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    * Writes a closed tag to the output:  &lt;code&gt;&lt;xt&gt;&amp;lt;ns:name/&amp;gt;&lt;/xt&gt;&lt;/code&gt;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    *<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    * @param name The element name.<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    * @return This object (for method chaining).<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    * @throws IOException If a problem occurred.<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    */<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   public XmlWriter tag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      append('&lt;');<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      if (enableNs &amp;&amp; ns != null &amp;&amp; ! (ns.isEmpty() || ns.equals(defaultNsPrefix)))<a name="line.171"></a>
+<span class="sourceLineNo">172</span>         append(ns).append(':');<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      if (needsEncoding)<a name="line.173"></a>
+<span class="sourceLineNo">174</span>         XmlUtils.encodeElementName(out, name);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      else<a name="line.175"></a>
+<span class="sourceLineNo">176</span>         append(name);<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      return append('/').append('&gt;');<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>    * Shortcut for &lt;code&gt;tag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    *<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    * @param name The element name.<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    * @return This object (for method chaining).<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    * @throws IOException If a problem occurred.<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    */<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   public XmlWriter tag(String ns, String name) throws IOException {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      return tag(ns, name, false);<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>    * Shortcut for &lt;code&gt;tag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    *<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    * @param name The element name.<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    * @return This object (for method chaining).<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    * @throws IOException If a problem occurred.<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    */<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   public XmlWriter tag(String name) throws IOException {<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      return tag(null, name, false);<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>    * Shortcut for &lt;code&gt;i(indent).tag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    *<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    * @param indent The number of prefix tabs to add.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    * @param name The element name.<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>    * @throws IOException If a problem occurred.<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    */<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   public XmlWriter tag(int indent, String name) throws IOException {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      return i(indent).tag(name);<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>    * Shortcut for &lt;code&gt;i(indent).tag(ns, name, needsEncoding);&lt;/code&gt;<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    *<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    * @param indent The number of prefix tabs to add.<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    * @param name The element name.<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    * @return This object (for method chaining).<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    * @throws IOException If a problem occurred.<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    */<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   public XmlWriter tag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      return i(indent).tag(ns, name, needsEncoding);<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>   /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    * Shortcut for &lt;code&gt;i(indent).tag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    *<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    * @param indent The number of prefix tabs to add.<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    * @param name The element name.<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    * @return This object (for method chaining).<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    * @throws IOException If a problem occurred.<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    */<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   public XmlWriter tag(int indent, String ns, String name) throws IOException {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      return i(indent).tag(ns, name);<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><a name="line.242"></a>
+<span class="sourceLineNo">243</span>   /**<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    * Writes a start tag to the output:  &lt;code&gt;&lt;xt&gt;&amp;lt;ns:name&amp;gt;&lt;/xt&gt;&lt;/code&gt;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    *<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    * @param name The element name.<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    * @return This object (for method chaining).<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    * @throws IOException If a problem occurred.<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    */<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   public XmlWriter sTag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      return oTag(ns, name, needsEncoding).append('&gt;');<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>   /**<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    * Shortcut for &lt;code&gt;sTag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    *<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    * @param name The element name.<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>    * @throws IOException If a problem occurred.<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    */<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   public XmlWriter sTag(String ns, String name) throws IOException {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      return sTag(ns, name, false);<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>    * Shortcut for &lt;code&gt;sTag(&lt;jk&gt;null&lt;/jk&gt;, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    *<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    * @param name The element name.<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    * @return This object (for method chaining).<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    * @throws IOException If a problem occurred.<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    */<a name="line.274"></a>
+<span class="sourceLineNo">275</span>   public XmlWriter sTag(String name) throws IOException {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>      return sTag(null, name);<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>    * Shortcut for &lt;code&gt;i(indent).sTag(ns, name, needsEncoding);&lt;/code&gt;<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    *<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    * @param indent The number of prefix tabs to add.<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    * @param ns The namespace.  Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    * @param name The element name.<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    * @param needsEncoding If &lt;jk&gt;true&lt;/jk&gt;, element name will be encoded.<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    * @return This object (for method chaining).<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    * @throws IOException If a problem occurred.<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    */<a name="line.288"></a>
+<span class="sourceLineNo">289</span>   public XmlWriter sTag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      return i(indent).sTag(ns, name, needsEncoding);<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>    * Shortcut for &lt;code&gt;i(indent).sTag(ns, name, &lt;jk&gt;false&lt;/jk&gt;);&lt;/code&gt;<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    *<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    * @param indent The number of prefix tabs

<TRUNCATED>


[06/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html
index b8dd36b..e2089c4 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html
@@ -271,751 +271,769 @@
 <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>   /**<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    * Sets the {@link SerializerContext#SERIALIZER_addBeanTypeProperties} property on all serializers in this group.<a name="line.266"></a>
+<span class="sourceLineNo">266</span>    * Shortcut for calling &lt;code&gt;useWhitespace(&lt;jk&gt;true&lt;/jk&gt;)&lt;/code&gt;.<a name="line.266"></a>
 <span class="sourceLineNo">267</span>    *<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    * @param value The new value for this property.<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>    * @see SerializerContext#SERIALIZER_addBeanTypeProperties<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    */<a name="line.271"></a>
-<span class="sourceLineNo">272</span>   public SerializerGroupBuilder addBeanTypeProperties(boolean value) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      return property(SERIALIZER_addBeanTypeProperties, value);<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 {@link SerializerContext#SERIALIZER_quoteChar} property on all serializers in this group.<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    *<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    * @param value The new value for this property.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    * @return This object (for method chaining).<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    * @see SerializerContext#SERIALIZER_quoteChar<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    */<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   public SerializerGroupBuilder quoteChar(char value) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      return property(SERIALIZER_quoteChar, value);<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>    * Sets the {@link SerializerContext#SERIALIZER_trimNullProperties} property on all serializers in this group.<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    *<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    * @param value The new value for this property.<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>    * @see SerializerContext#SERIALIZER_trimNullProperties<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    */<a name="line.293"></a>
-<span class="sourceLineNo">294</span>   public SerializerGroupBuilder trimNullProperties(boolean value) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      return property(SERIALIZER_trimNullProperties, value);<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>   /**<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    * Sets the {@link SerializerContext#SERIALIZER_trimEmptyCollections} property on all serializers in this group.<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    *<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    * @param value The new value for this property.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    * @return This object (for method chaining).<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    * @see SerializerContext#SERIALIZER_trimEmptyCollections<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    */<a name="line.304"></a>
-<span class="sourceLineNo">305</span>   public SerializerGroupBuilder trimEmptyCollections(boolean value) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      return property(SERIALIZER_trimEmptyCollections, 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 {@link SerializerContext#SERIALIZER_trimEmptyMaps} property on all serializers in this group.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    *<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    * @param value The new value for this property.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    * @return This object (for method chaining).<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    * @see SerializerContext#SERIALIZER_trimEmptyMaps<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    */<a name="line.315"></a>
-<span class="sourceLineNo">316</span>   public SerializerGroupBuilder trimEmptyMaps(boolean value) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      return property(SERIALIZER_trimEmptyMaps, value);<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>    * Sets the {@link SerializerContext#SERIALIZER_trimStrings} property on all serializers in this group.<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    *<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    * @param value The new value for this property.<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>    * @see SerializerContext#SERIALIZER_trimStrings<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    */<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   public SerializerGroupBuilder trimStrings(boolean value) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      return property(SERIALIZER_trimStrings, value);<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>   /**<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    * Sets the {@link SerializerContext#SERIALIZER_relativeUriBase} property on all serializers in this group.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    *<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    * @param value The new value for this property.<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    * @return This object (for method chaining).<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    * @see SerializerContext#SERIALIZER_relativeUriBase<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    */<a name="line.337"></a>
-<span class="sourceLineNo">338</span>   public SerializerGroupBuilder relativeUriBase(String value) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      return property(SERIALIZER_relativeUriBase, value);<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   }<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>    * Sets the {@link SerializerContext#SERIALIZER_absolutePathUriBase} property on all serializers in this group.<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    *<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    * @param value The new value for this property.<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    * @return This object (for method chaining).<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    * @see SerializerContext#SERIALIZER_absolutePathUriBase<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    */<a name="line.348"></a>
-<span class="sourceLineNo">349</span>   public SerializerGroupBuilder absolutePathUriBase(String value) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      return property(SERIALIZER_absolutePathUriBase, value);<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>    * Sets the {@link SerializerContext#SERIALIZER_sortCollections} property on all serializers in this group.<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    *<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    * @param value The new value for this property.<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    * @return This object (for method chaining).<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    * @see SerializerContext#SERIALIZER_sortCollections<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    */<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   public SerializerGroupBuilder sortCollections(boolean value) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>      return property(SERIALIZER_sortCollections, value);<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>   /**<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    * Sets the {@link SerializerContext#SERIALIZER_sortMaps} property on all serializers in this group.<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    *<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    * @param value The new value for this property.<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    * @return This object (for method chaining).<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    * @see SerializerContext#SERIALIZER_sortMaps<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    */<a name="line.370"></a>
-<span class="sourceLineNo">371</span>   public SerializerGroupBuilder sortMaps(boolean value) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      return property(SERIALIZER_sortMaps, value);<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>   /**<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    * Sets the {@link SerializerContext#SERIALIZER_abridged} property on all serializers in this group.<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    *<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    * @param value The new value for this property.<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    * @return This object (for method chaining).<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    * @see SerializerContext#SERIALIZER_abridged<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    */<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   public SerializerGroupBuilder parserKnowsRootType(boolean value) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      return property(SERIALIZER_abridged, value);<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>    * Sets the {@link BeanContext#BEAN_beansRequireDefaultConstructor} property on all serializers in this group.<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    *<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    * @param value The new value for this property.<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>    * @see BeanContext#BEAN_beansRequireDefaultConstructor<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    */<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   public SerializerGroupBuilder beansRequireDefaultConstructor(boolean value) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      return property(BEAN_beansRequireDefaultConstructor, value);<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>    * Sets the {@link BeanContext#BEAN_beansRequireSerializable} property on all serializers in this group.<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    *<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    * @param value The new value for this property.<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    * @return This object (for method chaining).<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    * @see BeanContext#BEAN_beansRequireSerializable<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    */<a name="line.403"></a>
-<span class="sourceLineNo">404</span>   public SerializerGroupBuilder beansRequireSerializable(boolean value) {<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      return property(BEAN_beansRequireSerializable, value);<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>    * Sets the {@link BeanContext#BEAN_beansRequireSettersForGetters} property on all serializers in this group.<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    *<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    * @param value The new value for this property.<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    * @return This object (for method chaining).<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    * @see BeanContext#BEAN_beansRequireSettersForGetters<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    */<a name="line.414"></a>
-<span class="sourceLineNo">415</span>   public SerializerGroupBuilder beansRequireSettersForGetters(boolean value) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      return property(BEAN_beansRequireSettersForGetters, value);<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>    * Sets the {@link BeanContext#BEAN_beansRequireSomeProperties} property on all serializers in this group.<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    *<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    * @param value The new value for this property.<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>    * @see BeanContext#BEAN_beansRequireSomeProperties<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    */<a name="line.425"></a>
-<span class="sourceLineNo">426</span>   public SerializerGroupBuilder beansRequireSomeProperties(boolean value) {<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      return property(BEAN_beansRequireSomeProperties, value);<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>   /**<a name="line.430"></a>
-<span class="sourceLineNo">431</span>    * Sets the {@link BeanContext#BEAN_beanMapPutReturnsOldValue} property on all serializers in this group.<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    *<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    * @param value The new value for this property.<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>    * @see BeanContext#BEAN_beanMapPutReturnsOldValue<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    */<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   public SerializerGroupBuilder beanMapPutReturnsOldValue(boolean value) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>      return property(BEAN_beanMapPutReturnsOldValue, 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 {@link BeanContext#BEAN_beanConstructorVisibility} property on all serializers in this group.<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    *<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    * @param value The new value for this property.<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    * @return This object (for method chaining).<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    * @see BeanContext#BEAN_beanConstructorVisibility<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    */<a name="line.447"></a>
-<span class="sourceLineNo">448</span>   public SerializerGroupBuilder beanConstructorVisibility(Visibility value) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span>      return property(BEAN_beanConstructorVisibility, value);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>   }<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>    * Sets the {@link BeanContext#BEAN_beanClassVisibility} property on all serializers in this group.<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    *<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    * @param value The new value for this property.<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    * @return This object (for method chaining).<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    * @see BeanContext#BEAN_beanClassVisibility<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    */<a name="line.458"></a>
-<span class="sourceLineNo">459</span>   public SerializerGroupBuilder beanClassVisibility(Visibility value) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span>      return property(BEAN_beanClassVisibility, value);<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>   /**<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    * Sets the {@link BeanContext#BEAN_beanFieldVisibility} property on all serializers in this group.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    *<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    * @param value The new value for this property.<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    * @return This object (for method chaining).<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    * @see BeanContext#BEAN_beanFieldVisibility<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    */<a name="line.469"></a>
-<span class="sourceLineNo">470</span>   public SerializerGroupBuilder beanFieldVisibility(Visibility value) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span>      return property(BEAN_beanFieldVisibility, value);<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>   /**<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    * Sets the {@link BeanContext#BEAN_methodVisibility} property on all serializers in this group.<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    *<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    * @param value The new value for this property.<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    * @return This object (for method chaining).<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    * @see BeanContext#BEAN_methodVisibility<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    */<a name="line.480"></a>
-<span class="sourceLineNo">481</span>   public SerializerGroupBuilder methodVisibility(Visibility value) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      return property(BEAN_methodVisibility, value);<a name="line.482"></a>
-<span class="sourceLineNo">483</span>   }<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>    * Sets the {@link BeanContext#BEAN_useJavaBeanIntrospector} property on all serializers in this group.<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    *<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    * @param value The new value for this property.<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    * @return This object (for method chaining).<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    * @see BeanContext#BEAN_useJavaBeanIntrospector<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    */<a name="line.491"></a>
-<span class="sourceLineNo">492</span>   public SerializerGroupBuilder useJavaBeanIntrospector(boolean value) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      return property(BEAN_useJavaBeanIntrospector, value);<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>   /**<a name="line.496"></a>
-<span class="sourceLineNo">497</span>    * Sets the {@link BeanContext#BEAN_useInterfaceProxies} property on all serializers in this group.<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    *<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    * @param value The new value for this property.<a name="line.499"></a>
-<span class="sourceLineNo">500</span>    * @return This object (for method chaining).<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    * @see BeanContext#BEAN_useInterfaceProxies<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    */<a name="line.502"></a>
-<span class="sourceLineNo">503</span>   public SerializerGroupBuilder useInterfaceProxies(boolean value) {<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      return property(BEAN_useInterfaceProxies, value);<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>    * Sets the {@link BeanContext#BEAN_ignoreUnknownBeanProperties} property on all serializers in this group.<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    *<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    * @param value The new value for this property.<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>    * @see BeanContext#BEAN_ignoreUnknownBeanProperties<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    */<a name="line.513"></a>
-<span class="sourceLineNo">514</span>   public SerializerGroupBuilder ignoreUnknownBeanProperties(boolean value) {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      return property(BEAN_ignoreUnknownBeanProperties, value);<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>    * Sets the {@link BeanContext#BEAN_ignoreUnknownNullBeanProperties} property on all serializers in this group.<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    *<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    * @param value The new value for this property.<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    * @return This object (for method chaining).<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    * @see BeanContext#BEAN_ignoreUnknownNullBeanProperties<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    */<a name="line.524"></a>
-<span class="sourceLineNo">525</span>   public SerializerGroupBuilder ignoreUnknownNullBeanProperties(boolean value) {<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      return property(BEAN_ignoreUnknownNullBeanProperties, value);<a name="line.526"></a>
-<span class="sourceLineNo">527</span>   }<a name="line.527"></a>
-<span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>   /**<a name="line.529"></a>
-<span class="sourceLineNo">530</span>    * Sets the {@link BeanContext#BEAN_ignorePropertiesWithoutSetters} property on all serializers in this group.<a name="line.530"></a>
-<span class="sourceLineNo">531</span>    *<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    * @param value The new value for this property.<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    * @return This object (for method chaining).<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    * @see BeanContext#BEAN_ignorePropertiesWithoutSetters<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    */<a name="line.535"></a>
-<span class="sourceLineNo">536</span>   public SerializerGroupBuilder ignorePropertiesWithoutSetters(boolean value) {<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      return property(BEAN_ignorePropertiesWithoutSetters, value);<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>   /**<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    * Sets the {@link BeanContext#BEAN_ignoreInvocationExceptionsOnGetters} property on all serializers in this group.<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    *<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    * @param value The new value for this property.<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    * @return This object (for method chaining).<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    * @see BeanContext#BEAN_ignoreInvocationExceptionsOnGetters<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    */<a name="line.546"></a>
-<span class="sourceLineNo">547</span>   public SerializerGroupBuilder ignoreInvocationExceptionsOnGetters(boolean value) {<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      return property(BEAN_ignoreInvocationExceptionsOnGetters, value);<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>    * Sets the {@link BeanContext#BEAN_ignoreInvocationExceptionsOnSetters} property on all serializers in this group.<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    *<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    * @param value The new value for this property.<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    * @return This object (for method chaining).<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    * @see BeanContext#BEAN_ignoreInvocationExceptionsOnSetters<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    */<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   public SerializerGroupBuilder ignoreInvocationExceptionsOnSetters(boolean value) {<a name="line.558"></a>
-<span class="sourceLineNo">559</span>      return property(BEAN_ignoreInvocationExceptionsOnSetters, value);<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>    * Sets the {@link BeanContext#BEAN_sortProperties} property on all serializers in this group.<a name="line.563"></a>
-<span class="sourceLineNo">564</span>    *<a name="line.564"></a>
-<span class="sourceLineNo">565</span>    * @param value The new value for this property.<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    * @return This object (for method chaining).<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    * @see BeanContext#BEAN_sortProperties<a name="line.567"></a>
-<span class="sourceLineNo">568</span>    */<a name="line.568"></a>
-<span class="sourceLineNo">569</span>   public SerializerGroupBuilder sortProperties(boolean value) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      return property(BEAN_sortProperties, value);<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>    * Sets the {@link BeanContext#BEAN_notBeanPackages_add} property on all serializers in this group.<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    *<a name="line.575"></a>
-<span class="sourceLineNo">576</span>    * @param values The new value for this property.<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>    * @see BeanContext#BEAN_notBeanPackages_add<a name="line.578"></a>
-<span class="sourceLineNo">579</span>    */<a name="line.579"></a>
-<span class="sourceLineNo">580</span>   public SerializerGroupBuilder notBeanPackages(String...values) {<a name="line.580"></a>
-<span class="sourceLineNo">581</span>      return property(BEAN_notBeanPackages_add, values);<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>    * Sets the {@link BeanContext#BEAN_notBeanPackages_add} property on all serializers in this group.<a name="line.585"></a>
-<span class="sourceLineNo">586</span>    *<a name="line.586"></a>
-<span class="sourceLineNo">587</span>    * @param value The new value for this property.<a name="line.587"></a>
-<span class="sourceLineNo">588</span>    * @return This object (for method chaining).<a name="line.588"></a>
-<span class="sourceLineNo">589</span>    * @see BeanContext#BEAN_notBeanPackages_add<a name="line.589"></a>
-<span class="sourceLineNo">590</span>    */<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   public SerializerGroupBuilder notBeanPackages(Collection&lt;String&gt; value) {<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      return property(BEAN_notBeanPackages_add, value);<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>   /**<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    * Sets the {@link BeanContext#BEAN_notBeanPackages} property on all serializers in this group.<a name="line.596"></a>
-<span class="sourceLineNo">597</span>    *<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    * @param values The values to remove from this property.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    * @return This object (for method chaining).<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    * @see BeanContext#BEAN_notBeanPackages<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    */<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   public SerializerGroupBuilder setNotBeanPackages(String...values) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span>      return property(BEAN_notBeanPackages, values);<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>    * Sets the {@link BeanContext#BEAN_notBeanPackages} property on all serializers in this group.<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    *<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    * @param values The values to remove from this property.<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    * @return This object (for method chaining).<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    * @see BeanContext#BEAN_notBeanPackages<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    */<a name="line.612"></a>
-<span class="sourceLineNo">613</span>   public SerializerGroupBuilder setNotBeanPackages(Collection&lt;String&gt; values) {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>      return property(BEAN_notBeanPackages, values);<a name="line.614"></a>
-<span class="sourceLineNo">615</span>   }<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>    * Sets the {@link BeanContext#BEAN_notBeanPackages_remove} property on all serializers in this group.<a name="line.618"></a>
-<span class="sourceLineNo">619</span>    *<a name="line.619"></a>
-<span class="sourceLineNo">620</span>    * @param values The values to remove from this property.<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    * @return This object (for method chaining).<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    * @see BeanContext#BEAN_notBeanPackages_remove<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    */<a name="line.623"></a>
-<span class="sourceLineNo">624</span>   public SerializerGroupBuilder removeNotBeanPackages(String...values) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      return property(BEAN_notBeanPackages_remove, values);<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>   /**<a name="line.628"></a>
-<span class="sourceLineNo">629</span>    * Sets the {@link BeanContext#BEAN_notBeanPackages_remove} property on all serializers in this group.<a name="line.629"></a>
-<span class="sourceLineNo">630</span>    *<a name="line.630"></a>
-<span class="sourceLineNo">631</span>    * @param values The values to remove from this property.<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    * @return This object (for method chaining).<a name="line.632"></a>
-<span class="sourceLineNo">633</span>    * @see BeanContext#BEAN_notBeanPackages_remove<a name="line.633"></a>
-<span class="sourceLineNo">634</span>    */<a name="line.634"></a>
-<span class="sourceLineNo">635</span>   public SerializerGroupBuilder removeNotBeanPackages(Collection&lt;String&gt; values) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span>      return property(BEAN_notBeanPackages_remove, values);<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>   /**<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    * Sets the {@link BeanContext#BEAN_notBeanClasses_add} property on all serializers in this group.<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    *<a name="line.641"></a>
-<span class="sourceLineNo">642</span>    * @param values The new value for this property.<a name="line.642"></a>
-<span class="sourceLineNo">643</span>    * @return This object (for method chaining).<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    * @see BeanContext#BEAN_notBeanClasses_add<a name="line.644"></a>
-<span class="sourceLineNo">645</span>    */<a name="line.645"></a>
-<span class="sourceLineNo">646</span>   public SerializerGroupBuilder notBeanClasses(Class&lt;?&gt;...values) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      return property(BEAN_notBeanClasses_add, values);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>   }<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span>   /**<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    * Sets the {@link BeanContext#BEAN_notBeanClasses_add} property on all serializers in this group.<a name="line.651"></a>
-<span class="sourceLineNo">652</span>    *<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    * @param values The new value for this property.<a name="line.653"></a>
-<span class="sourceLineNo">654</span>    * @return This object (for method chaining).<a name="line.654"></a>
-<span class="sourceLineNo">655</span>    * @see BeanContext#BEAN_notBeanPackages_add<a name="line.655"></a>
-<span class="sourceLineNo">656</span>    */<a name="line.656"></a>
-<span class="sourceLineNo">657</span>   public SerializerGroupBuilder notBeanClasses(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.657"></a>
-<span class="sourceLineNo">658</span>      return property(BEAN_notBeanClasses_add, values);<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>    * Sets the {@link BeanContext#BEAN_notBeanClasses} property on all serializers in this group.<a name="line.662"></a>
-<span class="sourceLineNo">663</span>    *<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    * @param values The values to add to this property.<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    * @return This object (for method chaining).<a name="line.665"></a>
-<span class="sourceLineNo">666</span>    * @see BeanContext#BEAN_notBeanClasses<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    */<a name="line.667"></a>
-<span class="sourceLineNo">668</span>   public SerializerGroupBuilder setNotBeanClasses(Class&lt;?&gt;...values) {<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      return property(BEAN_notBeanClasses, values);<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>    * Sets the {@link BeanContext#BEAN_notBeanClasses} property on all serializers in this group.<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    *<a name="line.674"></a>
-<span class="sourceLineNo">675</span>    * @param values The values to add to this property.<a name="line.675"></a>
-<span class="sourceLineNo">676</span>    * @return This object (for method chaining).<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    * @see BeanContext#BEAN_notBeanClasses<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    */<a name="line.678"></a>
-<span class="sourceLineNo">679</span>   public SerializerGroupBuilder setNotBeanClasses(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      return property(BEAN_notBeanClasses, values);<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>    * Sets the {@link BeanContext#BEAN_notBeanClasses_remove} property on all serializers in this group.<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    *<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    * @param values The values to remove from this property.<a name="line.686"></a>
-<span class="sourceLineNo">687</span>    * @return This object (for method chaining).<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    * @see BeanContext#BEAN_notBeanClasses_remove<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    */<a name="line.689"></a>
-<span class="sourceLineNo">690</span>   public SerializerGroupBuilder removeNotBeanClasses(Class&lt;?&gt;...values) {<a name="line.690"></a>
-<span class="sourceLineNo">691</span>      return property(BEAN_notBeanClasses_remove, values);<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>    * Sets the {@link BeanContext#BEAN_notBeanClasses_remove} property on all serializers in this group.<a name="line.695"></a>
-<span class="sourceLineNo">696</span>    *<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    * @param values The values to remove from this property.<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>    * @see BeanContext#BEAN_notBeanClasses_remove<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    */<a name="line.700"></a>
-<span class="sourceLineNo">701</span>   public SerializerGroupBuilder removeNotBeanClasses(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.701"></a>
-<span class="sourceLineNo">702</span>      return property(BEAN_notBeanClasses_remove, values);<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>   /**<a name="line.705"></a>
-<span class="sourceLineNo">706</span>    * Sets the {@link BeanContext#BEAN_beanFilters_add} property on all serializers in this group.<a name="line.706"></a>
-<span class="sourceLineNo">707</span>    *<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    * @param values The new value for this property.<a name="line.708"></a>
-<span class="sourceLineNo">709</span>    * @return This object (for method chaining).<a name="line.709"></a>
-<span class="sourceLineNo">710</span>    * @see BeanContext#BEAN_beanFilters_add<a name="line.710"></a>
-<span class="sourceLineNo">711</span>    */<a name="line.711"></a>
-<span class="sourceLineNo">712</span>   public SerializerGroupBuilder beanFilters(Class&lt;?&gt;...values) {<a name="line.712"></a>
-<span class="sourceLineNo">713</span>      return property(BEAN_beanFilters_add, values);<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   }<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>    * Sets the {@link BeanContext#BEAN_beanFilters_add} property on all serializers in this group.<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    *<a name="line.718"></a>
-<span class="sourceLineNo">719</span>    * @param values The new value for this property.<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    * @return This object (for method chaining).<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    * @see BeanContext#BEAN_beanFilters_add<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    */<a name="line.722"></a>
-<span class="sourceLineNo">723</span>   public SerializerGroupBuilder beanFilters(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.723"></a>
-<span class="sourceLineNo">724</span>      return property(BEAN_beanFilters_add, values);<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>   /**<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    * Sets the {@link BeanContext#BEAN_beanFilters} property on all serializers in this group.<a name="line.728"></a>
-<span class="sourceLineNo">729</span>    *<a name="line.729"></a>
-<span class="sourceLineNo">730</span>    * @param values The values to add to this property.<a name="line.730"></a>
-<span class="sourceLineNo">731</span>    * @return This object (for method chaining).<a name="line.731"></a>
-<span class="sourceLineNo">732</span>    * @see BeanContext#BEAN_beanFilters<a name="line.732"></a>
-<span class="sourceLineNo">733</span>    */<a name="line.733"></a>
-<span class="sourceLineNo">734</span>   public SerializerGroupBuilder setBeanFilters(Class&lt;?&gt;...values) {<a name="line.734"></a>
-<span class="sourceLineNo">735</span>      return property(BEAN_beanFilters, values);<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>    * Sets the {@link BeanContext#BEAN_beanFilters} property on all serializers in this group.<a name="line.739"></a>
-<span class="sourceLineNo">740</span>    *<a name="line.740"></a>
-<span class="sourceLineNo">741</span>    * @param values The values to add to this property.<a name="line.741"></a>
-<span class="sourceLineNo">742</span>    * @return This object (for method chaining).<a name="line.742"></a>
-<span class="sourceLineNo">743</span>    * @see BeanContext#BEAN_beanFilters<a name="line.743"></a>
-<span class="sourceLineNo">744</span>    */<a name="line.744"></a>
-<span class="sourceLineNo">745</span>   public SerializerGroupBuilder setBeanFilters(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      return property(BEAN_beanFilters, values);<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>    * Sets the {@link BeanContext#BEAN_beanFilters_remove} property on all serializers in this group.<a name="line.750"></a>
-<span class="sourceLineNo">751</span>    *<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    * @param values The values to remove from this property.<a name="line.752"></a>
-<span class="sourceLineNo">753</span>    * @return This object (for method chaining).<a name="line.753"></a>
-<span class="sourceLineNo">754</span>    * @see BeanContext#BEAN_beanFilters_remove<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    */<a name="line.755"></a>
-<span class="sourceLineNo">756</span>   public SerializerGroupBuilder removeBeanFilters(Class&lt;?&gt;...values) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>      return property(BEAN_beanFilters_remove, values);<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>    * Sets the {@link BeanContext#BEAN_beanFilters_remove} property on all serializers in this group.<a name="line.761"></a>
-<span class="sourceLineNo">762</span>    *<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    * @param values The values to remove from this property.<a name="line.763"></a>
-<span class="sourceLineNo">764</span>    * @return This object (for method chaining).<a name="line.764"></a>
-<span class="sourceLineNo">765</span>    * @see BeanContext#BEAN_beanFilters_remove<a name="line.765"></a>
-<span class="sourceLineNo">766</span>    */<a name="line.766"></a>
-<span class="sourceLineNo">767</span>   public SerializerGroupBuilder removeBeanFilters(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.767"></a>
-<span class="sourceLineNo">768</span>      return property(BEAN_beanFilters_remove, values);<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>   /**<a name="line.771"></a>
-<span class="sourceLineNo">772</span>    * Sets the {@link BeanContext#BEAN_pojoSwaps_add} property on all serializers in this group.<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    *<a name="line.773"></a>
-<span class="sourceLineNo">774</span>    * @param values The new value for this property.<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    * @return This object (for method chaining).<a name="line.775"></a>
-<span class="sourceLineNo">776</span>    * @see BeanContext#BEAN_pojoSwaps_add<a name="line.776"></a>
-<span class="sourceLineNo">777</span>    */<a name="line.777"></a>
-<span class="sourceLineNo">778</span>   public SerializerGroupBuilder pojoSwaps(Class&lt;?&gt;...values) {<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      return property(BEAN_pojoSwaps_add, values);<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   }<a name="line.780"></a>
-<span class="sourceLineNo">781</span><a name="line.781"></a>
-<span class="sourceLineNo">782</span>   /**<a name="line.782"></a>
-<span class="sourceLineNo">783</span>    * Sets the {@link BeanContext#BEAN_pojoSwaps_add} property on all serializers in this group.<a name="line.783"></a>
-<span class="sourceLineNo">784</span>    *<a name="line.784"></a>
-<span class="sourceLineNo">785</span>    * @param values The new value for this property.<a name="line.785"></a>
-<span class="sourceLineNo">786</span>    * @return This object (for method chaining).<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    * @see BeanContext#BEAN_pojoSwaps_add<a name="line.787"></a>
-<span class="sourceLineNo">788</span>    */<a name="line.788"></a>
-<span class="sourceLineNo">789</span>   public SerializerGroupBuilder pojoSwaps(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.789"></a>
-<span class="sourceLineNo">790</span>      return property(BEAN_pojoSwaps_add, values);<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>    * Sets the {@link BeanContext#BEAN_pojoSwaps} property on all serializers in this group.<a name="line.794"></a>
-<span class="sourceLineNo">795</span>    *<a name="line.795"></a>
-<span class="sourceLineNo">796</span>    * @param values The values to add to this property.<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    * @return This object (for method chaining).<a name="line.797"></a>
-<span class="sourceLineNo">798</span>    * @see BeanContext#BEAN_pojoSwaps<a name="line.798"></a>
-<span class="sourceLineNo">799</span>    */<a name="line.799"></a>
-<span class="sourceLineNo">800</span>   public SerializerGroupBuilder setPojoSwaps(Class&lt;?&gt;...values) {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>      return property(BEAN_pojoSwaps, values);<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>    * Sets the {@link BeanContext#BEAN_pojoSwaps} property on all serializers in this group.<a name="line.805"></a>
-<span class="sourceLineNo">806</span>    *<a name="line.806"></a>
-<span class="sourceLineNo">807</span>    * @param values The values to add to this property.<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    * @return This object (for method chaining).<a name="line.808"></a>
-<span class="sourceLineNo">809</span>    * @see BeanContext#BEAN_pojoSwaps<a name="line.809"></a>
-<span class="sourceLineNo">810</span>    */<a name="line.810"></a>
-<span class="sourceLineNo">811</span>   public SerializerGroupBuilder setPojoSwaps(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      return property(BEAN_pojoSwaps, values);<a name="line.812"></a>
-<span class="sourceLineNo">813</span>   }<a name="line.813"></a>
-<span class="sourceLineNo">814</span><a name="line.814"></a>
-<span class="sourceLineNo">815</span>   /**<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    * Sets the {@link BeanContext#BEAN_pojoSwaps_remove} property on all serializers in this group.<a name="line.816"></a>
-<span class="sourceLineNo">817</span>    *<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    * @param values The values to remove from this property.<a name="line.818"></a>
-<span class="sourceLineNo">819</span>    * @return This object (for method chaining).<a name="line.819"></a>
-<span class="sourceLineNo">820</span>    * @see BeanContext#BEAN_pojoSwaps_remove<a name="line.820"></a>
-<span class="sourceLineNo">821</span>    */<a name="line.821"></a>
-<span class="sourceLineNo">822</span>   public SerializerGroupBuilder removePojoSwaps(Class&lt;?&gt;...values) {<a name="line.822"></a>
-<span class="sourceLineNo">823</span>      return property(BEAN_pojoSwaps_remove, values);<a name="line.823"></a>
-<span class="sourceLineNo">824</span>   }<a name="line.824"></a>
-<span class="sourceLineNo">825</span><a name="line.825"></a>
-<span class="sourceLineNo">826</span>   /**<a name="line.826"></a>
-<span class="sourceLineNo">827</span>    * Sets the {@link BeanContext#BEAN_pojoSwaps_remove} property on all serializers in this group.<a name="line.827"></a>
-<span class="sourceLineNo">828</span>    *<a name="line.828"></a>
-<span class="sourceLineNo">829</span>    * @param values The values to remove from this property.<a name="line.829"></a>
-<span class="sourceLineNo">830</span>    * @return This object (for method chaining).<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    * @see BeanContext#BEAN_pojoSwaps_remove<a name="line.831"></a>
-<span class="sourceLineNo">832</span>    */<a name="line.832"></a>
-<span class="sourceLineNo">833</span>   public SerializerGroupBuilder removePojoSwaps(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.833"></a>
-<span class="sourceLineNo">834</span>      return property(BEAN_pojoSwaps_remove, values);<a name="line.834"></a>
-<span class="sourceLineNo">835</span>   }<a name="line.835"></a>
-<span class="sourceLineNo">836</span><a name="line.836"></a>
-<span class="sourceLineNo">837</span>   /**<a name="line.837"></a>
-<span class="sourceLineNo">838</span>    * Sets the {@link BeanContext#BEAN_implClasses} property on all serializers in this group.<a name="line.838"></a>
-<span class="sourceLineNo">839</span>    *<a name="line.839"></a>
-<span class="sourceLineNo">840</span>    * @param values The new value for this property.<a name="line.840"></a>
-<span class="sourceLineNo">841</span>    * @return This object (for method chaining).<a name="line.841"></a>
-<span class="sourceLineNo">842</span>    * @see BeanContext#BEAN_implClasses<a name="line.842"></a>
-<span class="sourceLineNo">843</span>    */<a name="line.843"></a>
-<span class="sourceLineNo">844</span>   public SerializerGroupBuilder implClasses(Map&lt;Class&lt;?&gt;,Class&lt;?&gt;&gt; values) {<a name="line.844"></a>
-<span class="sourceLineNo">845</span>      return property(BEAN_implClasses, values);<a name="line.845"></a>
-<span class="sourceLineNo">846</span>   }<a name="line.846"></a>
-<span class="sourceLineNo">847</span><a name="line.847"></a>
-<span class="sourceLineNo">848</span>   /**<a name="line.848"></a>
-<span class="sourceLineNo">849</span>    * Sets the {@link BeanContext#BEAN_implClasses_put} property on all serializers in this group.<a name="line.849"></a>
-<span class="sourceLineNo">850</span>    *<a name="line.850"></a>
-<span class="sourceLineNo">851</span>    * @param interfaceClass The interface class.<a name="line.851"></a>
-<span class="sourceLineNo">852</span>    * @param implClass The implementation class.<a name="line.852"></a>
-<span class="sourceLineNo">853</span>    * @param &lt;T&gt; The class type of the interface.<a name="line.853"></a>
-<span class="sourceLineNo">854</span>    * @return This object (for method chaining).<a name="line.854"></a>
-<span class="sourceLineNo">855</span>    * @see BeanContext#BEAN_implClasses<a name="line.855"></a>
-<span class="sourceLineNo">856</span>    * @see BeanContext#BEAN_implClasses_put<a name="line.856"></a>
-<span class="sourceLineNo">857</span>    */<a name="line.857"></a>
-<span class="sourceLineNo">858</span>   public &lt;T&gt; SerializerGroupBuilder implClass(Class&lt;T&gt; interfaceClass, Class&lt;? extends T&gt; implClass) {<a name="line.858"></a>
-<span class="sourceLineNo">859</span>      return putToProperty(BEAN_implClasses, interfaceClass, implClass);<a name="line.859"></a>
-<span class="sourceLineNo">860</span>   }<a name="line.860"></a>
-<span class="sourceLineNo">861</span><a name="line.861"></a>
-<span class="sourceLineNo">862</span>   /**<a name="line.862"></a>
-<span class="sourceLineNo">863</span>    * Sets the {@link BeanContext#BEAN_beanDictionary_add} property on all serializers in this group.<a name="line.863"></a>
-<span class="sourceLineNo">864</span>    *<a name="line.864"></a>
-<span class="sourceLineNo">865</span>    * @param values The new value for this property.<a name="line.865"></a>
-<span class="sourceLineNo">866</span>    * @return This object (for method chaining).<a name="line.866"></a>
-<span class="sourceLineNo">867</span>    * @see BeanContext#BEAN_beanDictionary_add<a name="line.867"></a>
-<span class="sourceLineNo">868</span>    */<a name="line.868"></a>
-<span class="sourceLineNo">869</span>   public SerializerGroupBuilder beanDictionary(Class&lt;?&gt;...values) {<a name="line.869"></a>
-<span class="sourceLineNo">870</span>      return property(BEAN_beanDictionary_add, values);<a name="line.870"></a>
-<span class="sourceLineNo">871</span>   }<a name="line.871"></a>
-<span class="sourceLineNo">872</span><a name="line.872"></a>
-<span class="sourceLineNo">873</span>   /**<a name="line.873"></a>
-<span class="sourceLineNo">874</span>    * Sets the {@link BeanContext#BEAN_beanDictionary_add} property on all serializers in this group.<a name="line.874"></a>
-<span class="sourceLineNo">875</span>    *<a name="line.875"></a>
-<span class="sourceLineNo">876</span>    * @param values The values to add to this property.<a name="line.876"></a>
-<span class="sourceLineNo">877</span>    * @return This object (for method chaining).<a name="line.877"></a>
-<span class="sourceLineNo">878</span>    * @see BeanContext#BEAN_beanDictionary_add<a name="line.878"></a>
-<span class="sourceLineNo">879</span>    */<a name="line.879"></a>
-<span class="sourceLineNo">880</span>   public SerializerGroupBuilder beanDictionary(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.880"></a>
-<span class="sourceLineNo">881</span>      return property(BEAN_beanDictionary_add, values);<a name="line.881"></a>
-<span class="sourceLineNo">882</span>   }<a name="line.882"></a>
-<span class="sourceLineNo">883</span><a name="line.883"></a>
-<span class="sourceLineNo">884</span>   /**<a name="line.884"></a>
-<span class="sourceLineNo">885</span>    * Sets the {@link BeanContext#BEAN_beanDictionary} property on all serializers in this group.<a name="line.885"></a>
-<span class="sourceLineNo">886</span>    *<a name="line.886"></a>
-<span class="sourceLineNo">887</span>    * @param values The values to add to this property.<a name="line.887"></a>
-<span class="sourceLineNo">888</span>    * @return This object (for method chaining).<a name="line.888"></a>
-<span class="sourceLineNo">889</span>    * @see BeanContext#BEAN_beanDictionary<a name="line.889"></a>
-<span class="sourceLineNo">890</span>    */<a name="line.890"></a>
-<span class="sourceLineNo">891</span>   public SerializerGroupBuilder setBeanDictionary(Class&lt;?&gt;...values) {<a name="line.891"></a>
-<span class="sourceLineNo">892</span>      return property(BEAN_beanDictionary, values);<a name="line.892"></a>
-<span class="sourceLineNo">893</span>   }<a name="line.893"></a>
-<span class="sourceLineNo">894</span><a name="line.894"></a>
-<span class="sourceLineNo">895</span>   /**<a name="line.895"></a>
-<span class="sourceLineNo">896</span>    * Sets the {@link BeanContext#BEAN_beanDictionary} property on all serializers in this group.<a name="line.896"></a>
-<span class="sourceLineNo">897</span>    *<a name="line.897"></a>
-<span class="sourceLineNo">898</span>    * @param values The values to add to this property.<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    * @return This object (for method chaining).<a name="line.899"></a>
-<span class="sourceLineNo">900</span>    * @see BeanContext#BEAN_beanDictionary<a name="line.900"></a>
-<span class="sourceLineNo">901</span>    */<a name="line.901"></a>
-<span class="sourceLineNo">902</span>   public SerializerGroupBuilder setBeanDictionary(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.902"></a>
-<span class="sourceLineNo">903</span>      return property(BEAN_beanDictionary, values);<a name="line.903"></a>
-<span class="sourceLineNo">904</span>   }<a name="line.904"></a>
-<span class="sourceLineNo">905</span><a name="line.905"></a>
-<span class="sourceLineNo">906</span>   /**<a name="line.906"></a>
-<span class="sourceLineNo">907</span>    * Sets the {@link BeanContext#BEAN_beanDictionary_remove} property on all serializers in this group.<a name="line.907"></a>
-<span class="sourceLineNo">908</span>    *<a name="line.908"></a>
-<span class="sourceLineNo">909</span>    * @param values The values to remove from this property.<a name="line.909"></a>
-<span class="sourceLineNo">910</span>    * @return This object (for method chaining).<a name="line.910"></a>
-<span class="sourceLineNo">911</span>    * @see BeanContext#BEAN_beanDictionary_remove<a name="line.911"></a>
-<span class="sourceLineNo">912</span>    */<a name="line.912"></a>
-<span class="sourceLineNo">913</span>   public SerializerGroupBuilder removeFromBeanDictionary(Class&lt;?&gt;...values) {<a name="line.913"></a>
-<span class="sourceLineNo">914</span>      return property(BEAN_beanDictionary_remove, values);<a name="line.914"></a>
-<span class="sourceLineNo">915</span>   }<a name="line.915"></a>
-<span class="sourceLineNo">916</span><a name="line.916"></a>
-<span class="sourceLineNo">917</span>   /**<a name="line.917"></a>
-<span class="sourceLineNo">918</span>    * Sets the {@link BeanContext#BEAN_beanDictionary_remove} property on all serializers in this group.<a name="line.918"></a>
-<span class="sourceLineNo">919</span>    *<a name="line.919"></a>
-<span class="sourceLineNo">920</span>    * @param values The values to remove from this property.<a name="line.920"></a>
-<span class="sourceLineNo">921</span>    * @return This object (for method chaining).<a name="line.921"></a>
-<span class="sourceLineNo">922</span>    * @see BeanContext#BEAN_beanDictionary_remove<a name="line.922"></a>
-<span class="sourceLineNo">923</span>    */<a name="line.923"></a>
-<span class="sourceLineNo">924</span>   public SerializerGroupBuilder removeFromBeanDictionary(Collection&lt;Class&lt;?&gt;&gt; values) {<a name="line.924"></a>
-<span class="sourceLineNo">925</span>      return property(BEAN_beanDictionary_remove, values);<a name="line.925"></a>
-<span class="sourceLineNo">926</span>   }<a name="line.926"></a>
-<span class="sourceLineNo">927</span><a name="line.927"></a>
-<span class="sourceLineNo">928</span>   /**<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    * Sets the {@link BeanContext#BEAN_beanTypePropertyName} property on all serializers in this group.<a name="line.929"></a>
-<span class="sourceLineNo">930</span>    *<a name="line.930"></a>
-<span class="sourceLineNo">931</span>    * @param value The new value for this property.<a name="line.931"></a>
-<span class="sourceLineNo">932</span>    * @return This object (for method chaining).<a name="line.932"></a>
-<span class="sourceLineNo">933</span>    * @see BeanContext#BEAN_beanTypePropertyName<a name="line.933"></a>
-<span class="sourceLineNo">934</span>    */<a name="line.934"></a>
-<span class="sourceLineNo">935</span>   public SerializerGroupBuilder beanTypePropertyName(String value) {<a name="line.935"></a>
-<span class="sourceLineNo">936</span>      return property(BEAN_beanTypePropertyName, value);<a name="line.936"></a>
-<span class="sourceLineNo">937</span>   }<a name="line.937"></a>
-<span class="sourceLineNo">938</span><a name="line.938"></a>
-<span class="sourceLineNo">939</span>   /**<a name="line.939"></a>
-<span class="sourceLineNo">940</span>    * Sets the {@link BeanContext#BEAN_defaultParser} property on all serializers in this group.<a name="line.940"></a>
-<span class="sourceLineNo">941</span>    *<a name="line.941"></a>
-<span class="sourceLineNo">942</span>    * @param value The new value for this property.<a name="line.942"></a>
-<span class="sourceLineNo">943</span>    * @return This object (for method chaining).<a name="line.943"></a>
-<span class="sourceLineNo">944</span>    * @see BeanContext#BEAN_defaultParser<a name="line.944"></a>
-<span class="sourceLineNo">945</span>    */<a name="line.945"></a>
-<span class="sourceLineNo">946</span>   public SerializerGroupBuilder defaultParser(Class&lt;?&gt; value) {<a name="line.946"></a>
-<span class="sourceLineNo">947</span>      return property(BEAN_defaultParser, value);<a name="line.947"></a>
-<span class="sourceLineNo">948</span>   }<a name="line.948"></a>
-<span class="sourceLineNo">949</span><a name="line.949"></a>
-<span class="sourceLineNo">950</span>   /**<a name="line.950"></a>
-<span class="sourceLineNo">951</span>    * Sets the {@link BeanContext#BEAN_locale} property on all serializers in this group.<a name="line.951"></a>
-<span class="sourceLineNo">952</span>    *<a name="line.952"></a>
-<span class="sourceLineNo">953</span>    * @param value The new value for this property.<a name="line.953"></a>
-<span class="sourceLineNo">954</span>    * @return This object (for method chaining).<a name="line.954"></a>
-<span class="sourceLineNo">955</span>    * @see BeanContext#BEAN_locale<a name="line.955"></a>
-<span class="sourceLineNo">956</span>    */<a name="line.956"></a>
-<span class="sourceLineNo">957</span>   public SerializerGroupBuilder locale(Locale value) {<a name="line.957"></a>
-<span class="sourceLineNo">958</span>      return property(BEAN_locale, value);<a name="line.958"></a>
-<span class="sourceLineNo">959</span>   }<a name="line.959"></a>
-<span class="sourceLineNo">960</span><a name="line.960"></a>
-<span class="sourceLineNo">961</span>   /**<a name="line.961"></a>
-<span class="sourceLineNo">962</span>    * Sets the {@link BeanContext#BEAN_timeZone} property on all serializers in this group.<a name="line.962"></a>
-<span class="sourceLineNo">963</span>    *<a name="line.963"></a>
-<span class="sourceLineNo">964</span>    * @param value The new value for this property.<a name="line.964"></a>
-<span class="sourceLineNo">965</span>    * @return This object (for method chaining).<a name="line.965"></a>
-<span class="sourceLineNo">966</span>    * @see BeanContext#BEAN_timeZone<a name="line.966"></a>
-<span class="sourceLineNo">967</span>    */<a name="line.967"></a>
-<span class="sourceLineNo">968</span>   public SerializerGroupBuilder timeZone(TimeZone value) {<a name="line.968"></a>
-<span class="sourceLineNo">969</span>      return property(BEAN_timeZone, value);<a name="line.969"></a>
-<span class="sourceLineNo">970</span>   }<a name="line.970"></a>
-<span class="sourceLineNo">971</span><a name="line.971"></a>
-<span class="sourceLineNo">972</span>   /**<a name="line.972"></a>
-<span class="sourceLineNo">973</span>    * Sets the {@link BeanContext#BEAN_mediaType} property on all serializers in this group.<a name="line.973"></a>
-<span class="sourceLineNo">974</span>    *<a name="line.974"></a>
-<span class="sourceLineNo">975</span>    * @param value The new value for this property.<a name="line.975"></a>
-<span class="sourceLineNo">976</span>    * @return This object (for method chaining).<a name="line.976"></a>
-<span class="sourceLineNo">977</span>    * @see BeanContext#BEAN_mediaType<a name="line.977"></a>
-<span class="sourceLineNo">978</span>    */<a name="line.978"></a>
-<span class="sourceLineNo">979</span>   public SerializerGroupBuilder mediaType(MediaType value) {<a name="line.979"></a>
-<span class="sourceLineNo">980</span>      return property(BEAN_mediaType, value);<a name="line.980"></a>
-<span class="sourceLineNo">981</span>   }<a name="line.981"></a>
-<span class="sourceLineNo">982</span><a name="line.982"></a>
-<span class="sourceLineNo">983</span>   /**<a name="line.983"></a>
-<span class="sourceLineNo">984</span>    * Sets the {@link BeanContext#BEAN_debug} property on all serializers in this group.<a name="line.984"></a>
-<span class="sourceLineNo">985</span>    *<a name="line.985"></a>
-<span class="sourceLineNo">986</span>    * @param value The new value for this property.<a name="line.986"></a>
-<span class="sourceLineNo">987</span>    * @return This object (for method chaining).<a name="line.987"></a>
-<span class="sourceLineNo">988</span>    * @see BeanContext#BEAN_debug<a name="line.988"></a>
-<span class="sourceLineNo">989</span>    */<a name="line.989"></a>
-<span class="sourceLineNo">990</span>   public SerializerGroupBuilder debug(boolean value) {<a name="line.990"></a>
-<span class="sourceLineNo">991</span>      return property(BEAN_debug, value);<a name="line.991"></a>
-<span class="sourceLineNo">992</span>   }<a name="line.992"></a>
-<span class="sourceLineNo">993</span><a name="line.993"></a>
-<span class="sourceLineNo">994</span>   /**<a name="line.994"></a>
-<span class="sourceLineNo">995</span>    * Specifies the classloader to use when resolving classes from strings for all serializers in this group.<a name="line.995"></a>
-<span class="sourceLineNo">996</span>    * &lt;p&gt;<a name="line.996"></a>
-<span class="sourceLineNo">997</span>    * Can be used for resolving class names when the classes being created are in a different<a name="line.997"></a>
-<span class="sourceLineNo">998</span>    *    classloader from the Juneau code.<a name="line.998"></a>
-<span class="sourceLineNo">999</span>    * &lt;p&gt;<a name="line.999"></a>
-<span class="sourceLineNo">1000</span>    * If &lt;jk&gt;null&lt;/jk&gt;, the system classloader will be used to resolve classes.<a name="line.1000"></a>
-<span class="sourceLineNo">1001</span>    *<a name="line.1001"></a>
-<span class="sourceLineNo">1002</span>    * @param classLoader The new classloader.<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>    * @return This object (for method chaining).<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>    * @see PropertyStore#setClassLoader(ClassLoader)<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>    */<a name="line.1005"></a>
-<span class="sourceLineNo">1006</span>   public SerializerGroupBuilder classLoader(ClassLoader classLoader) {<a name="line.1006"></a>
-<span class="sourceLineNo">1007</span>      propertyStore.setClassLoader(classLoader);<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span>      return this;<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span>   }<a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>}<a name="line.1010"></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 SerializerGroupBuilder ws() {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      return useWhitespace(true);<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>    * Sets the {@link SerializerContext#SERIALIZER_addBeanTypeProperties} property on all serializers in this group.<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    *<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    * @param value The new value for this property.<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    * @return This object (for method chaining).<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    * @see SerializerContext#SERIALIZER_addBeanTypeProperties<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    */<a name="line.280"></a>
+<span class="sourceLineNo">281</span>   public SerializerGroupBuilder addBeanTypeProperties(boolean value) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      return property(SERIALIZER_addBeanTypeProperties, 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 {@link SerializerContext#SERIALIZER_quoteChar} property on all serializers in this group.<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    *<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    * @param value The new value for this property.<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>    * @see SerializerContext#SERIALIZER_quoteChar<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    */<a name="line.291"></a>
+<span class="sourceLineNo">292</span>   public SerializerGroupBuilder quoteChar(char value) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      return property(SERIALIZER_quoteChar, value);<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>    * Shortcut for calling &lt;code&gt;quoteChar(&lt;js&gt;'\''&lt;/js&gt;)&lt;/code&gt;.<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    *<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    * @return This object (for method chaining).<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    */<a name="line.300"></a>
+<span class="sourceLineNo">301</span>   public SerializerGroupBuilder sq() {<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      return quoteChar('\'');<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>    * Sets the {@link SerializerContext#SERIALIZER_trimNullProperties} property on all serializers in this group.<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    *<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    * @param value The new value for this property.<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    * @return This object (for method chaining).<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    * @see SerializerContext#SERIALIZER_trimNullProperties<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    */<a name="line.311"></a>
+<span class="sourceLineNo">312</span>   public SerializerGroupBuilder trimNullProperties(boolean value) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      return property(SERIALIZER_trimNullProperties, value);<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>    * Sets the {@link SerializerContext#SERIALIZER_trimEmptyCollections} property on all serializers in this group.<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    *<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    * @param value The new value for this property.<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    * @return This object (for method chaining).<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    * @see SerializerContext#SERIALIZER_trimEmptyCollections<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    */<a name="line.322"></a>
+<span class="sourceLineNo">323</span>   public SerializerGroupBuilder trimEmptyCollections(boolean value) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      return property(SERIALIZER_trimEmptyCollections, value);<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>   /**<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    * Sets the {@link SerializerContext#SERIALIZER_trimEmptyMaps} property on all serializers in this group.<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    *<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    * @param value The new value for this property.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    * @return This object (for method chaining).<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    * @see SerializerContext#SERIALIZER_trimEmptyMaps<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    */<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   public SerializerGroupBuilder trimEmptyMaps(boolean value) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      return property(SERIALIZER_trimEmptyMaps, value);<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   }<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>    * Sets the {@link SerializerContext#SERIALIZER_trimStrings} property on all serializers in this group.<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    *<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    * @param value The new value for this property.<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>    * @see SerializerContext#SERIALIZER_trimStrings<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    */<a name="line.344"></a>
+<span class="sourceLineNo">345</span>   public SerializerGroupBuilder trimStrings(boolean value) {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      return property(SERIALIZER_trimStrings, value);<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>   /**<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    * Sets the {@link SerializerContext#SERIALIZER_relativeUriBase} property on all serializers in this group.<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    *<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    * @param value The new value for this property.<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    * @return This object (for method chaining).<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    * @see SerializerContext#SERIALIZER_relativeUriBase<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    */<a name="line.355"></a>
+<span class="sourceLineNo">356</span>   public SerializerGroupBuilder relativeUriBase(String value) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span>      return property(SERIALIZER_relativeUriBase, 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 {@link SerializerContext#SERIALIZER_absolutePathUriBase} property on all serializers in this group.<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    *<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    * @param value The new value for this property.<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    * @return This object (for method chaining).<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    * @see SerializerContext#SERIALIZER_absolutePathUriBase<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    */<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   public SerializerGroupBuilder absolutePathUriBase(String value) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      return property(SERIALIZER_absolutePathUriBase, value);<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>    * Sets the {@link SerializerContext#SERIALIZER_sortCollections} property on all serializers in this group.<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    *<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    * @param value The new value for this property.<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>    * @see SerializerContext#SERIALIZER_sortCollections<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    */<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   public SerializerGroupBuilder sortCollections(boolean value) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      return property(SERIALIZER_sortCollections, value);<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>   /**<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    * Sets the {@link SerializerContext#SERIALIZER_sortMaps} property on all serializers in this group.<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    *<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    * @param value The new value for this property.<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    * @return This object (for method chaining).<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    * @see SerializerContext#SERIALIZER_sortMaps<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    */<a name="line.388"></a>
+<span class="sourceLineNo">389</span>   public SerializerGroupBuilder sortMaps(boolean value) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      return property(SERIALIZER_sortMaps, 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 {@link SerializerContext#SERIALIZER_abridged} property on all serializers in this group.<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    *<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    * @param value The new value for this property.<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>    * @see SerializerContext#SERIALIZER_abridged<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    */<a name="line.399"></a>
+<span class="sourceLineNo">400</span>   public SerializerGroupBuilder parserKnowsRootType(boolean value) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      return property(SERIALIZER_abridged, value);<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>    * Sets the {@link BeanContext#BEAN_beansRequireDefaultConstructor} property on all serializers in this group.<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    *<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    * @param value The new value for this property.<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    * @return This object (for method chaining).<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    * @see BeanContext#BEAN_beansRequireDefaultConstructor<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    */<a name="line.410"></a>
+<span class="sourceLineNo">411</span>   public SerializerGroupBuilder beansRequireDefaultConstructor(boolean value) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      return property(BEAN_beansRequireDefaultConstructor, value);<a name="line.412"></a>
+<span class="sourceLineNo">413</span>   }<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>    * Sets the {@link BeanContext#BEAN_beansRequireSerializable} property on all serializers in this group.<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    *<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    * @param value The new value for this property.<a name="line.418">

<TRUNCATED>


[15/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 519255b..8d17234 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
@@ -408,305 +408,331 @@
 <span class="sourceLineNo">400</span>      out.eTag(i, "table").nl();<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 void serializeBeanMap(HtmlSerializerSession session, HtmlWriter out, BeanMap&lt;?&gt; m, ClassMeta&lt;?&gt; eType, BeanPropertyMeta ppMeta) throws Exception {<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      int i = session.getIndent();<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span>      out.oTag(i, "table");<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span>      String typeName = m.getMeta().getDictionaryName();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      if (typeName != null &amp;&amp; eType != m.getClassMeta())<a name="line.409"></a>
-<span class="sourceLineNo">410</span>         out.attr(session.getBeanTypePropertyName(m.getClassMeta()), typeName);<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>      out.append('&gt;').nl();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      if (session.isAddKeyValueTableHeaders() &amp;&amp; ! (m.getClassMeta().getExtendedMeta(HtmlClassMeta.class).isNoTableHeaders() || (ppMeta != null &amp;&amp; ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isNoTableHeaders()))) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>         out.sTag(i+1, "tr").nl();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>         out.sTag(i+2, "th").append("key").eTag("th").nl();<a name="line.415"></a>
-<span class="sourceLineNo">416</span>         out.sTag(i+2, "th").append("value").eTag("th").nl();<a name="line.416"></a>
-<span class="sourceLineNo">417</span>         out.eTag(i+1, "tr").nl();<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>      for (BeanPropertyValue p : m.getValues(session.isTrimNulls())) {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>         BeanPropertyMeta pMeta = p.getMeta();<a name="line.421"></a>
-<span class="sourceLineNo">422</span>         ClassMeta&lt;?&gt; cMeta = p.getClassMeta();<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span>         String key = p.getName();<a name="line.424"></a>
-<span class="sourceLineNo">425</span>         Object value = p.getValue();<a name="line.425"></a>
-<span class="sourceLineNo">426</span>         Throwable t = p.getThrown();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>         if (t != null)<a name="line.427"></a>
-<span class="sourceLineNo">428</span>            session.addBeanGetterWarning(pMeta, t);<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span>         if (session.canIgnoreValue(cMeta, key, value))<a name="line.430"></a>
-<span class="sourceLineNo">431</span>            continue;<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>         out.sTag(i+1, "tr").nl();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>         out.sTag(i+2, "td").text(key).eTag("td").nl();<a name="line.434"></a>
-<span class="sourceLineNo">435</span>         out.sTag(i+2, "td");<a name="line.435"></a>
-<span class="sourceLineNo">436</span>         try {<a name="line.436"></a>
-<span class="sourceLineNo">437</span>            ContentResult cr = serializeAnything(session, out, value, cMeta, key, 2, pMeta, false);<a name="line.437"></a>
-<span class="sourceLineNo">438</span>            if (cr == CR_NORMAL)<a name="line.438"></a>
-<span class="sourceLineNo">439</span>               out.i(i+2);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>         } catch (SerializeException e) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>            throw e;<a name="line.441"></a>
-<span class="sourceLineNo">442</span>         } catch (Error e) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>            throw e;<a name="line.443"></a>
-<span class="sourceLineNo">444</span>         } catch (Throwable e) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span>            e.printStackTrace();<a name="line.445"></a>
-<span class="sourceLineNo">446</span>            session.addBeanGetterWarning(pMeta, e);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>         }<a name="line.447"></a>
-<span class="sourceLineNo">448</span>         out.eTag("td").nl();<a name="line.448"></a>
-<span class="sourceLineNo">449</span>         out.eTag(i+1, "tr").nl();<a name="line.449"></a>
-<span class="sourceLineNo">450</span>      }<a name="line.450"></a>
-<span class="sourceLineNo">451</span>      out.eTag(i, "table").nl();<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>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.454"></a>
-<span class="sourceLineNo">455</span>   private void serializeCollection(HtmlSerializerSession session, HtmlWriter out, Object in, ClassMeta&lt;?&gt; sType, ClassMeta&lt;?&gt; eType, String name, BeanPropertyMeta ppMeta) throws Exception {<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>      ClassMeta&lt;?&gt; seType = sType.getElementType();<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      if (seType == null)<a name="line.458"></a>
-<span class="sourceLineNo">459</span>         seType = session.object();<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span>      Collection c = (sType.isCollection() ? (Collection)in : toList(sType.getInnerClass(), in));<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>      int i = session.getIndent();<a name="line.463"></a>
-<span class="sourceLineNo">464</span>      if (c.isEmpty()) {<a name="line.464"></a>
-<span class="sourceLineNo">465</span>         out.appendln(i, "&lt;ul&gt;&lt;/ul&gt;");<a name="line.465"></a>
-<span class="sourceLineNo">466</span>         return;<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>      String type2 = null;<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      if (sType != eType)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>         type2 = sType.getDictionaryName();<a name="line.471"></a>
-<span class="sourceLineNo">472</span>      if (type2 == null)<a name="line.472"></a>
-<span class="sourceLineNo">473</span>         type2 = "array";<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span>      c = session.sort(c);<a name="line.475"></a>
-<span class="sourceLineNo">476</span><a name="line.476"></a>
-<span class="sourceLineNo">477</span>      HtmlBeanPropertyMeta hbpMeta = (ppMeta == null ? null : ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class));<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      String btpn = session.getBeanTypePropertyName(eType);<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span>      // Look at the objects to see how we're going to handle them.  Check the first object to see how we're going to handle this.<a name="line.480"></a>
-<span class="sourceLineNo">481</span>      // If it's a map or bean, then we'll create a table.<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      // Otherwise, we'll create a list.<a name="line.482"></a>
-<span class="sourceLineNo">483</span>      Object[] th = getTableHeaders(session, c, hbpMeta);<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>      if (th != null) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>         out.oTag(i, "table").attr(btpn, type2).append('&gt;').nl();<a name="line.487"></a>
-<span class="sourceLineNo">488</span>         out.sTag(i+1, "tr").nl();<a name="line.488"></a>
-<span class="sourceLineNo">489</span>         for (Object key : th) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>            out.sTag(i+2, "th");<a name="line.490"></a>
-<span class="sourceLineNo">491</span>            out.text(session.convertToType(key, String.class));<a name="line.491"></a>
-<span class="sourceLineNo">492</span>            out.eTag("th").nl();<a name="line.492"></a>
-<span class="sourceLineNo">493</span>         }<a name="line.493"></a>
-<span class="sourceLineNo">494</span>         out.eTag(i+1, "tr").nl();<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span>         for (Object o : c) {<a name="line.496"></a>
-<span class="sourceLineNo">497</span>            ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o);<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>            if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.499"></a>
-<span class="sourceLineNo">500</span>               PojoSwap f = cm.getPojoSwap();<a name="line.500"></a>
-<span class="sourceLineNo">501</span>               o = f.swap(session, o);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>               cm = cm.getSerializedClassMeta();<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>            out.oTag(i+1, "tr");<a name="line.505"></a>
-<span class="sourceLineNo">506</span>            String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.506"></a>
-<span class="sourceLineNo">507</span>            String typeProperty = session.getBeanTypePropertyName(cm);<a name="line.507"></a>
+<span class="sourceLineNo">403</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.403"></a>
+<span class="sourceLineNo">404</span>   private void serializeBeanMap(HtmlSerializerSession session, HtmlWriter out, BeanMap&lt;?&gt; m, ClassMeta&lt;?&gt; eType, BeanPropertyMeta ppMeta) throws Exception {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      int i = session.getIndent();<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>      out.oTag(i, "table");<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span>      String typeName = m.getMeta().getDictionaryName();<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      if (typeName != null &amp;&amp; eType != m.getClassMeta())<a name="line.410"></a>
+<span class="sourceLineNo">411</span>         out.attr(session.getBeanTypePropertyName(m.getClassMeta()), typeName);<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span>      out.append('&gt;').nl();<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      if (session.isAddKeyValueTableHeaders() &amp;&amp; ! (m.getClassMeta().getExtendedMeta(HtmlClassMeta.class).isNoTableHeaders() || (ppMeta != null &amp;&amp; ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isNoTableHeaders()))) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>         out.sTag(i+1, "tr").nl();<a name="line.415"></a>
+<span class="sourceLineNo">416</span>         out.sTag(i+2, "th").append("key").eTag("th").nl();<a name="line.416"></a>
+<span class="sourceLineNo">417</span>         out.sTag(i+2, "th").append("value").eTag("th").nl();<a name="line.417"></a>
+<span class="sourceLineNo">418</span>         out.eTag(i+1, "tr").nl();<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>      for (BeanPropertyValue p : m.getValues(session.isTrimNulls())) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>         BeanPropertyMeta pMeta = p.getMeta();<a name="line.422"></a>
+<span class="sourceLineNo">423</span>         ClassMeta&lt;?&gt; cMeta = p.getClassMeta();<a name="line.423"></a>
+<span class="sourceLineNo">424</span>         HtmlBeanPropertyMeta hbpMeta = pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>         String link = hbpMeta.getLink();<a name="line.425"></a>
+<span class="sourceLineNo">426</span>         HtmlRender render = hbpMeta.getRender();<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span>         String key = p.getName();<a name="line.428"></a>
+<span class="sourceLineNo">429</span>         Object value = p.getValue();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>         Throwable t = p.getThrown();<a name="line.430"></a>
+<span class="sourceLineNo">431</span>         if (t != null)<a name="line.431"></a>
+<span class="sourceLineNo">432</span>            session.addBeanGetterWarning(pMeta, t);<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>         if (session.canIgnoreValue(cMeta, key, value))<a name="line.434"></a>
+<span class="sourceLineNo">435</span>            continue;<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span>         out.sTag(i+1, "tr").nl();<a name="line.437"></a>
+<span class="sourceLineNo">438</span>         out.sTag(i+2, "td").text(key).eTag("td").nl();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>         out.oTag(i+2, "td");<a name="line.439"></a>
+<span class="sourceLineNo">440</span>         String style = render.getStyle(session, value);<a name="line.440"></a>
+<span class="sourceLineNo">441</span>         if (style != null)<a name="line.441"></a>
+<span class="sourceLineNo">442</span>            out.attr("style", style);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>         out.cTag();<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span>         try {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>            if (link != null) <a name="line.446"></a>
+<span class="sourceLineNo">447</span>               out.oTag(i+3, "a").attrUri("href", m.resolveVars(link)).cTag();<a name="line.447"></a>
+<span class="sourceLineNo">448</span>            ContentResult cr = serializeAnything(session, out, render.getContent(session, value), cMeta, key, 2, pMeta, false);<a name="line.448"></a>
+<span class="sourceLineNo">449</span>            if (cr == CR_NORMAL)<a name="line.449"></a>
+<span class="sourceLineNo">450</span>               out.i(i+2);<a name="line.450"></a>
+<span class="sourceLineNo">451</span>            if (link != null) <a name="line.451"></a>
+<span class="sourceLineNo">452</span>               out.eTag("a");<a name="line.452"></a>
+<span class="sourceLineNo">453</span>         } catch (SerializeException e) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>            throw e;<a name="line.454"></a>
+<span class="sourceLineNo">455</span>         } catch (Error e) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>            throw e;<a name="line.456"></a>
+<span class="sourceLineNo">457</span>         } catch (Throwable e) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>            e.printStackTrace();<a name="line.458"></a>
+<span class="sourceLineNo">459</span>            session.addBeanGetterWarning(pMeta, e);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>         }<a name="line.460"></a>
+<span class="sourceLineNo">461</span>         out.eTag("td").nl();<a name="line.461"></a>
+<span class="sourceLineNo">462</span>         out.eTag(i+1, "tr").nl();<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      }<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      out.eTag(i, "table").nl();<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>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.467"></a>
+<span class="sourceLineNo">468</span>   private void serializeCollection(HtmlSerializerSession session, HtmlWriter out, Object in, ClassMeta&lt;?&gt; sType, ClassMeta&lt;?&gt; eType, String name, BeanPropertyMeta ppMeta) throws Exception {<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span>      ClassMeta&lt;?&gt; seType = sType.getElementType();<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      if (seType == null)<a name="line.471"></a>
+<span class="sourceLineNo">472</span>         seType = session.object();<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span>      Collection c = (sType.isCollection() ? (Collection)in : toList(sType.getInnerClass(), in));<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span>      int i = session.getIndent();<a name="line.476"></a>
+<span class="sourceLineNo">477</span>      if (c.isEmpty()) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span>         out.appendln(i, "&lt;ul&gt;&lt;/ul&gt;");<a name="line.478"></a>
+<span class="sourceLineNo">479</span>         return;<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>      String type2 = null;<a name="line.482"></a>
+<span class="sourceLineNo">483</span>      if (sType != eType)<a name="line.483"></a>
+<span class="sourceLineNo">484</span>         type2 = sType.getDictionaryName();<a name="line.484"></a>
+<span class="sourceLineNo">485</span>      if (type2 == null)<a name="line.485"></a>
+<span class="sourceLineNo">486</span>         type2 = "array";<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span>      c = session.sort(c);<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span>      HtmlBeanPropertyMeta hbpMeta = (ppMeta == null ? null : ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class));<a name="line.490"></a>
+<span class="sourceLineNo">491</span>      String btpn = session.getBeanTypePropertyName(eType);<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span>      // Look at the objects to see how we're going to handle them.  Check the first object to see how we're going to handle this.<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      // If it's a map or bean, then we'll create a table.<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      // Otherwise, we'll create a list.<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      Object[] th = getTableHeaders(session, c, hbpMeta);<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span>      if (th != null) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span>         out.oTag(i, "table").attr(btpn, type2).append('&gt;').nl();<a name="line.500"></a>
+<span class="sourceLineNo">501</span>         out.sTag(i+1, "tr").nl();<a name="line.501"></a>
+<span class="sourceLineNo">502</span>         for (Object key : th) {<a name="line.502"></a>
+<span class="sourceLineNo">503</span>            out.sTag(i+2, "th");<a name="line.503"></a>
+<span class="sourceLineNo">504</span>            out.text(session.convertToType(key, String.class));<a name="line.504"></a>
+<span class="sourceLineNo">505</span>            out.eTag("th").nl();<a name="line.505"></a>
+<span class="sourceLineNo">506</span>         }<a name="line.506"></a>
+<span class="sourceLineNo">507</span>         out.eTag(i+1, "tr").nl();<a name="line.507"></a>
 <span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span>            if (typeName != null &amp;&amp; eType.getElementType() != cm)<a name="line.509"></a>
-<span class="sourceLineNo">510</span>               out.attr(typeProperty, typeName);<a name="line.510"></a>
-<span class="sourceLineNo">511</span>            out.cTag().nl();<a name="line.511"></a>
-<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span>            if (cm == null) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>               serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span>            } else if (cm.isMap() &amp;&amp; ! (cm.isBeanMap())) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span>               Map m2 = session.sort((Map)o);<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span>               for (Object k : th) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>                  out.sTag(i+2, "td");<a name="line.520"></a>
-<span class="sourceLineNo">521</span>                  ContentResult cr = serializeAnything(session, out, m2.get(k), eType.getElementType(), session.toString(k), 2, null, false);<a name="line.521"></a>
-<span class="sourceLineNo">522</span>                  if (cr == CR_NORMAL)<a name="line.522"></a>
-<span class="sourceLineNo">523</span>                     out.i(i+2);<a name="line.523"></a>
-<span class="sourceLineNo">524</span>                  out.eTag("td").nl();<a name="line.524"></a>
-<span class="sourceLineNo">525</span>               }<a name="line.525"></a>
-<span class="sourceLineNo">526</span>            } else {<a name="line.526"></a>
-<span class="sourceLineNo">527</span>               BeanMap m2 = null;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>               if (o instanceof BeanMap)<a name="line.528"></a>
-<span class="sourceLineNo">529</span>                  m2 = (BeanMap)o;<a name="line.529"></a>
-<span class="sourceLineNo">530</span>               else<a name="line.530"></a>
-<span class="sourceLineNo">531</span>                  m2 = session.toBeanMap(o);<a name="line.531"></a>
-<span class="sourceLineNo">532</span><a name="line.532"></a>
-<span class="sourceLineNo">533</span>               for (Object k : th) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>                  BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.534"></a>
-<span class="sourceLineNo">535</span>                  BeanPropertyMeta pMeta = p.getMeta();<a name="line.535"></a>
-<span class="sourceLineNo">536</span>                  out.sTag(i+2, "td");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>                  ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>                  if (cr == CR_NORMAL)<a name="line.538"></a>
-<span class="sourceLineNo">539</span>                     out.i(i+2);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>                  out.eTag("td").nl();<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>            out.eTag(i+1, "tr").nl();<a name="line.543"></a>
-<span class="sourceLineNo">544</span>         }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>         out.eTag(i, "table").nl();<a name="line.545"></a>
-<span class="sourceLineNo">546</span><a name="line.546"></a>
-<span class="sourceLineNo">547</span>      } else {<a name="line.547"></a>
-<span class="sourceLineNo">548</span>         out.oTag(i, "ul");<a name="line.548"></a>
-<span class="sourceLineNo">549</span>         if (! type2.equals("array"))<a name="line.549"></a>
-<span class="sourceLineNo">550</span>            out.attr(btpn, type2);<a name="line.550"></a>
-<span class="sourceLineNo">551</span>         out.append('&gt;').nl();<a name="line.551"></a>
-<span class="sourceLineNo">552</span>         for (Object o : c) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span>            out.sTag(i+1, "li");<a name="line.553"></a>
-<span class="sourceLineNo">554</span>            ContentResult cr = serializeAnything(session, out, o, eType.getElementType(), name, 1, null, false);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>            if (cr == CR_NORMAL)<a name="line.555"></a>
-<span class="sourceLineNo">556</span>               out.i(i+1);<a name="line.556"></a>
-<span class="sourceLineNo">557</span>            out.eTag("li").nl();<a name="line.557"></a>
-<span class="sourceLineNo">558</span>         }<a name="line.558"></a>
-<span class="sourceLineNo">559</span>         out.eTag(i, "ul").nl();<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>   /*<a name="line.563"></a>
-<span class="sourceLineNo">564</span>    * Returns the table column headers for the specified collection of objects.<a name="line.564"></a>
-<span class="sourceLineNo">565</span>    * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    */<a name="line.567"></a>
-<span class="sourceLineNo">568</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.568"></a>
-<span class="sourceLineNo">569</span>   private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      if (c.size() == 0)<a name="line.570"></a>
-<span class="sourceLineNo">571</span>         return null;<a name="line.571"></a>
-<span class="sourceLineNo">572</span>      c = session.sort(c);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>      Object[] th;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      Set&lt;ClassMeta&gt; prevC = new HashSet&lt;ClassMeta&gt;();<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      Object o1 = null;<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      for (Object o : c)<a name="line.576"></a>
-<span class="sourceLineNo">577</span>         if (o != null) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>            o1 = o;<a name="line.578"></a>
-<span class="sourceLineNo">579</span>            break;<a name="line.579"></a>
-<span class="sourceLineNo">580</span>         }<a name="line.580"></a>
-<span class="sourceLineNo">581</span>      if (o1 == null)<a name="line.581"></a>
-<span class="sourceLineNo">582</span>         return null;<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o1);<a name="line.583"></a>
-<span class="sourceLineNo">584</span>      if (cm.getPojoSwap() != null) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span>         PojoSwap f = cm.getPojoSwap();<a name="line.585"></a>
-<span class="sourceLineNo">586</span>         o1 = f.swap(session, o1);<a name="line.586"></a>
-<span class="sourceLineNo">587</span>         cm = cm.getSerializedClassMeta();<a name="line.587"></a>
-<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
-<span class="sourceLineNo">589</span>      if (cm == null || ! cm.isMapOrBean())<a name="line.589"></a>
-<span class="sourceLineNo">590</span>         return null;<a name="line.590"></a>
-<span class="sourceLineNo">591</span>      if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.591"></a>
-<span class="sourceLineNo">592</span>         return null;<a name="line.592"></a>
-<span class="sourceLineNo">593</span>      HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.593"></a>
-<span class="sourceLineNo">594</span>      if (h.isNoTables() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTables()))<a name="line.594"></a>
-<span class="sourceLineNo">595</span>         return null;<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      if (h.isNoTableHeaders() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTableHeaders()))<a name="line.596"></a>
-<span class="sourceLineNo">597</span>         return new Object[0];<a name="line.597"></a>
-<span class="sourceLineNo">598</span>      if (session.canIgnoreValue(cm, null, o1))<a name="line.598"></a>
-<span class="sourceLineNo">599</span>         return null;<a name="line.599"></a>
-<span class="sourceLineNo">600</span>      if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.601"></a>
-<span class="sourceLineNo">602</span>         for (Object o : c) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span>               if (! cm.isInstance(o))<a name="line.604"></a>
-<span class="sourceLineNo">605</span>                  return null;<a name="line.605"></a>
-<span class="sourceLineNo">606</span>               Map m = session.sort((Map)o);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>               for (Map.Entry e : (Set&lt;Map.Entry&gt;)m.entrySet()) {<a name="line.607"></a>
-<span class="sourceLineNo">608</span>                  if (e.getValue() != null)<a name="line.608"></a>
-<span class="sourceLineNo">609</span>                     set.add(e.getKey() == null ? null : e.getKey());<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>         }<a name="line.612"></a>
-<span class="sourceLineNo">613</span>         th = set.toArray(new Object[set.size()]);<a name="line.613"></a>
-<span class="sourceLineNo">614</span>      } else {<a name="line.614"></a>
-<span class="sourceLineNo">615</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.615"></a>
-<span class="sourceLineNo">616</span>         for (Object o : c) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>               if (! cm.isInstance(o))<a name="line.618"></a>
-<span class="sourceLineNo">619</span>                  return null;<a name="line.619"></a>
-<span class="sourceLineNo">620</span>               BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.620"></a>
-<span class="sourceLineNo">621</span>               for (Map.Entry&lt;String,Object&gt; e : bm.entrySet()) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>                  if (e.getValue() != null)<a name="line.622"></a>
-<span class="sourceLineNo">623</span>                     set.add(e.getKey());<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>         }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>         th = set.toArray(new Object[set.size()]);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>      }<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      prevC.add(cm);<a name="line.629"></a>
-<span class="sourceLineNo">630</span>      boolean isSortable = true;<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      for (Object o : th)<a name="line.631"></a>
-<span class="sourceLineNo">632</span>         isSortable &amp;= (o instanceof Comparable);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      Set&lt;Object&gt; s = (isSortable ? new TreeSet&lt;Object&gt;() : new LinkedHashSet&lt;Object&gt;());<a name="line.633"></a>
-<span class="sourceLineNo">634</span>      s.addAll(Arrays.asList(th));<a name="line.634"></a>
-<span class="sourceLineNo">635</span><a name="line.635"></a>
-<span class="sourceLineNo">636</span>      for (Object o : c) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span>         if (o == null)<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            continue;<a name="line.638"></a>
-<span class="sourceLineNo">639</span>         cm = session.getClassMetaForObject(o);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>         if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            PojoSwap f = cm.getPojoSwap();<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            o = f.swap(session, o);<a name="line.642"></a>
-<span class="sourceLineNo">643</span>            cm = cm.getSerializedClassMeta();<a name="line.643"></a>
-<span class="sourceLineNo">644</span>         }<a name="line.644"></a>
-<span class="sourceLineNo">645</span>         if (prevC.contains(cm))<a name="line.645"></a>
-<span class="sourceLineNo">646</span>            continue;<a name="line.646"></a>
-<span class="sourceLineNo">647</span>         if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.647"></a>
-<span class="sourceLineNo">648</span>            return null;<a name="line.648"></a>
-<span class="sourceLineNo">649</span>         if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.649"></a>
-<span class="sourceLineNo">650</span>            return null;<a name="line.650"></a>
-<span class="sourceLineNo">651</span>         if (session.canIgnoreValue(cm, null, o))<a name="line.651"></a>
-<span class="sourceLineNo">652</span>            return null;<a name="line.652"></a>
-<span class="sourceLineNo">653</span>         if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>            Map m = (Map)o;<a name="line.654"></a>
-<span class="sourceLineNo">655</span>            if (th.length != m.keySet().size())<a name="line.655"></a>
-<span class="sourceLineNo">656</span>               return null;<a name="line.656"></a>
-<span class="sourceLineNo">657</span>            for (Object k : m.keySet())<a name="line.657"></a>
-<span class="sourceLineNo">658</span>               if (! s.contains(k.toString()))<a name="line.658"></a>
-<span class="sourceLineNo">659</span>                  return null;<a name="line.659"></a>
-<span class="sourceLineNo">660</span>         } else {<a name="line.660"></a>
-<span class="sourceLineNo">661</span>            BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            int l = 0;<a name="line.662"></a>
-<span class="sourceLineNo">663</span>            for (String k : bm.keySet()) {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>               if (! s.contains(k))<a name="line.664"></a>
-<span class="sourceLineNo">665</span>                  return null;<a name="line.665"></a>
-<span class="sourceLineNo">666</span>               l++;<a name="line.666"></a>
-<span class="sourceLineNo">667</span>            }<a name="line.667"></a>
-<span class="sourceLineNo">668</span>            if (s.size() != l)<a name="line.668"></a>
-<span class="sourceLineNo">669</span>               return null;<a name="line.669"></a>
+<span class="sourceLineNo">509</span>         for (Object o : c) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>            ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o);<a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span>            if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span>               PojoSwap f = cm.getPojoSwap();<a name="line.513"></a>
+<span class="sourceLineNo">514</span>               o = f.swap(session, o);<a name="line.514"></a>
+<span class="sourceLineNo">515</span>               cm = cm.getSerializedClassMeta();<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>            out.oTag(i+1, "tr");<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            String typeProperty = session.getBeanTypePropertyName(cm);<a name="line.520"></a>
+<span class="sourceLineNo">521</span><a name="line.521"></a>
+<span class="sourceLineNo">522</span>            if (typeName != null &amp;&amp; eType.getElementType() != cm)<a name="line.522"></a>
+<span class="sourceLineNo">523</span>               out.attr(typeProperty, typeName);<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            out.cTag().nl();<a name="line.524"></a>
+<span class="sourceLineNo">525</span><a name="line.525"></a>
+<span class="sourceLineNo">526</span>            if (cm == null) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>               serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span>            } else if (cm.isMap() &amp;&amp; ! (cm.isBeanMap())) {<a name="line.529"></a>
+<span class="sourceLineNo">530</span>               Map m2 = session.sort((Map)o);<a name="line.530"></a>
+<span class="sourceLineNo">531</span><a name="line.531"></a>
+<span class="sourceLineNo">532</span>               for (Object k : th) {<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, m2.get(k), eType.getElementType(), session.toString(k), 2, null, 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>            } else {<a name="line.539"></a>
+<span class="sourceLineNo">540</span>               BeanMap m2 = null;<a name="line.540"></a>
+<span class="sourceLineNo">541</span>               if (o instanceof BeanMap)<a name="line.541"></a>
+<span class="sourceLineNo">542</span>                  m2 = (BeanMap)o;<a name="line.542"></a>
+<span class="sourceLineNo">543</span>               else<a name="line.543"></a>
+<span class="sourceLineNo">544</span>                  m2 = session.toBeanMap(o);<a name="line.544"></a>
+<span class="sourceLineNo">545</span><a name="line.545"></a>
+<span class="sourceLineNo">546</span>               for (Object k : th) {<a name="line.546"></a>
+<span class="sourceLineNo">547</span>                  BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.547"></a>
+<span class="sourceLineNo">548</span>                  BeanPropertyMeta pMeta = p.getMeta();<a name="line.548"></a>
+<span class="sourceLineNo">549</span>                  HtmlBeanPropertyMeta hpMeta = pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class);<a name="line.549"></a>
+<span class="sourceLineNo">550</span>                  String link = hpMeta.getLink();<a name="line.550"></a>
+<span class="sourceLineNo">551</span>                  HtmlRender render = hpMeta.getRender();<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span>                  Object value = p.getValue();<a name="line.553"></a>
+<span class="sourceLineNo">554</span>                  out.oTag(i+2, "td");<a name="line.554"></a>
+<span class="sourceLineNo">555</span>                  String style = render.getStyle(session, value);<a name="line.555"></a>
+<span class="sourceLineNo">556</span>                  if (style != null)<a name="line.556"></a>
+<span class="sourceLineNo">557</span>                     out.attr("style", style);<a name="line.557"></a>
+<span class="sourceLineNo">558</span>                  out.cTag();<a name="line.558"></a>
+<span class="sourceLineNo">559</span>                  if (link != null) <a name="line.559"></a>
+<span class="sourceLineNo">560</span>                     out.oTag(i+3, "a").attrUri("href", m2.resolveVars(link)).cTag();<a name="line.560"></a>
+<span class="sourceLineNo">561</span>                  ContentResult cr = serializeAnything(session, out, render.getContent(session, value), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.561"></a>
+<span class="sourceLineNo">562</span>                  if (cr == CR_NORMAL)<a name="line.562"></a>
+<span class="sourceLineNo">563</span>                     out.i(i+2);<a name="line.563"></a>
+<span class="sourceLineNo">564</span>                  if (link != null) <a name="line.564"></a>
+<span class="sourceLineNo">565</span>                     out.eTag("a");<a name="line.565"></a>
+<span class="sourceLineNo">566</span>                  out.eTag("td").nl();<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>            out.eTag(i+1, "tr").nl();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>         }<a name="line.570"></a>
+<span class="sourceLineNo">571</span>         out.eTag(i, "table").nl();<a name="line.571"></a>
+<span class="sourceLineNo">572</span><a name="line.572"></a>
+<span class="sourceLineNo">573</span>      } else {<a name="line.573"></a>
+<span class="sourceLineNo">574</span>         out.oTag(i, "ul");<a name="line.574"></a>
+<span class="sourceLineNo">575</span>         if (! type2.equals("array"))<a name="line.575"></a>
+<span class="sourceLineNo">576</span>            out.attr(btpn, type2);<a name="line.576"></a>
+<span class="sourceLineNo">577</span>         out.append('&gt;').nl();<a name="line.577"></a>
+<span class="sourceLineNo">578</span>         for (Object o : c) {<a name="line.578"></a>
+<span class="sourceLineNo">579</span>            out.sTag(i+1, "li");<a name="line.579"></a>
+<span class="sourceLineNo">580</span>            ContentResult cr = serializeAnything(session, out, o, eType.getElementType(), name, 1, null, false);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>            if (cr == CR_NORMAL)<a name="line.581"></a>
+<span class="sourceLineNo">582</span>               out.i(i+1);<a name="line.582"></a>
+<span class="sourceLineNo">583</span>            out.eTag("li").nl();<a name="line.583"></a>
+<span class="sourceLineNo">584</span>         }<a name="line.584"></a>
+<span class="sourceLineNo">585</span>         out.eTag(i, "ul").nl();<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>   /*<a name="line.589"></a>
+<span class="sourceLineNo">590</span>    * Returns the table column headers for the specified collection of objects.<a name="line.590"></a>
+<span class="sourceLineNo">591</span>    * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.591"></a>
+<span class="sourceLineNo">592</span>    * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.592"></a>
+<span class="sourceLineNo">593</span>    */<a name="line.593"></a>
+<span class="sourceLineNo">594</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.594"></a>
+<span class="sourceLineNo">595</span>   private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.595"></a>
+<span class="sourceLineNo">596</span>      if (c.size() == 0)<a name="line.596"></a>
+<span class="sourceLineNo">597</span>         return null;<a name="line.597"></a>
+<span class="sourceLineNo">598</span>      c = session.sort(c);<a name="line.598"></a>
+<span class="sourceLineNo">599</span>      Object[] th;<a name="line.599"></a>
+<span class="sourceLineNo">600</span>      Set&lt;ClassMeta&gt; prevC = new HashSet&lt;ClassMeta&gt;();<a name="line.600"></a>
+<span class="sourceLineNo">601</span>      Object o1 = null;<a name="line.601"></a>
+<span class="sourceLineNo">602</span>      for (Object o : c)<a name="line.602"></a>
+<span class="sourceLineNo">603</span>         if (o != null) {<a name="line.603"></a>
+<span class="sourceLineNo">604</span>            o1 = o;<a name="line.604"></a>
+<span class="sourceLineNo">605</span>            break;<a name="line.605"></a>
+<span class="sourceLineNo">606</span>         }<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      if (o1 == null)<a name="line.607"></a>
+<span class="sourceLineNo">608</span>         return null;<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o1);<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      if (cm.getPojoSwap() != null) {<a name="line.610"></a>
+<span class="sourceLineNo">611</span>         PojoSwap f = cm.getPojoSwap();<a name="line.611"></a>
+<span class="sourceLineNo">612</span>         o1 = f.swap(session, o1);<a name="line.612"></a>
+<span class="sourceLineNo">613</span>         cm = cm.getSerializedClassMeta();<a name="line.613"></a>
+<span class="sourceLineNo">614</span>      }<a name="line.614"></a>
+<span class="sourceLineNo">615</span>      if (cm == null || ! cm.isMapOrBean())<a name="line.615"></a>
+<span class="sourceLineNo">616</span>         return null;<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.617"></a>
+<span class="sourceLineNo">618</span>         return null;<a name="line.618"></a>
+<span class="sourceLineNo">619</span>      HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.619"></a>
+<span class="sourceLineNo">620</span>      if (h.isNoTables() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTables()))<a name="line.620"></a>
+<span class="sourceLineNo">621</span>         return null;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>      if (h.isNoTableHeaders() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTableHeaders()))<a name="line.622"></a>
+<span class="sourceLineNo">623</span>         return new Object[0];<a name="line.623"></a>
+<span class="sourceLineNo">624</span>      if (session.canIgnoreValue(cm, null, o1))<a name="line.624"></a>
+<span class="sourceLineNo">625</span>         return null;<a name="line.625"></a>
+<span class="sourceLineNo">626</span>      if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.626"></a>
+<span class="sourceLineNo">627</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.627"></a>
+<span class="sourceLineNo">628</span>         for (Object o : c) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.629"></a>
+<span class="sourceLineNo">630</span>               if (! cm.isInstance(o))<a name="line.630"></a>
+<span class="sourceLineNo">631</span>                  return null;<a name="line.631"></a>
+<span class="sourceLineNo">632</span>               Map m = session.sort((Map)o);<a name="line.632"></a>
+<span class="sourceLineNo">633</span>               for (Map.Entry e : (Set&lt;Map.Entry&gt;)m.entrySet()) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>                  if (e.getValue() != null)<a name="line.634"></a>
+<span class="sourceLineNo">635</span>                     set.add(e.getKey() == null ? null : e.getKey());<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>         th = set.toArray(new Object[set.size()]);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>      } else {<a name="line.640"></a>
+<span class="sourceLineNo">641</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.641"></a>
+<span class="sourceLineNo">642</span>         for (Object o : c) {<a name="line.642"></a>
+<span class="sourceLineNo">643</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.643"></a>
+<span class="sourceLineNo">644</span>               if (! cm.isInstance(o))<a name="line.644"></a>
+<span class="sourceLineNo">645</span>                  return null;<a name="line.645"></a>
+<span class="sourceLineNo">646</span>               BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.646"></a>
+<span class="sourceLineNo">647</span>               for (Map.Entry&lt;String,Object&gt; e : bm.entrySet()) {<a name="line.647"></a>
+<span class="sourceLineNo">648</span>                  if (e.getValue() != null)<a name="line.648"></a>
+<span class="sourceLineNo">649</span>                     set.add(e.getKey());<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>         th = set.toArray(new Object[set.size()]);<a name="line.653"></a>
+<span class="sourceLineNo">654</span>      }<a name="line.654"></a>
+<span class="sourceLineNo">655</span>      prevC.add(cm);<a name="line.655"></a>
+<span class="sourceLineNo">656</span>      boolean isSortable = true;<a name="line.656"></a>
+<span class="sourceLineNo">657</span>      for (Object o : th)<a name="line.657"></a>
+<span class="sourceLineNo">658</span>         isSortable &amp;= (o instanceof Comparable);<a name="line.658"></a>
+<span class="sourceLineNo">659</span>      Set&lt;Object&gt; s = (isSortable ? new TreeSet&lt;Object&gt;() : new LinkedHashSet&lt;Object&gt;());<a name="line.659"></a>
+<span class="sourceLineNo">660</span>      s.addAll(Arrays.asList(th));<a name="line.660"></a>
+<span class="sourceLineNo">661</span><a name="line.661"></a>
+<span class="sourceLineNo">662</span>      for (Object o : c) {<a name="line.662"></a>
+<span class="sourceLineNo">663</span>         if (o == null)<a name="line.663"></a>
+<span class="sourceLineNo">664</span>            continue;<a name="line.664"></a>
+<span class="sourceLineNo">665</span>         cm = session.getClassMetaForObject(o);<a name="line.665"></a>
+<span class="sourceLineNo">666</span>         if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.666"></a>
+<span class="sourceLineNo">667</span>            PojoSwap f = cm.getPojoSwap();<a name="line.667"></a>
+<span class="sourceLineNo">668</span>            o = f.swap(session, o);<a name="line.668"></a>
+<span class="sourceLineNo">669</span>            cm = cm.getSerializedClassMeta();<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>      return th;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>   }<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>    * Returns the schema serializer based on the settings of this serializer.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    * @return The schema serializer.<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    */<a name="line.678"></a>
-<span class="sourceLineNo">679</span>   @Override /* XmlSerializer */<a name="line.679"></a>
-<span class="sourceLineNo">680</span>   public HtmlSerializer getSchemaSerializer() {<a name="line.680"></a>
-<span class="sourceLineNo">681</span>      if (schemaSerializer == null)<a name="line.681"></a>
-<span class="sourceLineNo">682</span>         schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.682"></a>
-<span class="sourceLineNo">683</span>      return schemaSerializer;<a name="line.683"></a>
-<span class="sourceLineNo">684</span>   }<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>   //--------------------------------------------------------------------------------<a name="line.687"></a>
-<span class="sourceLineNo">688</span>   // Entry point methods<a name="line.688"></a>
-<span class="sourceLineNo">689</span>   //--------------------------------------------------------------------------------<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span>   @Override /* Serializer */<a name="line.691"></a>
-<span class="sourceLineNo">692</span>   public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.692"></a>
-<span class="sourceLineNo">693</span>      return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<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>   @Override /* Serializer */<a name="line.696"></a>
-<span class="sourceLineNo">697</span>   protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.697"></a>
-<span class="sourceLineNo">698</span>      HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.698"></a>
-<span class="sourceLineNo">699</span>      doSerialize(s, o, s.getWriter());<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">671</span>         if (prevC.contains(cm))<a name="line.671"></a>
+<span class="sourceLineNo">672</span>            continue;<a name="line.672"></a>
+<span class="sourceLineNo">673</span>         if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.673"></a>
+<span class="sourceLineNo">674</span>            return null;<a name="line.674"></a>
+<span class="sourceLineNo">675</span>         if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.675"></a>
+<span class="sourceLineNo">676</span>            return null;<a name="line.676"></a>
+<span class="sourceLineNo">677</span>         if (session.canIgnoreValue(cm, null, o))<a name="line.677"></a>
+<span class="sourceLineNo">678</span>            return null;<a name="line.678"></a>
+<span class="sourceLineNo">679</span>         if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>            Map m = (Map)o;<a name="line.680"></a>
+<span class="sourceLineNo">681</span>            if (th.length != m.keySet().size())<a name="line.681"></a>
+<span class="sourceLineNo">682</span>               return null;<a name="line.682"></a>
+<span class="sourceLineNo">683</span>            for (Object k : m.keySet())<a name="line.683"></a>
+<span class="sourceLineNo">684</span>               if (! s.contains(k.toString()))<a name="line.684"></a>
+<span class="sourceLineNo">685</span>                  return null;<a name="line.685"></a>
+<span class="sourceLineNo">686</span>         } else {<a name="line.686"></a>
+<span class="sourceLineNo">687</span>            BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.687"></a>
+<span class="sourceLineNo">688</span>            int l = 0;<a name="line.688"></a>
+<span class="sourceLineNo">689</span>            for (String k : bm.keySet()) {<a name="line.689"></a>
+<span class="sourceLineNo">690</span>               if (! s.contains(k))<a name="line.690"></a>
+<span class="sourceLineNo">691</span>                  return null;<a name="line.691"></a>
+<span class="sourceLineNo">692</span>               l++;<a name="line.692"></a>
+<span class="sourceLineNo">693</span>            }<a name="line.693"></a>
+<span class="sourceLineNo">694</span>            if (s.size() != l)<a name="line.694"></a>
+<span class="sourceLineNo">695</span>               return null;<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>      return th;<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>    * Returns the schema serializer based on the settings of this serializer.<a name="line.702"></a>
+<span class="sourceLineNo">703</span>    * @return The schema serializer.<a name="line.703"></a>
+<span class="sourceLineNo">704</span>    */<a name="line.704"></a>
+<span class="sourceLineNo">705</span>   @Override /* XmlSerializer */<a name="line.705"></a>
+<span class="sourceLineNo">706</span>   public HtmlSerializer getSchemaSerializer() {<a name="line.706"></a>
+<span class="sourceLineNo">707</span>      if (schemaSerializer == null)<a name="line.707"></a>
+<span class="sourceLineNo">708</span>         schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.708"></a>
+<span class="sourceLineNo">709</span>      return schemaSerializer;<a name="line.709"></a>
+<span class="sourceLineNo">710</span>   }<a name="line.710"></a>
+<span class="sourceLineNo">711</span><a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>   //--------------------------------------------------------------------------------<a name="line.713"></a>
+<span class="sourceLineNo">714</span>   // Entry point methods<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>   @Override /* Serializer */<a name="line.717"></a>
+<span class="sourceLineNo">718</span>   public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span>      return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.719"></a>
+<span class="sourceLineNo">720</span>   }<a name="line.720"></a>
+<span class="sourceLineNo">721</span><a name="line.721"></a>
+<span class="sourceLineNo">722</span>   @Override /* Serializer */<a name="line.722"></a>
+<span class="sourceLineNo">723</span>   protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.723"></a>
+<span class="sourceLineNo">724</span>      HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.724"></a>
+<span class="sourceLineNo">725</span>      doSerialize(s, o, s.getWriter());<a name="line.725"></a>
+<span class="sourceLineNo">726</span>   }<a name="line.726"></a>
+<span class="sourceLineNo">727</span>}<a name="line.727"></a>
 
 
 


[36/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/UriResolution.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/UriResolution.html b/content/site/apidocs/org/apache/juneau/UriResolution.html
new file mode 100644
index 0000000..e66df91
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/UriResolution.html
@@ -0,0 +1,362 @@
+<!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>UriResolution (Apache Juneau (incubating) 6.2.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="UriResolution (Apache Juneau (incubating) 6.2.1-incubating-SNAPSHOT)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static 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/UriRelativity.html" title="enum in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?org/apache/juneau/UriResolution.html" target="_top">Frames</a></li>
+<li><a href="UriResolution.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.juneau</div>
+<h2 title="Enum UriResolution" class="title">Enum UriResolution</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><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">java.lang.Enum</a>&lt;<a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>org.apache.juneau.UriResolution</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a>&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public enum <a href="../../../src-html/org/apache/juneau/UriResolution.html#line.18">UriResolution</a>
+extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a>&gt;</pre>
+<div class="block">Identifies the possible types of URL resolution.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!--   -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriResolution.html#ABSOLUTE">ABSOLUTE</a></span></code>
+<div class="block">Resolve to an absolute URL (e.g.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriResolution.html#NONE">NONE</a></span></code>
+<div class="block">Don't do any URL resolution.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriResolution.html#ROOT_RELATIVE">ROOT_RELATIVE</a></span></code>
+<div class="block">Resolve to a root-relative URL (e.g.</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">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriResolution.html#valueOf-java.lang.String-">valueOf</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>&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriResolution.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a></h3>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.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/Enum.html?is-external=true#compareTo-E-" title="class or interface in java.lang">compareTo</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.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/Enum.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/Enum.html?is-external=true#getDeclaringClass--" title="class or interface in java.lang">getDeclaringClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.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/Enum.html?is-external=true#name--" title="class or interface in java.lang">name</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true#ordinal--" title="class or interface in java.lang">ordinal</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.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/Enum.html?is-external=true#valueOf-java.lang.Class-java.lang.String-" title="class or interface in java.lang">valueOf</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#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#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>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!--   -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="ABSOLUTE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ABSOLUTE</h4>
+<pre>public static final&nbsp;<a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a> <a href="../../../src-html/org/apache/juneau/UriResolution.html#line.23">ABSOLUTE</a></pre>
+<div class="block">Resolve to an absolute URL (e.g. <js>"http://host:port/context-root/servlet-path/path-info"</js>).</div>
+</li>
+</ul>
+<a name="ROOT_RELATIVE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ROOT_RELATIVE</h4>
+<pre>public static final&nbsp;<a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a> <a href="../../../src-html/org/apache/juneau/UriResolution.html#line.28">ROOT_RELATIVE</a></pre>
+<div class="block">Resolve to a root-relative URL (e.g. <js>"/context-root/servlet-path/path-info"</js>).</div>
+</li>
+</ul>
+<a name="NONE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NONE</h4>
+<pre>public static final&nbsp;<a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a> <a href="../../../src-html/org/apache/juneau/UriResolution.html#line.33">NONE</a></pre>
+<div class="block">Don't do any URL resolution.</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="values--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a>[]&nbsp;<a href="../../../src-html/org/apache/juneau/UriResolution.html#line.18">values</a>()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (UriResolution c : UriResolution.values())
+&nbsp;   System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriResolution.html#line.18">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><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></code> - if this enum type has no constant with the specified name</dd>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/NullPointerException.html?is-external=true" title="class or interface in java.lang">NullPointerException</a></code> - if the argument is null</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/UriRelativity.html" title="enum in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?org/apache/juneau/UriResolution.html" target="_top">Frames</a></li>
+<li><a href="UriResolution.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 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/37ddf434/content/site/apidocs/org/apache/juneau/Visibility.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/Visibility.html b/content/site/apidocs/org/apache/juneau/Visibility.html
index 29a79eb..76ca737 100644
--- a/content/site/apidocs/org/apache/juneau/Visibility.html
+++ b/content/site/apidocs/org/apache/juneau/Visibility.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../org/apache/juneau/Streamable.html" title="interface in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -589,7 +589,7 @@ not permitted.)</div>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../org/apache/juneau/Streamable.html" title="interface in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/csv/CsvParserContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/csv/CsvParserContext.html b/content/site/apidocs/org/apache/juneau/csv/CsvParserContext.html
index a082ba5..0a31ff0 100644
--- a/content/site/apidocs/org/apache/juneau/csv/CsvParserContext.html
+++ b/content/site/apidocs/org/apache/juneau/csv/CsvParserContext.html
@@ -210,7 +210,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserContext.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/csv/CsvSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/csv/CsvSerializer.html b/content/site/apidocs/org/apache/juneau/csv/CsvSerializer.html
index ebec2c4..8af5247 100644
--- a/content/site/apidocs/org/apache/juneau/csv/CsvSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/csv/CsvSerializer.html
@@ -219,7 +219,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a href="../../../../org/apache
 /juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a
  href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
@@ -324,7 +324,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/csv/CsvSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/csv/CsvSerializerContext.html b/content/site/apidocs/org/apache/juneau/csv/CsvSerializerContext.html
index bc07d9c..6d3d51c 100644
--- a/content/site/apidocs/org/apache/juneau/csv/CsvSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/csv/CsvSerializerContext.html
@@ -210,7 +210,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 bbe8f28..ab96121 100644
--- a/content/site/apidocs/org/apache/juneau/csv/CsvSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/csv/CsvSerializerSession.html
@@ -157,13 +157,14 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/csv/CsvSerializerSession.html#CsvSerializerSession-org.apache.juneau.csv.CsvSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">CsvSerializerSession</a></span>(<a href="../../../../org/apache/juneau/csv/CsvSerializerContext.html" title="class in org.apache.juneau.csv">CsvSerializerContext</a>&nbsp;ctx,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/csv/CsvSerializerSession.html#CsvSerializerSession-org.apache.juneau.csv.CsvSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">CsvSerializerSession</a></span>(<a href="../../../../org/apache/juneau/csv/CsvSerializerContext.html" title="class in org.apache.juneau.csv">CsvSerializerContext</a>&nbsp;ctx,
                     <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                     <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>&nbsp;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>&nbsp;locale,
                     <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>&nbsp;timeZone,
-                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                    <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create a new session using properties specified in the context.</div>
 </td>
 </tr>
@@ -181,7 +182,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">getWriter</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isAddBeanTypeProperties--">isAddBeanTypeProperties</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmpt
 yCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../.
 ./../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getUriContext--">getUriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">getWriter</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isAddBeanTypeProperties--">isAddBeanTypeProperties</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSo
 rtMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/seria
 lizer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.BeanSession">
@@ -218,33 +219,36 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="CsvSerializerSession-org.apache.juneau.csv.CsvSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="CsvSerializerSession-org.apache.juneau.csv.CsvSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CsvSerializerSession</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/csv/CsvSerializerSession.html#line.44">CsvSerializerSession</a>(<a href="../../../../org/apache/juneau/csv/CsvSerializerContext.html" title="class in org.apache.juneau.csv">CsvSerializerContext</a>&nbsp;ctx,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/csv/CsvSerializerSession.html#line.46">CsvSerializerSession</a>(<a href="../../../../org/apache/juneau/csv/CsvSerializerContext.html" title="class in org.apache.juneau.csv">CsvSerializerContext</a>&nbsp;ctx,
                                <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                                <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>&nbsp;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>&nbsp;locale,
                                <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>&nbsp;timeZone,
-                               <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
+                               <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                               <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>ctx</code> - The context creating this session object.
- The context contains all the configuration settings for this object.</dd>
+   The context contains all the configuration settings for this object.</dd>
 <dd><code>output</code> - The output object.</dd>
 <dd><code>op</code> - The override properties.
- These override any context properties defined in the context.</dd>
+   These override any context properties defined in the context.</dd>
 <dd><code>javaMethod</code> - The java method that called this serializer, usually the method in a REST servlet.</dd>
 <dd><code>locale</code> - The session locale.
- If <jk>null</jk>, then the locale defined on the context is used.</dd>
+   If <jk>null</jk>, then the locale defined on the context is used.</dd>
 <dd><code>timeZone</code> - The session timezone.
- If <jk>null</jk>, then the timezone defined on the context is used.</dd>
+   If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/HtmlBeanPropertyMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlBeanPropertyMeta.html b/content/site/apidocs/org/apache/juneau/html/HtmlBeanPropertyMeta.html
index d8723b3..346c877 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlBeanPropertyMeta.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlBeanPropertyMeta.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,"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";
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.21">HtmlBeanPropertyMeta</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.22">HtmlBeanPropertyMeta</a>
 extends <a href="../../../../org/apache/juneau/BeanPropertyMetaExtended.html" title="class in org.apache.juneau">BeanPropertyMetaExtended</a></pre>
 <div class="block">Metadata on bean properties specific to the HTML serializers and parsers pulled from the <a href="../../../../org/apache/juneau/html/annotation/Html.html" title="annotation in org.apache.juneau.html.annotation"><code>@Html</code></a> annotation on the bean property.</div>
 </li>
@@ -154,24 +154,36 @@ extends <a href="../../../../org/apache/juneau/BeanPropertyMetaExtended.html" ti
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" 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/HtmlBeanPropertyMeta.html#getLink--">getLink</a></span>()</code>
+<div class="block">Adds a hyperlink to this value in HTML.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html">HtmlRender</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlBeanPropertyMeta.html#getRender--">getRender</a></span>()</code>
+<div class="block">Returns the render class for rendering the style and contents of this property value in HTML.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>protected boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlBeanPropertyMeta.html#isAsPlainText--">isAsPlainText</a></span>()</code>
 <div class="block">Returns whether this bean property should be serialized as plain text instead of HTML.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>protected boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlBeanPropertyMeta.html#isAsXml--">isAsXml</a></span>()</code>
 <div class="block">Returns whether this bean property should be serialized as XML instead of HTML.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlBeanPropertyMeta.html#isNoTableHeaders--">isNoTableHeaders</a></span>()</code>
 <div class="block">Returns whether this bean property should not include table headers when serialized as an HTML table.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>protected boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlBeanPropertyMeta.html#isNoTables--">isNoTables</a></span>()</code>
 <div class="block">Returns whether this bean property should not be serialized as an HTML table.</div>
@@ -212,11 +224,14 @@ extends <a href="../../../../org/apache/juneau/BeanPropertyMetaExtended.html" ti
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HtmlBeanPropertyMeta</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.30">HtmlBeanPropertyMeta</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;bpm)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.34">HtmlBeanPropertyMeta</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;bpm)
+                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>bpm</code> - The metadata of the bean property of this additional metadata.</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 render class could not be instantiated.</dd>
 </dl>
 </li>
 </ul>
@@ -234,7 +249,7 @@ extends <a href="../../../../org/apache/juneau/BeanPropertyMetaExtended.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>isAsXml</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.58">isAsXml</a>()</pre>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.80">isAsXml</a>()</pre>
 <div class="block">Returns whether this bean property should be serialized as XML instead of HTML.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -248,7 +263,7 @@ extends <a href="../../../../org/apache/juneau/BeanPropertyMetaExtended.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>isAsPlainText</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.67">isAsPlainText</a>()</pre>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.89">isAsPlainText</a>()</pre>
 <div class="block">Returns whether this bean property should be serialized as plain text instead of HTML.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -262,7 +277,7 @@ extends <a href="../../../../org/apache/juneau/BeanPropertyMetaExtended.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>isNoTables</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.76">isNoTables</a>()</pre>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.98">isNoTables</a>()</pre>
 <div class="block">Returns whether this bean property should not be serialized as an HTML table.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -273,10 +288,10 @@ extends <a href="../../../../org/apache/juneau/BeanPropertyMetaExtended.html" ti
 <a name="isNoTableHeaders--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>isNoTableHeaders</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.85">isNoTableHeaders</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.107">isNoTableHeaders</a>()</pre>
 <div class="block">Returns whether this bean property should not include table headers when serialized as an HTML table.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -284,6 +299,38 @@ extends <a href="../../../../org/apache/juneau/BeanPropertyMetaExtended.html" ti
 </dl>
 </li>
 </ul>
+<a name="getRender--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRender</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html">HtmlRender</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.118">getRender</a>()</pre>
+<div class="block">Returns the render class for rendering the style and contents of this property value in HTML.
+ <p>
+ This value is specified via the <a href="../../../../org/apache/juneau/html/annotation/Html.html#render--"><code>Html.render()</code></a> annotation.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The render class, never <jk>null</jk>.</dd>
+</dl>
+</li>
+</ul>
+<a name="getLink--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getLink</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html#line.129">getLink</a>()</pre>
+<div class="block">Adds a hyperlink to this value in HTML.
+ <p>
+ This value is specified via the <a href="../../../../org/apache/juneau/html/annotation/Html.html#link--"><code>Html.link()</code></a> annotation.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The link string, or <jk>null</jk> if not specified.</dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializer.html b/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializer.html
index fc18a1c..e038ad6 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializer.html
@@ -268,12 +268,13 @@ extends <a href="../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.ht
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/html/HtmlDocSerializerSession.html" title="class in org.apache.juneau.html">HtmlDocSerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -381,7 +382,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.ht
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -392,15 +393,16 @@ extends <a href="../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.ht
                                               <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>&nbsp;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>&nbsp;locale,
                                               <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>&nbsp;timeZone,
-                                              <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">Serializer</a></code></span></div>
+                                              <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                              <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">Serializer</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
    it's going to be a subclass of <a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><code>SerializerSession</code></a>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>output</code> - The output object.
    <br>Character-based serializers can handle the following output class types:
@@ -423,6 +425,8 @@ extends <a href="../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.ht
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>
@@ -445,7 +449,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.ht
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.html" title="class in org.apache.juneau.html">HtmlStrippedDocSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 b20ef4b..f94686d 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerContext.html
@@ -319,7 +319,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html"
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">


[11/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/json/JsonWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonWriter.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonWriter.html
index 1a7557c..eb2c3d1 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonWriter.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonWriter.html
@@ -22,244 +22,247 @@
 <span class="sourceLineNo">014</span><a name="line.14"></a>
 <span class="sourceLineNo">015</span>import java.io.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.internal.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.serializer.*;<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> * Specialized writer for serializing JSON.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * &lt;p&gt;<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;ul&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *    &lt;li&gt;This class is not intended for external use.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * &lt;/ul&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> */<a name="line.27"></a>
-<span class="sourceLineNo">028</span>public final class JsonWriter extends SerializerWriter {<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>   private final boolean laxMode, escapeSolidus;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>   // Characters that trigger special handling of serializing attribute values.<a name="line.32"></a>
-<span class="sourceLineNo">033</span>   private static final AsciiSet<a name="line.33"></a>
-<span class="sourceLineNo">034</span>      encodedChars = new AsciiSet("\n\t\b\f\r'\"\\"),<a name="line.34"></a>
-<span class="sourceLineNo">035</span>      encodedChars2 = new AsciiSet("\n\t\b\f\r'\"\\/");<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>   private static final KeywordSet reservedWords = new KeywordSet(<a name="line.37"></a>
-<span class="sourceLineNo">038</span>      "arguments","break","case","catch","class","const","continue","debugger","default","delete",<a name="line.38"></a>
-<span class="sourceLineNo">039</span>      "do","else","enum","eval","export","extends","false","finally","for","function","if",<a name="line.39"></a>
-<span class="sourceLineNo">040</span>      "implements","import","in","instanceof","interface","let","new","null","package",<a name="line.40"></a>
-<span class="sourceLineNo">041</span>      "private","protected","public","return","static","super","switch","this","throw",<a name="line.41"></a>
-<span class="sourceLineNo">042</span>      "true","try","typeof","var","void","while","with","undefined","yield"<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">017</span>import org.apache.juneau.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.internal.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.serializer.*;<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> * Specialized writer for serializing JSON.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * &lt;p&gt;<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * &lt;ul&gt;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *    &lt;li&gt;This class is not intended for external use.<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * &lt;/ul&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> */<a name="line.28"></a>
+<span class="sourceLineNo">029</span>public final class JsonWriter extends SerializerWriter {<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>   private final boolean laxMode, escapeSolidus;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>   // Characters that trigger special handling of serializing attribute values.<a name="line.33"></a>
+<span class="sourceLineNo">034</span>   private static final AsciiSet<a name="line.34"></a>
+<span class="sourceLineNo">035</span>      encodedChars = new AsciiSet("\n\t\b\f\r'\"\\"),<a name="line.35"></a>
+<span class="sourceLineNo">036</span>      encodedChars2 = new AsciiSet("\n\t\b\f\r'\"\\/");<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>   private static final KeywordSet reservedWords = new KeywordSet(<a name="line.38"></a>
+<span class="sourceLineNo">039</span>      "arguments","break","case","catch","class","const","continue","debugger","default","delete",<a name="line.39"></a>
+<span class="sourceLineNo">040</span>      "do","else","enum","eval","export","extends","false","finally","for","function","if",<a name="line.40"></a>
+<span class="sourceLineNo">041</span>      "implements","import","in","instanceof","interface","let","new","null","package",<a name="line.41"></a>
+<span class="sourceLineNo">042</span>      "private","protected","public","return","static","super","switch","this","throw",<a name="line.42"></a>
+<span class="sourceLineNo">043</span>      "true","try","typeof","var","void","while","with","undefined","yield"<a name="line.43"></a>
+<span class="sourceLineNo">044</span>   );<a name="line.44"></a>
 <span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>   // Characters that represent attribute name characters that don't trigger quoting.<a name="line.46"></a>
-<span class="sourceLineNo">047</span>   // These are actually more strict than the actual Javascript specification, but<a name="line.47"></a>
-<span class="sourceLineNo">048</span>   // can be narrowed in the future if necessary.<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   // For example, we quote attributes that start with $ even though we don't need to.<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   private static final AsciiSet validAttrChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_");<a name="line.50"></a>
-<span class="sourceLineNo">051</span>   private static final AsciiSet validFirstAttrChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_");<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>   private final AsciiSet ec;<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>    * Constructor.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * @param out The writer being wrapped.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt;, tabs and spaces will be used in output.<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    * @param escapeSolidus If &lt;jk&gt;true&lt;/jk&gt;, forward slashes should be escaped in the output.<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * @param quoteChar The quote character to use (i.e. &lt;js&gt;'\''&lt;/js&gt; or &lt;js&gt;'"'&lt;/js&gt;)<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * @param laxMode If &lt;jk&gt;true&lt;/jk&gt;, JSON attributes will only be quoted when necessary.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings will be trimmed before being serialized.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * @param relativeUriBase The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;).<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    * @param absolutePathUriBase The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;).<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   protected JsonWriter(Writer out, boolean useWhitespace, boolean escapeSolidus, char quoteChar, boolean laxMode, boolean trimStrings, String relativeUriBase, String absolutePathUriBase) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      super(out, useWhitespace, trimStrings, quoteChar, relativeUriBase, absolutePathUriBase);<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      this.laxMode = laxMode;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>      this.escapeSolidus = escapeSolidus;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      this.ec = escapeSolidus ? encodedChars2 : encodedChars;<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>    * Serializes the specified object as a JSON string value.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    * @param s The object being serialized.<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    * @return This object (for method chaining).<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    * @throws IOException Should never happen.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    */<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   public JsonWriter stringValue(String s) throws IOException {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      if (s == null)<a name="line.80"></a>
-<span class="sourceLineNo">081</span>         return this;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      boolean doConvert = false;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      for (int i = 0; i &lt; s.length() &amp;&amp; ! doConvert; i++) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>         char c = s.charAt(i);<a name="line.84"></a>
-<span class="sourceLineNo">085</span>         doConvert |= ec.contains(c);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      }<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      q();<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      if (! doConvert) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>         out.append(s);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      } else {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>         for (int i = 0; i &lt; s.length(); i++) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>            char c = s.charAt(i);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>            if (ec.contains(c)) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span>               if (c == '\n')<a name="line.94"></a>
-<span class="sourceLineNo">095</span>                  out.append('\\').append('n');<a name="line.95"></a>
-<span class="sourceLineNo">096</span>               else if (c == '\t')<a name="line.96"></a>
-<span class="sourceLineNo">097</span>                  out.append('\\').append('t');<a name="line.97"></a>
-<span class="sourceLineNo">098</span>               else if (c == '\b')<a name="line.98"></a>
-<span class="sourceLineNo">099</span>                  out.append('\\').append('b');<a name="line.99"></a>
-<span class="sourceLineNo">100</span>               else if (c == '\f')<a name="line.100"></a>
-<span class="sourceLineNo">101</span>                  out.append('\\').append('f');<a name="line.101"></a>
-<span class="sourceLineNo">102</span>               else if (c == quoteChar)<a name="line.102"></a>
-<span class="sourceLineNo">103</span>                  out.append('\\').append(quoteChar);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>               else if (c == '\\')<a name="line.104"></a>
-<span class="sourceLineNo">105</span>                  out.append('\\').append('\\');<a name="line.105"></a>
-<span class="sourceLineNo">106</span>               else if (c == '/' &amp;&amp; escapeSolidus)<a name="line.106"></a>
-<span class="sourceLineNo">107</span>                  out.append('\\').append('/');<a name="line.107"></a>
-<span class="sourceLineNo">108</span>               else if (c != '\r')<a name="line.108"></a>
-<span class="sourceLineNo">109</span>                  out.append(c);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>            } else {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>               out.append(c);<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>      q();<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      return this;<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>   /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    * Serializes the specified object as a JSON attribute name.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    * @param s The object being serialized.<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    * @return This object (for method chaining).<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    * @throws IOException Should never happen.<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    */<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   public JsonWriter attr(String s) throws IOException {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      /*<a name="line.126"></a>
-<span class="sourceLineNo">127</span>       * Converts a Java string to an acceptable JSON attribute name. If<a name="line.127"></a>
-<span class="sourceLineNo">128</span>       * useStrictJson is false, then quotes will only be used if the attribute<a name="line.128"></a>
-<span class="sourceLineNo">129</span>       * name consists of only alphanumeric characters.<a name="line.129"></a>
-<span class="sourceLineNo">130</span>       */<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      boolean doConvert = trimStrings || ! laxMode;      // Always convert when not in lax mode.<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>      // If the attribute is null, it must always be printed as null without quotes.<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      // Technically, this isn't part of the JSON spec, but it does allow for null key values.<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      if (s == null) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>         s = "null";<a name="line.136"></a>
-<span class="sourceLineNo">137</span>         doConvert = false;<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>      } else {<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>         // Look for characters that would require the attribute to be quoted.<a name="line.141"></a>
-<span class="sourceLineNo">142</span>         // All possible numbers should be caught here.<a name="line.142"></a>
-<span class="sourceLineNo">143</span>         if (! doConvert) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>            for (int i = 0; i &lt; s.length() &amp;&amp; ! doConvert; i++) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>               char c = s.charAt(i);<a name="line.145"></a>
-<span class="sourceLineNo">146</span>               doConvert |= ! (i == 0 ? validFirstAttrChars.contains(c) : validAttrChars.contains(c));<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>         // Reserved words and blanks must be quoted.<a name="line.150"></a>
-<span class="sourceLineNo">151</span>         if (! doConvert) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>            if (s.isEmpty() || reservedWords.contains(s))<a name="line.152"></a>
-<span class="sourceLineNo">153</span>               doConvert = true;<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><a name="line.156"></a>
-<span class="sourceLineNo">157</span>      // If no conversion necessary, just print the attribute as-is.<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      if (doConvert)<a name="line.158"></a>
-<span class="sourceLineNo">159</span>         stringValue(s);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      else<a name="line.160"></a>
-<span class="sourceLineNo">161</span>         out.append(s);<a name="line.161"></a>
-<span class="sourceLineNo">162</span><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">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>   // Characters that represent attribute name characters that don't trigger quoting.<a name="line.47"></a>
+<span class="sourceLineNo">048</span>   // These are actually more strict than the actual Javascript specification, but<a name="line.48"></a>
+<span class="sourceLineNo">049</span>   // can be narrowed in the future if necessary.<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   // For example, we quote attributes that start with $ even though we don't need to.<a name="line.50"></a>
+<span class="sourceLineNo">051</span>   private static final AsciiSet validAttrChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_");<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   private static final AsciiSet validFirstAttrChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_");<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>   private final AsciiSet ec;<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>   /**<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    * Constructor.<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    * @param out The writer being wrapped.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt;, tabs and spaces will be used in output.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * @param escapeSolidus If &lt;jk&gt;true&lt;/jk&gt;, forward slashes should be escaped in the output.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    * @param quoteChar The quote character to use (i.e. &lt;js&gt;'\''&lt;/js&gt; or &lt;js&gt;'"'&lt;/js&gt;)<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * @param laxMode If &lt;jk&gt;true&lt;/jk&gt;, JSON attributes will only be quoted when necessary.<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings will be trimmed before being serialized.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    * @param relativeUriBase The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;).<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    * @param absolutePathUriBase The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;).<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    * @param uriContext The URI context.<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   protected JsonWriter(Writer out, boolean useWhitespace, boolean escapeSolidus, char quoteChar, boolean laxMode, boolean trimStrings, String relativeUriBase, String absolutePathUriBase, UriContext uriContext) {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      super(out, useWhitespace, trimStrings, quoteChar, relativeUriBase, absolutePathUriBase, uriContext);<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      this.laxMode = laxMode;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      this.escapeSolidus = escapeSolidus;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      this.ec = escapeSolidus ? encodedChars2 : encodedChars;<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>    * Serializes the specified object as a JSON string value.<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    * @param s The object being serialized.<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>    * @throws IOException Should never happen.<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    */<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   public JsonWriter stringValue(String s) throws IOException {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      if (s == null)<a name="line.83"></a>
+<span class="sourceLineNo">084</span>         return this;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      boolean doConvert = false;<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      for (int i = 0; i &lt; s.length() &amp;&amp; ! doConvert; i++) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>         char c = s.charAt(i);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>         doConvert |= ec.contains(c);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      }<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      q();<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      if (! doConvert) {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>         out.append(s);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      } else {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>         for (int i = 0; i &lt; s.length(); i++) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>            char c = s.charAt(i);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>            if (ec.contains(c)) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>               if (c == '\n')<a name="line.97"></a>
+<span class="sourceLineNo">098</span>                  out.append('\\').append('n');<a name="line.98"></a>
+<span class="sourceLineNo">099</span>               else if (c == '\t')<a name="line.99"></a>
+<span class="sourceLineNo">100</span>                  out.append('\\').append('t');<a name="line.100"></a>
+<span class="sourceLineNo">101</span>               else if (c == '\b')<a name="line.101"></a>
+<span class="sourceLineNo">102</span>                  out.append('\\').append('b');<a name="line.102"></a>
+<span class="sourceLineNo">103</span>               else if (c == '\f')<a name="line.103"></a>
+<span class="sourceLineNo">104</span>                  out.append('\\').append('f');<a name="line.104"></a>
+<span class="sourceLineNo">105</span>               else if (c == quoteChar)<a name="line.105"></a>
+<span class="sourceLineNo">106</span>                  out.append('\\').append(quoteChar);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>               else if (c == '\\')<a name="line.107"></a>
+<span class="sourceLineNo">108</span>                  out.append('\\').append('\\');<a name="line.108"></a>
+<span class="sourceLineNo">109</span>               else if (c == '/' &amp;&amp; escapeSolidus)<a name="line.109"></a>
+<span class="sourceLineNo">110</span>                  out.append('\\').append('/');<a name="line.110"></a>
+<span class="sourceLineNo">111</span>               else if (c != '\r')<a name="line.111"></a>
+<span class="sourceLineNo">112</span>                  out.append(c);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>            } else {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>               out.append(c);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>            }<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>      q();<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      return this;<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>   /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    * Serializes the specified object as a JSON attribute name.<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    * @param s The object being serialized.<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    * @return This object (for method chaining).<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    * @throws IOException Should never happen.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    */<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   public JsonWriter attr(String s) throws IOException {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      /*<a name="line.129"></a>
+<span class="sourceLineNo">130</span>       * Converts a Java string to an acceptable JSON attribute name. If<a name="line.130"></a>
+<span class="sourceLineNo">131</span>       * useStrictJson is false, then quotes will only be used if the attribute<a name="line.131"></a>
+<span class="sourceLineNo">132</span>       * name consists of only alphanumeric characters.<a name="line.132"></a>
+<span class="sourceLineNo">133</span>       */<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      boolean doConvert = trimStrings || ! laxMode;      // Always convert when not in lax mode.<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>      // If the attribute is null, it must always be printed as null without quotes.<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      // Technically, this isn't part of the JSON spec, but it does allow for null key values.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      if (s == null) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>         s = "null";<a name="line.139"></a>
+<span class="sourceLineNo">140</span>         doConvert = false;<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>      } else {<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>         // Look for characters that would require the attribute to be quoted.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>         // All possible numbers should be caught here.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>         if (! doConvert) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>            for (int i = 0; i &lt; s.length() &amp;&amp; ! doConvert; i++) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>               char c = s.charAt(i);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>               doConvert |= ! (i == 0 ? validFirstAttrChars.contains(c) : validAttrChars.contains(c));<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><a name="line.152"></a>
+<span class="sourceLineNo">153</span>         // Reserved words and blanks must be quoted.<a name="line.153"></a>
+<span class="sourceLineNo">154</span>         if (! doConvert) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>            if (s.isEmpty() || reservedWords.contains(s))<a name="line.155"></a>
+<span class="sourceLineNo">156</span>               doConvert = true;<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><a name="line.159"></a>
+<span class="sourceLineNo">160</span>      // If no conversion necessary, just print the attribute as-is.<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      if (doConvert)<a name="line.161"></a>
+<span class="sourceLineNo">162</span>         stringValue(s);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      else<a name="line.163"></a>
+<span class="sourceLineNo">164</span>         out.append(s);<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>   // Overridden methods<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   //--------------------------------------------------------------------------------<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span>   @Override /* SerializerWriter */<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   public JsonWriter cr(int depth) throws IOException {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      super.cr(depth);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.177"></a>
-<span class="sourceLineNo">178</span>   public JsonWriter appendln(int indent, String text) throws IOException {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      super.appendln(indent, text);<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   public JsonWriter appendln(String text) throws IOException {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      super.appendln(text);<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>   @Override /* SerializerWriter */<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   public JsonWriter append(int indent, String text) throws IOException {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      super.append(indent, text);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   public JsonWriter append(int indent, char c) throws IOException {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      super.append(indent, c);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   public JsonWriter s() throws IOException {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      super.s();<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      return this;<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>   @Override /* SerializerWriter */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   public JsonWriter q() throws IOException {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      super.q();<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   public JsonWriter i(int indent) throws IOException {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      super.i(indent);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   public JsonWriter nl() throws IOException {<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      super.nl();<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.225"></a>
-<span class="sourceLineNo">226</span>   public JsonWriter append(Object text) throws IOException {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      super.append(text);<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>   @Override /* SerializerWriter */<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   public JsonWriter append(String text) throws IOException {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      super.append(text);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   public JsonWriter appendIf(boolean b, String text) throws IOException {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      super.appendIf(b, text);<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      return this;<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   }<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span>   @Override /* SerializerWriter */<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   public JsonWriter appendIf(boolean b, char c) throws IOException {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      super.appendIf(b, c);<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>   @Override /* SerializerWriter */<a name="line.249"></a>
-<span class="sourceLineNo">250</span>   public JsonWriter append(char c) throws IOException {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      super.append(c);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      return this;<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">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>   //--------------------------------------------------------------------------------<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   // Overridden methods<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   //--------------------------------------------------------------------------------<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>   @Override /* SerializerWriter */<a name="line.174"></a>
+<span class="sourceLineNo">175</span>   public JsonWriter cr(int depth) throws IOException {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      super.cr(depth);<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   public JsonWriter appendln(int indent, String text) throws IOException {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      super.appendln(indent, text);<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>   @Override /* SerializerWriter */<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   public JsonWriter appendln(String text) throws IOException {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      super.appendln(text);<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>   @Override /* SerializerWriter */<a name="line.192"></a>
+<span class="sourceLineNo">193</span>   public JsonWriter append(int indent, String text) throws IOException {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      super.append(indent, text);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   public JsonWriter append(int indent, char c) throws IOException {<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      super.append(indent, c);<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      return this;<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 /* SerializerWriter */<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   public JsonWriter s() throws IOException {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      super.s();<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   public JsonWriter q() throws IOException {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      super.q();<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.216"></a>
+<span class="sourceLineNo">217</span>   public JsonWriter i(int indent) throws IOException {<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      super.i(indent);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.222"></a>
+<span class="sourceLineNo">223</span>   public JsonWriter nl() throws IOException {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      super.nl();<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.228"></a>
+<span class="sourceLineNo">229</span>   public JsonWriter append(Object text) throws IOException {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      super.append(text);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      return this;<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 /* SerializerWriter */<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   public JsonWriter append(String text) throws IOException {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      super.append(text);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.240"></a>
+<span class="sourceLineNo">241</span>   public JsonWriter appendIf(boolean b, String text) throws IOException {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      super.appendIf(b, 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>   @Override /* SerializerWriter */<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   public JsonWriter appendIf(boolean b, char c) throws IOException {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      super.appendIf(b, c);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.252"></a>
+<span class="sourceLineNo">253</span>   public JsonWriter append(char c) throws IOException {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      super.append(c);<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      return this;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializer.html
index 01dfca8..9ee8a94 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializer.html
@@ -219,8 +219,8 @@
 <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>   @Override /* Serializer */<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   public MsgPackSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      return new MsgPackSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.215"></a>
+<span class="sourceLineNo">214</span>   public MsgPackSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      return new MsgPackSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* Serializer */<a name="line.218"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
index ba7673a..490ef74 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
@@ -44,44 +44,46 @@
 <span class="sourceLineNo">036</span>    * Create a new session using properties specified in the context.<a name="line.36"></a>
 <span class="sourceLineNo">037</span>    *<a name="line.37"></a>
 <span class="sourceLineNo">038</span>    * @param ctx The context creating this session object.<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    * The context contains all the configuration settings for this object.<a name="line.39"></a>
+<span class="sourceLineNo">039</span>    *    The context contains all the configuration settings for this object.<a name="line.39"></a>
 <span class="sourceLineNo">040</span>    * @param output The output object.  See {@link JsonSerializerSession#getOutputStream()} for valid class types.<a name="line.40"></a>
 <span class="sourceLineNo">041</span>    * @param op The override properties.<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    * These override any context properties defined in the context.<a name="line.42"></a>
+<span class="sourceLineNo">042</span>    *    These override any context properties defined in the context.<a name="line.42"></a>
 <span class="sourceLineNo">043</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.43"></a>
 <span class="sourceLineNo">044</span>    * @param locale The session locale.<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.45"></a>
+<span class="sourceLineNo">045</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.45"></a>
 <span class="sourceLineNo">046</span>    * @param timeZone The session timezone.<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.47"></a>
+<span class="sourceLineNo">047</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.47"></a>
 <span class="sourceLineNo">048</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   protected MsgPackSerializerSession(MsgPackSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.51"></a>
-<span class="sourceLineNo">052</span>      if (op == null || op.isEmpty()) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>      } else {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>         addBeanTypeProperties = op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<a name="line.55"></a>
-<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><a name="line.58"></a>
-<span class="sourceLineNo">059</span>   /**<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * Returns the {@link MsgPackSerializerContext#MSGPACK_addBeanTypeProperties} setting value for this session.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    *<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * @return The {@link MsgPackSerializerContext#MSGPACK_addBeanTypeProperties} setting value for this session.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    */<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   @Override /* SerializerSession */<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   public final boolean isAddBeanTypeProperties() {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      return addBeanTypeProperties;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>   @Override /*SerializerSession */<a name="line.69"></a>
-<span class="sourceLineNo">070</span>   public MsgPackOutputStream getOutputStream() throws Exception {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      Object output = getOutput();<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      if (output instanceof MsgPackOutputStream)<a name="line.72"></a>
-<span class="sourceLineNo">073</span>         return (MsgPackOutputStream)output;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      return new MsgPackOutputStream(super.getOutputStream());<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">049</span>    * @param uriContext The URI context.<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    */<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   protected MsgPackSerializerSession(MsgPackSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      if (op == null || op.isEmpty()) {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      } else {<a name="line.56"></a>
+<span class="sourceLineNo">057</span>         addBeanTypeProperties = op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<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>   /**<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * Returns the {@link MsgPackSerializerContext#MSGPACK_addBeanTypeProperties} setting value for this session.<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    *<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    * @return The {@link MsgPackSerializerContext#MSGPACK_addBeanTypeProperties} setting value for this session.<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    */<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   @Override /* SerializerSession */<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   public final boolean isAddBeanTypeProperties() {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      return addBeanTypeProperties;<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>   @Override /*SerializerSession */<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   public MsgPackOutputStream getOutputStream() throws Exception {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      Object output = getOutput();<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      if (output instanceof MsgPackOutputStream)<a name="line.74"></a>
+<span class="sourceLineNo">075</span>         return (MsgPackOutputStream)output;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      return new MsgPackOutputStream(super.getOutputStream());<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormData.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormData.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormData.html
index 2bc46be..e047810 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormData.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormData.html
@@ -52,20 +52,29 @@
 <span class="sourceLineNo">044</span> *    &lt;li&gt;&lt;code&gt;NameValuePairs&lt;/code&gt; - Individual name-value pairs.<a name="line.44"></a>
 <span class="sourceLineNo">045</span> *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt; - Individual name-value pairs.<a name="line.45"></a>
 <span class="sourceLineNo">046</span> *       Values are converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * &lt;/ul&gt;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>@Documented<a name="line.49"></a>
-<span class="sourceLineNo">050</span>@Target(PARAMETER)<a name="line.50"></a>
-<span class="sourceLineNo">051</span>@Retention(RUNTIME)<a name="line.51"></a>
-<span class="sourceLineNo">052</span>@Inherited<a name="line.52"></a>
-<span class="sourceLineNo">053</span>public @interface FormData {<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>    * The form post parameter name.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * Can be blank if the value is an instance of &lt;code&gt;NameValuePairs&lt;/code&gt; or &lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt;.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   String value() default "";<a name="line.59"></a>
-<span class="sourceLineNo">060</span>}<a name="line.60"></a>
+<span class="sourceLineNo">047</span> *    &lt;li&gt;A bean - Individual name-value pairs.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> *       Values are converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * &lt;/ul&gt;<a name="line.49"></a>
+<span class="sourceLineNo">050</span> */<a name="line.50"></a>
+<span class="sourceLineNo">051</span>@Documented<a name="line.51"></a>
+<span class="sourceLineNo">052</span>@Target(PARAMETER)<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@Retention(RUNTIME)<a name="line.53"></a>
+<span class="sourceLineNo">054</span>@Inherited<a name="line.54"></a>
+<span class="sourceLineNo">055</span>public @interface FormData {<a name="line.55"></a>
+<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>    * The form post parameter name.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * &lt;p&gt;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * A value of &lt;js&gt;"*"&lt;/js&gt; indicates the value should be serialized as name/value pairs and is applicable<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    * for the following data types:<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * &lt;ul&gt;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    *    &lt;li&gt;&lt;code&gt;NameValuePairs&lt;/code&gt;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    *    &lt;li&gt;A bean<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    * &lt;/ul&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   String value() default "*";<a name="line.68"></a>
+<span class="sourceLineNo">069</span>}<a name="line.69"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormDataIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormDataIfNE.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormDataIfNE.html
index 29671d1..ef34674 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormDataIfNE.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormDataIfNE.html
@@ -36,10 +36,17 @@
 <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>    * The form post parameter name.<a name="line.30"></a>
-<span class="sourceLineNo">031</span>    * Can be blank if the value is an instance of &lt;code&gt;NameValuePairs&lt;/code&gt; or &lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt;.<a name="line.31"></a>
-<span class="sourceLineNo">032</span>    */<a name="line.32"></a>
-<span class="sourceLineNo">033</span>   String value() default "";<a name="line.33"></a>
-<span class="sourceLineNo">034</span>}<a name="line.34"></a>
+<span class="sourceLineNo">031</span>    * &lt;p&gt;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>    * A value of &lt;js&gt;"*"&lt;/js&gt; indicates the value should be serialized as name/value pairs and is applicable<a name="line.32"></a>
+<span class="sourceLineNo">033</span>    * for the following data types:<a name="line.33"></a>
+<span class="sourceLineNo">034</span>    * &lt;ul&gt;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>    *    &lt;li&gt;&lt;code&gt;NameValuePairs&lt;/code&gt;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>    *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>    *    &lt;li&gt;A bean<a name="line.37"></a>
+<span class="sourceLineNo">038</span>    * &lt;/ul&gt;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>    */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>   String value() default "*";<a name="line.40"></a>
+<span class="sourceLineNo">041</span>}<a name="line.41"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/remoteable/Header.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/Header.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Header.html
index bbdb72b..1ce0782 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/Header.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Header.html
@@ -45,23 +45,33 @@
 <span class="sourceLineNo">037</span> * &lt;p&gt;<a name="line.37"></a>
 <span class="sourceLineNo">038</span> * The argument can be any of the following types:<a name="line.38"></a>
 <span class="sourceLineNo">039</span> * &lt;ul class='spaced-list'&gt;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *    &lt;li&gt;Any serializable POJO - Converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt; - Individual name-value pairs.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> *       Values are converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * &lt;/ul&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>@Documented<a name="line.45"></a>
-<span class="sourceLineNo">046</span>@Target(PARAMETER)<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@Retention(RUNTIME)<a name="line.47"></a>
-<span class="sourceLineNo">048</span>@Inherited<a name="line.48"></a>
-<span class="sourceLineNo">049</span>public @interface Header {<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>    * The HTTP header name.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    * Can be blank if the value is an instance of &lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt;.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   String value() default "";<a name="line.55"></a>
-<span class="sourceLineNo">056</span>}<a name="line.56"></a>
+<span class="sourceLineNo">040</span> *    &lt;li&gt;&lt;code&gt;NameValuePairs&lt;/code&gt; - Individual name-value pairs.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *    &lt;li&gt;Any serializable POJO - Converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt; - Individual name-value pairs.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> *       Values are converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *    &lt;li&gt;A bean - Individual name-value pairs.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *       Values are converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * &lt;/ul&gt;<a name="line.46"></a>
+<span class="sourceLineNo">047</span> */<a name="line.47"></a>
+<span class="sourceLineNo">048</span>@Documented<a name="line.48"></a>
+<span class="sourceLineNo">049</span>@Target(PARAMETER)<a name="line.49"></a>
+<span class="sourceLineNo">050</span>@Retention(RUNTIME)<a name="line.50"></a>
+<span class="sourceLineNo">051</span>@Inherited<a name="line.51"></a>
+<span class="sourceLineNo">052</span>public @interface Header {<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>    * The HTTP header name.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    * &lt;p&gt;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    * A value of &lt;js&gt;"*"&lt;/js&gt; indicates the value should be serialized as name/value pairs and is applicable<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    * for the following data types:<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * &lt;ul&gt;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    *    &lt;li&gt;&lt;code&gt;NameValuePairs&lt;/code&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    *    &lt;li&gt;A bean<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    * &lt;/ul&gt;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    */<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   String value() default "*";<a name="line.65"></a>
+<span class="sourceLineNo">066</span>}<a name="line.66"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/remoteable/HeaderIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/HeaderIfNE.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/HeaderIfNE.html
index b0b89d6..570655c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/HeaderIfNE.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/HeaderIfNE.html
@@ -36,10 +36,17 @@
 <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>    * The HTTP header name.<a name="line.30"></a>
-<span class="sourceLineNo">031</span>    * Can be blank if the value is an instance of &lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt;.<a name="line.31"></a>
-<span class="sourceLineNo">032</span>    */<a name="line.32"></a>
-<span class="sourceLineNo">033</span>   String value();<a name="line.33"></a>
-<span class="sourceLineNo">034</span>}<a name="line.34"></a>
+<span class="sourceLineNo">031</span>    * &lt;p&gt;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>    * A value of &lt;js&gt;"*"&lt;/js&gt; indicates the value should be serialized as name/value pairs and is applicable<a name="line.32"></a>
+<span class="sourceLineNo">033</span>    * for the following data types:<a name="line.33"></a>
+<span class="sourceLineNo">034</span>    * &lt;ul&gt;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>    *    &lt;li&gt;&lt;code&gt;NameValuePairs&lt;/code&gt;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>    *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>    *    &lt;li&gt;A bean<a name="line.37"></a>
+<span class="sourceLineNo">038</span>    * &lt;/ul&gt;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>    */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>   String value() default "*";<a name="line.40"></a>
+<span class="sourceLineNo">041</span>}<a name="line.41"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/remoteable/Path.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/Path.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Path.html
new file mode 100644
index 0000000..8915564
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Path.html
@@ -0,0 +1,135 @@
+<!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.remoteable;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import static java.lang.annotation.ElementType.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import static java.lang.annotation.RetentionPolicy.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span><a name="line.17"></a>
+<span class="sourceLineNo">018</span>import java.lang.annotation.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.urlencoding.*;<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> * Annotation applied to Java method arguments of interface proxies to denote that they are path variables on the request.<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * &lt;p&gt;<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * &lt;p class='bcode'&gt;<a name="line.26"></a>
+<span class="sourceLineNo">027</span> *    &lt;ja&gt;@Remoteable&lt;/ja&gt;(path=&lt;js&gt;"/myproxy"&lt;/js&gt;)<a name="line.27"></a>
+<span class="sourceLineNo">028</span> *    &lt;jk&gt;public interface&lt;/jk&gt; MyProxy {<a name="line.28"></a>
+<span class="sourceLineNo">029</span> *<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *       &lt;ja&gt;@RemoteMethod&lt;/ja&gt;(path=&lt;js&gt;"/mymethod1/{foo}"&lt;/js&gt;)<a name="line.30"></a>
+<span class="sourceLineNo">031</span> *       String myProxyMethod1(&lt;ja&gt;@Path&lt;/ja&gt;(&lt;js&gt;"foo"&lt;/js&gt;)&lt;/ja&gt; String foo);<a name="line.31"></a>
+<span class="sourceLineNo">032</span> *    }<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * &lt;/p&gt;<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * &lt;p&gt;<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * The argument can be any of the following types:<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * &lt;ul class='spaced-list'&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> *    &lt;li&gt;&lt;code&gt;NameValuePairs&lt;/code&gt; - Individual name-value pairs.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *    &lt;li&gt;Any serializable POJO - Converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt; - Individual name-value pairs.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *       Values are converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *    &lt;li&gt;A bean - Individual name-value pairs.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> *       Values are converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * &lt;/ul&gt;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>*/<a name="line.44"></a>
+<span class="sourceLineNo">045</span>@Documented<a name="line.45"></a>
+<span class="sourceLineNo">046</span>@Target(PARAMETER)<a name="line.46"></a>
+<span class="sourceLineNo">047</span>@Retention(RUNTIME)<a name="line.47"></a>
+<span class="sourceLineNo">048</span>@Inherited<a name="line.48"></a>
+<span class="sourceLineNo">049</span>public @interface Path {<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>    * The path parameter name.<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    * &lt;p&gt;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    * A value of &lt;js&gt;"*"&lt;/js&gt; indicates the value should be serialized as name/value pairs and is applicable<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    * for the following data types:<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    * &lt;ul&gt;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    *    &lt;li&gt;&lt;code&gt;NameValuePairs&lt;/code&gt;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    *    &lt;li&gt;A bean<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * &lt;/ul&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>   String value() default "*";<a name="line.62"></a>
+<span class="sourceLineNo">063</span>}<a name="line.63"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/remoteable/Query.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/Query.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Query.html
index 703a681..e3bcb51 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/Query.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Query.html
@@ -48,24 +48,35 @@
 <span class="sourceLineNo">040</span> * &lt;p&gt;<a name="line.40"></a>
 <span class="sourceLineNo">041</span> * The argument can be any of the following types:<a name="line.41"></a>
 <span class="sourceLineNo">042</span> * &lt;ul class='spaced-list'&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> *    &lt;li&gt;Any serializable POJO - Converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt; - Individual name-value pairs.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> *       Values are converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> *    &lt;li&gt;{@link String} - Treated as a query string.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * &lt;/ul&gt;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>*/<a name="line.48"></a>
-<span class="sourceLineNo">049</span>@Documented<a name="line.49"></a>
-<span class="sourceLineNo">050</span>@Target(PARAMETER)<a name="line.50"></a>
-<span class="sourceLineNo">051</span>@Retention(RUNTIME)<a name="line.51"></a>
-<span class="sourceLineNo">052</span>@Inherited<a name="line.52"></a>
-<span class="sourceLineNo">053</span>public @interface Query {<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>    * The query parameter name.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * Can be blank if the value is an instance of &lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt; or &lt;code&gt;String&lt;/code&gt;.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   String value() default "";<a name="line.59"></a>
-<span class="sourceLineNo">060</span>}<a name="line.60"></a>
+<span class="sourceLineNo">043</span> *    &lt;li&gt;&lt;code&gt;NameValuePairs&lt;/code&gt; - Individual name-value pairs.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *    &lt;li&gt;Any serializable POJO - Converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt; - Individual name-value pairs.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> *       Values are converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> *    &lt;li&gt;A bean - Individual name-value pairs.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> *       Values are converted to text using {@link UrlEncodingSerializer#serializePart(Object, Boolean, Boolean)}.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> *    &lt;li&gt;{@link String} - Treated as a query string.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * &lt;/ul&gt;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>*/<a name="line.51"></a>
+<span class="sourceLineNo">052</span>@Documented<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@Target(PARAMETER)<a name="line.53"></a>
+<span class="sourceLineNo">054</span>@Retention(RUNTIME)<a name="line.54"></a>
+<span class="sourceLineNo">055</span>@Inherited<a name="line.55"></a>
+<span class="sourceLineNo">056</span>public @interface Query {<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>   /**<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * The query parameter name.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * &lt;p&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    * A value of &lt;js&gt;"*"&lt;/js&gt; indicates the value should be serialized as name/value pairs and is applicable<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * for the following data types:<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    * &lt;ul&gt;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    *    &lt;li&gt;&lt;code&gt;String&lt;/code&gt; - A complete query string.<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    *    &lt;li&gt;&lt;code&gt;NameValuePairs&lt;/code&gt;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    *    &lt;li&gt;A bean<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    * &lt;/ul&gt;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    */<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   String value() default "*";<a name="line.70"></a>
+<span class="sourceLineNo">071</span>}<a name="line.71"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/remoteable/QueryIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/QueryIfNE.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/QueryIfNE.html
index 46941c5..e4a2556 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/QueryIfNE.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/QueryIfNE.html
@@ -36,10 +36,18 @@
 <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>    * The query parameter name.<a name="line.30"></a>
-<span class="sourceLineNo">031</span>    * Can be blank if the value is an instance of &lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt; or &lt;code&gt;String&lt;/code&gt;.<a name="line.31"></a>
-<span class="sourceLineNo">032</span>    */<a name="line.32"></a>
-<span class="sourceLineNo">033</span>   String value();<a name="line.33"></a>
-<span class="sourceLineNo">034</span>}<a name="line.34"></a>
+<span class="sourceLineNo">031</span>    * &lt;p&gt;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>    * A value of &lt;js&gt;"*"&lt;/js&gt; indicates the value should be serialized as name/value pairs and is applicable<a name="line.32"></a>
+<span class="sourceLineNo">033</span>    * for the following data types:<a name="line.33"></a>
+<span class="sourceLineNo">034</span>    * &lt;ul&gt;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>    *    &lt;li&gt;&lt;code&gt;String&lt;/code&gt; - A complete query string.<a name="line.35"></a>
+<span class="sourceLineNo">036</span>    *    &lt;li&gt;&lt;code&gt;NameValuePairs&lt;/code&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>    *    &lt;li&gt;&lt;code&gt;Map&amp;lt;String,Object&amp;gt;&lt;/code&gt;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>    *    &lt;li&gt;A bean<a name="line.38"></a>
+<span class="sourceLineNo">039</span>    * &lt;/ul&gt;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>    */<a name="line.40"></a>
+<span class="sourceLineNo">041</span>   String value() default "*";<a name="line.41"></a>
+<span class="sourceLineNo">042</span>}<a name="line.42"></a>
 
 
 


[32/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 9e6508f..54eb56f 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfSerializerSession.html
@@ -163,13 +163,14 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/jena/RdfSerializerSession.html#RdfSerializerSession-org.apache.juneau.jena.RdfSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">RdfSerializerSession</a></span>(<a href="../../../../org/apache/juneau/jena/RdfSerializerContext.html" title="class in org.apache.juneau.jena">RdfSerializerContext</a>&nbsp;ctx,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/jena/RdfSerializerSession.html#RdfSerializerSession-org.apache.juneau.jena.RdfSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">RdfSerializerSession</a></span>(<a href="../../../../org/apache/juneau/jena/RdfSerializerContext.html" title="class in org.apache.juneau.jena">RdfSerializerContext</a>&nbsp;ctx,
                     <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                     <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>&nbsp;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>&nbsp;locale,
                     <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>&nbsp;timeZone,
-                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                    <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create a new session using properties specified in the context.</div>
 </td>
 </tr>
@@ -302,7 +303,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">getWriter</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyM
 aps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentPro
 perty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getUriContext--">getUriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">getWriter</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTr
 imEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/j
 uneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.BeanSession">
@@ -339,33 +340,36 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="RdfSerializerSession-org.apache.juneau.jena.RdfSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="RdfSerializerSession-org.apache.juneau.jena.RdfSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>RdfSerializerSession</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.68">RdfSerializerSession</a>(<a href="../../../../org/apache/juneau/jena/RdfSerializerContext.html" title="class in org.apache.juneau.jena">RdfSerializerContext</a>&nbsp;ctx,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.70">RdfSerializerSession</a>(<a href="../../../../org/apache/juneau/jena/RdfSerializerContext.html" title="class in org.apache.juneau.jena">RdfSerializerContext</a>&nbsp;ctx,
                                <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                                <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>&nbsp;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>&nbsp;locale,
                                <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>&nbsp;timeZone,
-                               <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
+                               <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                               <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>ctx</code> - The context creating this session object.
- The context contains all the configuration settings for this object.</dd>
+   The context contains all the configuration settings for this object.</dd>
 <dd><code>output</code> - The output object.  See <a href="../../../../org/apache/juneau/json/JsonSerializerSession.html#getWriter--"><code>JsonSerializerSession.getWriter()</code></a> for valid class types.</dd>
 <dd><code>op</code> - The override properties.
- These override any context properties defined in the context.</dd>
+   These override any context properties defined in the context.</dd>
 <dd><code>javaMethod</code> - The java method that called this serializer, usually the method in a REST servlet.</dd>
 <dd><code>locale</code> - The session locale.
- If <jk>null</jk>, then the locale defined on the context is used.</dd>
+   If <jk>null</jk>, then the locale defined on the context is used.</dd>
 <dd><code>timeZone</code> - The session timezone.
- If <jk>null</jk>, then the timezone defined on the context is used.</dd>
+   If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -383,7 +387,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>addModelPrefix</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.129">addModelPrefix</a>(<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;ns)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.131">addModelPrefix</a>(<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;ns)</pre>
 <div class="block">Adds the specified namespace as a model prefix.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -397,7 +401,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getCollectionFormat</h4>
-<pre>public final&nbsp;<a href="../../../../org/apache/juneau/jena/RdfCollectionFormat.html" title="enum in org.apache.juneau.jena">RdfCollectionFormat</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.138">getCollectionFormat</a>()</pre>
+<pre>public final&nbsp;<a href="../../../../org/apache/juneau/jena/RdfCollectionFormat.html" title="enum in org.apache.juneau.jena">RdfCollectionFormat</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.140">getCollectionFormat</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/jena/RdfCommonContext.html#RDF_collectionFormat"><code>RdfCommonContext.RDF_collectionFormat</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -411,7 +415,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isUseXmlNamespaces</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.147">isUseXmlNamespaces</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.149">isUseXmlNamespaces</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/jena/RdfCommonContext.html#RDF_useXmlNamespaces"><code>RdfCommonContext.RDF_useXmlNamespaces</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -425,7 +429,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isLooseCollections</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.156">isLooseCollections</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.158">isLooseCollections</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/jena/RdfCommonContext.html#RDF_looseCollections"><code>RdfCommonContext.RDF_looseCollections</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -439,7 +443,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getRdfLanguage</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.165">getRdfLanguage</a>()</pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.167">getRdfLanguage</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/jena/RdfCommonContext.html#RDF_language"><code>RdfCommonContext.RDF_language</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -453,7 +457,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getJuneauNs</h4>
-<pre>public final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.174">getJuneauNs</a>()</pre>
+<pre>public final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.176">getJuneauNs</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/jena/RdfCommonContext.html#RDF_juneauNs"><code>RdfCommonContext.RDF_juneauNs</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -467,7 +471,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getJuneauBpNs</h4>
-<pre>public final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.183">getJuneauBpNs</a>()</pre>
+<pre>public final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.185">getJuneauBpNs</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/jena/RdfCommonContext.html#RDF_juneauBpNs"><code>RdfCommonContext.RDF_juneauBpNs</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -481,7 +485,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddLiteralTypes</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.192">isAddLiteralTypes</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.194">isAddLiteralTypes</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/jena/RdfSerializerContext.html#RDF_addLiteralTypes"><code>RdfSerializerContext.RDF_addLiteralTypes</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -495,7 +499,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddRootProp</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.201">isAddRootProp</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.203">isAddRootProp</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/jena/RdfSerializerContext.html#RDF_addRootProperty"><code>RdfSerializerContext.RDF_addRootProperty</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -509,7 +513,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isAutoDetectNamespaces</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.210">isAutoDetectNamespaces</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.212">isAutoDetectNamespaces</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/jena/RdfSerializerContext.html#RDF_autoDetectNamespaces"><code>RdfSerializerContext.RDF_autoDetectNamespaces</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -523,7 +527,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddBeanTypeProperties</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.220">isAddBeanTypeProperties</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.222">isAddBeanTypeProperties</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/msgpack/MsgPackSerializerContext.html#MSGPACK_addBeanTypeProperties"><code>MsgPackSerializerContext.MSGPACK_addBeanTypeProperties</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -539,7 +543,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getRootProp</h4>
-<pre>public final&nbsp;com.hp.hpl.jena.rdf.model.Property&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.229">getRootProp</a>()</pre>
+<pre>public final&nbsp;com.hp.hpl.jena.rdf.model.Property&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.231">getRootProp</a>()</pre>
 <div class="block">Returns the RDF property that identifies the root node in the RDF model.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -553,7 +557,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getValueProperty</h4>
-<pre>public final&nbsp;com.hp.hpl.jena.rdf.model.Property&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.238">getValueProperty</a>()</pre>
+<pre>public final&nbsp;com.hp.hpl.jena.rdf.model.Property&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.240">getValueProperty</a>()</pre>
 <div class="block">Returns the RDF property that represents a value in the RDF model.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -567,7 +571,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getTypeProperty</h4>
-<pre>public final&nbsp;com.hp.hpl.jena.rdf.model.Property&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.247">getTypeProperty</a>()</pre>
+<pre>public final&nbsp;com.hp.hpl.jena.rdf.model.Property&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.249">getTypeProperty</a>()</pre>
 <div class="block">Returns the RDF property that represents a class in the RDF model.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -581,7 +585,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getModel</h4>
-<pre>public final&nbsp;com.hp.hpl.jena.rdf.model.Model&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.256">getModel</a>()</pre>
+<pre>public final&nbsp;com.hp.hpl.jena.rdf.model.Model&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.258">getModel</a>()</pre>
 <div class="block">Returns the RDF model being serialized.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -595,7 +599,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getRdfWriter</h4>
-<pre>public final&nbsp;com.hp.hpl.jena.rdf.model.RDFWriter&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.265">getRdfWriter</a>()</pre>
+<pre>public final&nbsp;com.hp.hpl.jena.rdf.model.RDFWriter&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.267">getRdfWriter</a>()</pre>
 <div class="block">Returns the RDF writer that's being serialized to.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -609,7 +613,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>encodeTextInvalidChars</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.275">encodeTextInvalidChars</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>&nbsp;o)</pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.277">encodeTextInvalidChars</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>&nbsp;o)</pre>
 <div class="block">XML-encodes the specified string using the <a href="../../../../org/apache/juneau/xml/XmlUtils.html#encodeInvalidCharsForText-java.lang.Object-"><code>XmlUtils.encodeInvalidCharsForText(Object)</code></a> method.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -625,7 +629,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>encodeElementName</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.288">encodeElementName</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>&nbsp;o)</pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.290">encodeElementName</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>&nbsp;o)</pre>
 <div class="block">XML-encoded the specified element name using the <a href="../../../../org/apache/juneau/xml/XmlUtils.html#encodeElementName-java.lang.Object-"><code>XmlUtils.encodeElementName(Object)</code></a> method.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/jso/JsoSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jso/JsoSerializer.html b/content/site/apidocs/org/apache/juneau/jso/JsoSerializer.html
index f3edec0..30f5036 100644
--- a/content/site/apidocs/org/apache/juneau/jso/JsoSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/jso/JsoSerializer.html
@@ -225,7 +225,7 @@ extends <a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a href="../../../../org/apache
 /juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a
  href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
@@ -330,7 +330,7 @@ extends <a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/json/JsonParserContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonParserContext.html b/content/site/apidocs/org/apache/juneau/json/JsonParserContext.html
index d8ea336..153ee50 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonParserContext.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonParserContext.html
@@ -210,7 +210,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserContext.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/json/JsonSchemaSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonSchemaSerializer.html b/content/site/apidocs/org/apache/juneau/json/JsonSchemaSerializer.html
index b3582f1..bfa47e7 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonSchemaSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonSchemaSerializer.html
@@ -225,12 +225,13 @@ extends <a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/json/JsonSerializerSession.html" title="class in org.apache.juneau.json">JsonSerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/json/JsonSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/json/JsonSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -357,7 +358,7 @@ extends <a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="
 </dl>
 </li>
 </ul>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -368,15 +369,16 @@ extends <a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="
                                            <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>&nbsp;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>&nbsp;locale,
                                            <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>&nbsp;timeZone,
-                                           <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">Serializer</a></code></span></div>
+                                           <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                           <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">Serializer</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
    it's going to be a subclass of <a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><code>SerializerSession</code></a>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>output</code> - The output object.
    <br>Character-based serializers can handle the following output class types:
@@ -399,6 +401,8 @@ extends <a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>
@@ -421,7 +425,7 @@ extends <a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/json/JsonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/json/JsonSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonSerializer.Readable.html b/content/site/apidocs/org/apache/juneau/json/JsonSerializer.Readable.html
index 58f1aca..c8cc53d 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonSerializer.Readable.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonSerializer.Readable.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.json.<a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/json/JsonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#getSchemaSerializer--">getSchemaSerializer</a></code></li>
+<code><a href="../../../../org/apache/juneau/json/JsonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#getSchemaSerializer--">getSchemaSerializer</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/json/JsonSerializer.Simple.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonSerializer.Simple.html b/content/site/apidocs/org/apache/juneau/json/JsonSerializer.Simple.html
index 26a4d9a..5e3b21d 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonSerializer.Simple.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonSerializer.Simple.html
@@ -224,7 +224,7 @@ extends <a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.json.<a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/json/JsonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#getSchemaSerializer--">getSchemaSerializer</a></code></li>
+<code><a href="../../../../org/apache/juneau/json/JsonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#getSchemaSerializer--">getSchemaSerializer</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonSerializer.SimpleReadable.html b/content/site/apidocs/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
index 42df49f..7691021 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.json.<a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/json/JsonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#getSchemaSerializer--">getSchemaSerializer</a></code></li>
+<code><a href="../../../../org/apache/juneau/json/JsonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#getSchemaSerializer--">getSchemaSerializer</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html b/content/site/apidocs/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
index a2a6366..aed55a7 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.json.<a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/json/JsonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#getSchemaSerializer--">getSchemaSerializer</a></code></li>
+<code><a href="../../../../org/apache/juneau/json/JsonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/json/JsonSerializer.html#getSchemaSerializer--">getSchemaSerializer</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/json/JsonSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonSerializer.html b/content/site/apidocs/org/apache/juneau/json/JsonSerializer.html
index 927ad70..eff39ca 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonSerializer.html
@@ -327,12 +327,13 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/json/JsonSerializerSession.html" title="class in org.apache.juneau.json">JsonSerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -505,7 +506,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 </dl>
 </li>
 </ul>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -516,15 +517,16 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
                                            <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>&nbsp;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>&nbsp;locale,
                                            <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>&nbsp;timeZone,
-                                           <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">Serializer</a></code></span></div>
+                                           <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                           <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">Serializer</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
    it's going to be a subclass of <a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><code>SerializerSession</code></a>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>output</code> - The output object.
    <br>Character-based serializers can handle the following output class types:
@@ -547,6 +549,8 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>
@@ -569,7 +573,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/json/JsonSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonSerializerContext.html b/content/site/apidocs/org/apache/juneau/json/JsonSerializerContext.html
index 00ac883..0db135b 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonSerializerContext.html
@@ -235,7 +235,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">


[19/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html b/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
index 7abd150..9b821db 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
@@ -448,89 +448,100 @@
 <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>    * Returns a simple collection of properties for this bean map.<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    * @return A simple collection of properties for this bean map.<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    */<a name="line.445"></a>
-<span class="sourceLineNo">446</span>   protected Collection&lt;BeanPropertyMeta&gt; getProperties() {<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      return meta.properties.values();<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>    * Returns all the properties associated with the bean.<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    * @return A new set.<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    */<a name="line.453"></a>
-<span class="sourceLineNo">454</span>   @Override<a name="line.454"></a>
-<span class="sourceLineNo">455</span>   public Set&lt;Entry&lt;String,Object&gt;&gt; entrySet() {<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>      // If this bean has a dyna-property, then we need to construct the entire set before returning.<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      // Otherwise, we can create an iterator without a new data structure.<a name="line.458"></a>
-<span class="sourceLineNo">459</span>      if (meta.dynaProperty != null) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span>         Set&lt;Entry&lt;String,Object&gt;&gt; s = new LinkedHashSet&lt;Entry&lt;String,Object&gt;&gt;();<a name="line.460"></a>
-<span class="sourceLineNo">461</span>         for (BeanPropertyMeta pMeta : getProperties()) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span>            if (pMeta.isDyna()) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span>               try {<a name="line.463"></a>
-<span class="sourceLineNo">464</span>                  for (Map.Entry&lt;String,Object&gt; e : pMeta.getDynaMap(bean).entrySet())<a name="line.464"></a>
-<span class="sourceLineNo">465</span>                     s.add(new BeanMapEntry(this, pMeta, e.getKey()));<a name="line.465"></a>
-<span class="sourceLineNo">466</span>               } catch (Exception e) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span>                  throw new BeanRuntimeException(e);<a name="line.467"></a>
-<span class="sourceLineNo">468</span>               }<a name="line.468"></a>
-<span class="sourceLineNo">469</span>            } else {<a name="line.469"></a>
-<span class="sourceLineNo">470</span>               s.add(new BeanMapEntry(this, pMeta, pMeta.getName()));<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>         return s;<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>      // Construct our own anonymous set to implement this function.<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      Set&lt;Entry&lt;String,Object&gt;&gt; s = new AbstractSet&lt;Entry&lt;String,Object&gt;&gt;() {<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span>         // Get the list of properties from the meta object.<a name="line.479"></a>
-<span class="sourceLineNo">480</span>         // Note that the HashMap.values() method caches results, so this collection<a name="line.480"></a>
-<span class="sourceLineNo">481</span>         // will really only be constructed once per bean type since the underlying<a name="line.481"></a>
-<span class="sourceLineNo">482</span>         // map never changes.<a name="line.482"></a>
-<span class="sourceLineNo">483</span>         final Collection&lt;BeanPropertyMeta&gt; pSet = getProperties();<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>         @Override /* Set */<a name="line.485"></a>
-<span class="sourceLineNo">486</span>         public Iterator&lt;java.util.Map.Entry&lt;String, Object&gt;&gt; iterator() {<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span>            // Construct our own anonymous iterator that uses iterators against the meta.properties<a name="line.488"></a>
-<span class="sourceLineNo">489</span>            // map to maintain position.  This prevents us from having to construct any of our own<a name="line.489"></a>
-<span class="sourceLineNo">490</span>            // collection objects.<a name="line.490"></a>
-<span class="sourceLineNo">491</span>            return new Iterator&lt;Entry&lt;String,Object&gt;&gt;() {<a name="line.491"></a>
-<span class="sourceLineNo">492</span><a name="line.492"></a>
-<span class="sourceLineNo">493</span>               final Iterator&lt;BeanPropertyMeta&gt; pIterator = pSet.iterator();<a name="line.493"></a>
-<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span>               @Override /* Iterator */<a name="line.495"></a>
-<span class="sourceLineNo">496</span>               public boolean hasNext() {<a name="line.496"></a>
-<span class="sourceLineNo">497</span>                  return pIterator.hasNext();<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>               @Override /* Iterator */<a name="line.500"></a>
-<span class="sourceLineNo">501</span>               public Map.Entry&lt;String, Object&gt; next() {<a name="line.501"></a>
-<span class="sourceLineNo">502</span>                  return new BeanMapEntry(BeanMap.this, pIterator.next(), null);<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>               @Override /* Iterator */<a name="line.505"></a>
-<span class="sourceLineNo">506</span>               public void remove() {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>                  throw new UnsupportedOperationException("Cannot remove item from iterator.");<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>         }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span>         @Override /* Set */<a name="line.512"></a>
-<span class="sourceLineNo">513</span>         public int size() {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>            return pSet.size();<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><a name="line.517"></a>
-<span class="sourceLineNo">518</span>      return s;<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>   @SuppressWarnings("unchecked")<a name="line.521"></a>
-<span class="sourceLineNo">522</span>   void setBean(Object bean) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>      this.bean = (T)bean;<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">443</span>    * Given a string containing variables of the form &lt;code&gt;"{property}"&lt;/code&gt;, replaces those variables with<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    * property values in this bean.<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    *<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    * @param s The string containing variables.<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    * @return A new string with variables replaced, or the same string if no variables were found.<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    */<a name="line.448"></a>
+<span class="sourceLineNo">449</span>   public String resolveVars(String s) {<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      return StringUtils.replaceVars(s, 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>    * Returns a simple collection of properties for this bean map.<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    * @return A simple collection of properties for this bean map.<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    */<a name="line.456"></a>
+<span class="sourceLineNo">457</span>   protected Collection&lt;BeanPropertyMeta&gt; getProperties() {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>      return meta.properties.values();<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>    * Returns all the properties associated with the bean.<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    * @return A new set.<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    */<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   @Override<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   public Set&lt;Entry&lt;String,Object&gt;&gt; entrySet() {<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span>      // If this bean has a dyna-property, then we need to construct the entire set before returning.<a name="line.468"></a>
+<span class="sourceLineNo">469</span>      // Otherwise, we can create an iterator without a new data structure.<a name="line.469"></a>
+<span class="sourceLineNo">470</span>      if (meta.dynaProperty != null) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>         Set&lt;Entry&lt;String,Object&gt;&gt; s = new LinkedHashSet&lt;Entry&lt;String,Object&gt;&gt;();<a name="line.471"></a>
+<span class="sourceLineNo">472</span>         for (BeanPropertyMeta pMeta : getProperties()) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span>            if (pMeta.isDyna()) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span>               try {<a name="line.474"></a>
+<span class="sourceLineNo">475</span>                  for (Map.Entry&lt;String,Object&gt; e : pMeta.getDynaMap(bean).entrySet())<a name="line.475"></a>
+<span class="sourceLineNo">476</span>                     s.add(new BeanMapEntry(this, pMeta, e.getKey()));<a name="line.476"></a>
+<span class="sourceLineNo">477</span>               } catch (Exception e) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span>                  throw new BeanRuntimeException(e);<a name="line.478"></a>
+<span class="sourceLineNo">479</span>               }<a name="line.479"></a>
+<span class="sourceLineNo">480</span>            } else {<a name="line.480"></a>
+<span class="sourceLineNo">481</span>               s.add(new BeanMapEntry(this, pMeta, pMeta.getName()));<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>         return s;<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>      // Construct our own anonymous set to implement this function.<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      Set&lt;Entry&lt;String,Object&gt;&gt; s = new AbstractSet&lt;Entry&lt;String,Object&gt;&gt;() {<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span>         // Get the list of properties from the meta object.<a name="line.490"></a>
+<span class="sourceLineNo">491</span>         // Note that the HashMap.values() method caches results, so this collection<a name="line.491"></a>
+<span class="sourceLineNo">492</span>         // will really only be constructed once per bean type since the underlying<a name="line.492"></a>
+<span class="sourceLineNo">493</span>         // map never changes.<a name="line.493"></a>
+<span class="sourceLineNo">494</span>         final Collection&lt;BeanPropertyMeta&gt; pSet = getProperties();<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span>         @Override /* Set */<a name="line.496"></a>
+<span class="sourceLineNo">497</span>         public Iterator&lt;java.util.Map.Entry&lt;String, Object&gt;&gt; iterator() {<a name="line.497"></a>
+<span class="sourceLineNo">498</span><a name="line.498"></a>
+<span class="sourceLineNo">499</span>            // Construct our own anonymous iterator that uses iterators against the meta.properties<a name="line.499"></a>
+<span class="sourceLineNo">500</span>            // map to maintain position.  This prevents us from having to construct any of our own<a name="line.500"></a>
+<span class="sourceLineNo">501</span>            // collection objects.<a name="line.501"></a>
+<span class="sourceLineNo">502</span>            return new Iterator&lt;Entry&lt;String,Object&gt;&gt;() {<a name="line.502"></a>
+<span class="sourceLineNo">503</span><a name="line.503"></a>
+<span class="sourceLineNo">504</span>               final Iterator&lt;BeanPropertyMeta&gt; pIterator = pSet.iterator();<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span>               @Override /* Iterator */<a name="line.506"></a>
+<span class="sourceLineNo">507</span>               public boolean hasNext() {<a name="line.507"></a>
+<span class="sourceLineNo">508</span>                  return pIterator.hasNext();<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>               @Override /* Iterator */<a name="line.511"></a>
+<span class="sourceLineNo">512</span>               public Map.Entry&lt;String, Object&gt; next() {<a name="line.512"></a>
+<span class="sourceLineNo">513</span>                  return new BeanMapEntry(BeanMap.this, pIterator.next(), null);<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>               @Override /* Iterator */<a name="line.516"></a>
+<span class="sourceLineNo">517</span>               public void remove() {<a name="line.517"></a>
+<span class="sourceLineNo">518</span>                  throw new UnsupportedOperationException("Cannot remove item from iterator.");<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><a name="line.522"></a>
+<span class="sourceLineNo">523</span>         @Override /* Set */<a name="line.523"></a>
+<span class="sourceLineNo">524</span>         public int size() {<a name="line.524"></a>
+<span class="sourceLineNo">525</span>            return pSet.size();<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><a name="line.528"></a>
+<span class="sourceLineNo">529</span>      return s;<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>   @SuppressWarnings("unchecked")<a name="line.532"></a>
+<span class="sourceLineNo">533</span>   void setBean(Object bean) {<a name="line.533"></a>
+<span class="sourceLineNo">534</span>      this.bean = (T)bean;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/BeanProxyInvocationHandler.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanProxyInvocationHandler.html b/content/site/apidocs/src-html/org/apache/juneau/BeanProxyInvocationHandler.html
index 12e5883..86b7954 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanProxyInvocationHandler.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanProxyInvocationHandler.html
@@ -23,70 +23,72 @@
 <span class="sourceLineNo">015</span>import java.lang.reflect.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span>import java.util.*;<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> * Provides an {@link InvocationHandler} for creating beans from bean interfaces.<a name="line.19"></a>
-<span class="sourceLineNo">020</span> * &lt;p&gt;<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * If the {@code useInterfaceProxies} setting is enabled in {@link BeanContext}, this<a name="line.21"></a>
-<span class="sourceLineNo">022</span> *    is the class that creates instances of beans from interfaces.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> *<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * @param &lt;T&gt; The interface class<a name="line.24"></a>
-<span class="sourceLineNo">025</span> */<a name="line.25"></a>
-<span class="sourceLineNo">026</span>public class BeanProxyInvocationHandler&lt;T&gt; implements InvocationHandler {<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>   private final BeanMeta&lt;T&gt; meta;                 // The BeanMeta for this instance<a name="line.28"></a>
-<span class="sourceLineNo">029</span>   private Map&lt;String, Object&gt; beanProps;    // The map of property names to bean property values.<a name="line.29"></a>
-<span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>   /**<a name="line.31"></a>
-<span class="sourceLineNo">032</span>    * Constructs with the specified {@link BeanMeta}.<a name="line.32"></a>
-<span class="sourceLineNo">033</span>    *<a name="line.33"></a>
-<span class="sourceLineNo">034</span>    * @param meta The bean meta data.<a name="line.34"></a>
-<span class="sourceLineNo">035</span>    */<a name="line.35"></a>
-<span class="sourceLineNo">036</span>   public BeanProxyInvocationHandler(BeanMeta&lt;T&gt; meta) {<a name="line.36"></a>
-<span class="sourceLineNo">037</span>      this.meta = meta;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>      this.beanProps = new HashMap&lt;String, Object&gt;();<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>    * Implemented to handle the method called.<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    */<a name="line.43"></a>
-<span class="sourceLineNo">044</span>   @Override /* InvocationHandler */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>   public Object invoke(Object proxy, Method method, Object[] args) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span>      Class&lt;?&gt;[] paramTypes = method.getParameterTypes();<a name="line.46"></a>
-<span class="sourceLineNo">047</span>      if (method.getName().equals("equals") &amp;&amp; (paramTypes.length == 1) &amp;&amp; (paramTypes[0] == java.lang.Object.class)) {<a name="line.47"></a>
-<span class="sourceLineNo">048</span>         Object arg = args[0];<a name="line.48"></a>
-<span class="sourceLineNo">049</span>         if (arg == null)<a name="line.49"></a>
-<span class="sourceLineNo">050</span>            return false;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>         if (proxy == arg)<a name="line.51"></a>
-<span class="sourceLineNo">052</span>            return true;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>         if (proxy.getClass() == arg.getClass()) {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>            InvocationHandler ih = Proxy.getInvocationHandler(arg);<a name="line.54"></a>
-<span class="sourceLineNo">055</span>            if (ih instanceof BeanProxyInvocationHandler) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>               return this.beanProps.equals(((BeanProxyInvocationHandler&lt;?&gt;)ih).beanProps);<a name="line.56"></a>
-<span class="sourceLineNo">057</span>            }<a name="line.57"></a>
-<span class="sourceLineNo">058</span>         }<a name="line.58"></a>
-<span class="sourceLineNo">059</span>         BeanMap&lt;Object&gt; bean = this.meta.ctx.createSession().toBeanMap(arg);<a name="line.59"></a>
-<span class="sourceLineNo">060</span>         return this.beanProps.equals(bean);<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      }<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>      if (method.getName().equals("hashCode") &amp;&amp; (paramTypes.length == 0))<a name="line.63"></a>
-<span class="sourceLineNo">064</span>         return Integer.valueOf(this.beanProps.hashCode());<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>      if (method.getName().equals("toString") &amp;&amp; (paramTypes.length == 0))<a name="line.66"></a>
-<span class="sourceLineNo">067</span>         return this.beanProps.toString();<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>      String prop = this.meta.getterProps.get(method);<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      if (prop != null)<a name="line.70"></a>
-<span class="sourceLineNo">071</span>         return this.beanProps.get(prop);<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>      prop = this.meta.setterProps.get(method);<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      if (prop != null) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>         this.beanProps.put(prop, args[0]);<a name="line.75"></a>
-<span class="sourceLineNo">076</span>         return null;<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>      throw new UnsupportedOperationException("Unsupported bean method.  method=[ " + method + " ]");<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">018</span>import org.apache.juneau.json.*;<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> * Provides an {@link InvocationHandler} for creating beans from bean interfaces.<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * &lt;p&gt;<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * If the {@code useInterfaceProxies} setting is enabled in {@link BeanContext}, this<a name="line.23"></a>
+<span class="sourceLineNo">024</span> *    is the class that creates instances of beans from interfaces.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> *<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * @param &lt;T&gt; The interface class<a name="line.26"></a>
+<span class="sourceLineNo">027</span> */<a name="line.27"></a>
+<span class="sourceLineNo">028</span>public class BeanProxyInvocationHandler&lt;T&gt; implements InvocationHandler {<a name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span>   private final BeanMeta&lt;T&gt; meta;                 // The BeanMeta for this instance<a name="line.30"></a>
+<span class="sourceLineNo">031</span>   private Map&lt;String, Object&gt; beanProps;    // The map of property names to bean property values.<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>    * Constructs with the specified {@link BeanMeta}.<a name="line.34"></a>
+<span class="sourceLineNo">035</span>    *<a name="line.35"></a>
+<span class="sourceLineNo">036</span>    * @param meta The bean meta data.<a name="line.36"></a>
+<span class="sourceLineNo">037</span>    */<a name="line.37"></a>
+<span class="sourceLineNo">038</span>   public BeanProxyInvocationHandler(BeanMeta&lt;T&gt; meta) {<a name="line.38"></a>
+<span class="sourceLineNo">039</span>      this.meta = meta;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>      this.beanProps = new HashMap&lt;String, Object&gt;();<a name="line.40"></a>
+<span class="sourceLineNo">041</span>   }<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>   /**<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    * Implemented to handle the method called.<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    */<a name="line.45"></a>
+<span class="sourceLineNo">046</span>   @Override /* InvocationHandler */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>   public Object invoke(Object proxy, Method method, Object[] args) {<a name="line.47"></a>
+<span class="sourceLineNo">048</span>      Class&lt;?&gt;[] paramTypes = method.getParameterTypes();<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      if (method.getName().equals("equals") &amp;&amp; (paramTypes.length == 1) &amp;&amp; (paramTypes[0] == java.lang.Object.class)) {<a name="line.49"></a>
+<span class="sourceLineNo">050</span>         Object arg = args[0];<a name="line.50"></a>
+<span class="sourceLineNo">051</span>         if (arg == null)<a name="line.51"></a>
+<span class="sourceLineNo">052</span>            return false;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>         if (proxy == arg)<a name="line.53"></a>
+<span class="sourceLineNo">054</span>            return true;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>         if (proxy.getClass() == arg.getClass()) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>            InvocationHandler ih = Proxy.getInvocationHandler(arg);<a name="line.56"></a>
+<span class="sourceLineNo">057</span>            if (ih instanceof BeanProxyInvocationHandler) {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>               return this.beanProps.equals(((BeanProxyInvocationHandler&lt;?&gt;)ih).beanProps);<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>         BeanMap&lt;Object&gt; bean = this.meta.ctx.createSession().toBeanMap(arg);<a name="line.61"></a>
+<span class="sourceLineNo">062</span>         return this.beanProps.equals(bean);<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>      if (method.getName().equals("hashCode") &amp;&amp; (paramTypes.length == 0))<a name="line.65"></a>
+<span class="sourceLineNo">066</span>         return Integer.valueOf(this.beanProps.hashCode());<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>      if (method.getName().equals("toString") &amp;&amp; (paramTypes.length == 0))<a name="line.68"></a>
+<span class="sourceLineNo">069</span>         return JsonSerializer.DEFAULT_LAX.toString(this.beanProps);<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>      String prop = this.meta.getterProps.get(method);<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      if (prop != null)<a name="line.72"></a>
+<span class="sourceLineNo">073</span>         return this.beanProps.get(prop);<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>      prop = this.meta.setterProps.get(method);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      if (prop != null) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>         this.beanProps.put(prop, args[0]);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>         return null;<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>      throw new UnsupportedOperationException("Unsupported bean method.  method=[ " + method + " ]");<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/UriContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/UriContext.html b/content/site/apidocs/src-html/org/apache/juneau/UriContext.html
new file mode 100644
index 0000000..baabc4c
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/UriContext.html
@@ -0,0 +1,493 @@
+<!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;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import static org.apache.juneau.internal.StringUtils.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span><a name="line.16"></a>
+<span class="sourceLineNo">017</span>import java.io.*;<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> * Represents a URL broken into authority/context-root/servlet-path/path-info parts.<a name="line.20"></a>
+<span class="sourceLineNo">021</span> * &lt;p&gt;<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * A typical request against a URL takes the following form:<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * &lt;p class='bcode'&gt;<a name="line.23"></a>
+<span class="sourceLineNo">024</span> *    http://host:port/context-root/servlet-path/path-info<a name="line.24"></a>
+<span class="sourceLineNo">025</span> *    |   authority   |  context   |  resource  |  path  |<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *  +--------------------------------------------------+<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * &lt;/p&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * &lt;p&gt;<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * This class allows you to convert URL strings to absolute (e.g. &lt;js&gt;"http://host:port/foo/bar"&lt;/js&gt;) or root-relative<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *    (e.g. &lt;js&gt;"/foo/bar"&lt;/js&gt;) URLs.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * &lt;p&gt;<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * Two special protocols are used to represent context-root-relative and servlet-relative URIs:<a name="line.32"></a>
+<span class="sourceLineNo">033</span> *    &lt;js&gt;"context:/"&lt;/js&gt; and &lt;js&gt;"servlet:/"&lt;/js&gt;.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> *<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * The following list shows the types of URLs that can be resolved with this class:<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * &lt;ul&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> *    &lt;li&gt;&lt;js&gt;"foo://foo"&lt;/js&gt; - Absolute URI.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *    &lt;li&gt;&lt;js&gt;"/foo"&lt;/js&gt; - Root-relative URI.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *    &lt;li&gt;&lt;js&gt;"/"&lt;/js&gt; - Root URI.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *    &lt;li&gt;&lt;js&gt;"context:/foo"&lt;/js&gt; - Context-root-relative URI.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *    &lt;li&gt;&lt;js&gt;"context:/"&lt;/js&gt; - Context-root URI.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> *    &lt;li&gt;&lt;js&gt;"servlet:/foo"&lt;/js&gt; - Servlet-path-relative URI.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> *    &lt;li&gt;&lt;js&gt;"servlet:/"&lt;/js&gt; - Servlet-path URI.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *    &lt;li&gt;&lt;js&gt;"foo"&lt;/js&gt; - Path-info-relative URI.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *    &lt;li&gt;&lt;js&gt;""&lt;/js&gt; - Path-info URI.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * &lt;/ul&gt;<a name="line.46"></a>
+<span class="sourceLineNo">047</span> *<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * The following class shows how<a name="line.48"></a>
+<span class="sourceLineNo">049</span> */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>public class UriContext {<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>   private final String authority, contextRoot, servletPath, pathInfo, parentPath;<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>   // Lazy-initialized fields.<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   private String aContextRoot, rContextRoot, aServletPath, rResource, aPathInfo, rPath;<a name="line.55"></a>
+<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>   /**<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * Constructor.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * &lt;p&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    * Leading and trailing slashes are trimmed of all parameters.<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * &lt;p&gt;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    * Any parameter can be &lt;jk&gt;null&lt;/jk&gt;.  Blanks and nulls are equivalent.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    *<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    * @param authority - The authority portion of URL (e.g. &lt;js&gt;"http://hostname:port"&lt;/js&gt;)<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    * @param contextRoot - The context root of the application (e.g. &lt;js&gt;"/context-root"&lt;/js&gt;, or &lt;js&gt;"context-root"&lt;/js&gt;)<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    * @param servletPath - The servlet path (e.g. &lt;js&gt;"/servlet-path"&lt;/js&gt;, or &lt;js&gt;"servlet-path"&lt;/js&gt;)<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    * @param pathInfo - The path info (e.g. &lt;js&gt;"/path-info"&lt;/js&gt;, or &lt;js&gt;"path-info"&lt;/js&gt;)<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    */<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   public UriContext(String authority, String contextRoot, String servletPath, String pathInfo) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      this.authority = nullIfEmpty(trimSlashes(authority));<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      this.contextRoot = nullIfEmpty(trimSlashes(contextRoot));<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      this.servletPath = nullIfEmpty(trimSlashes(servletPath));<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      this.pathInfo = nullIfEmpty(trimSlashes(pathInfo));<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      this.parentPath = this.pathInfo == null || this.pathInfo.indexOf('/') == -1 ? null : this.pathInfo.substring(0, this.pathInfo.lastIndexOf('/'));<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>    * Returns the absolute URI of just the authority portion of this URI context.<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    * &lt;p&gt;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    * Example:  &lt;js&gt;"http://hostname:port"&lt;/js&gt;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    * &lt;p&gt;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    * If the authority is null/empty, returns &lt;js&gt;"/"&lt;/js&gt;.<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    *<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    * @return The absolute URI of just the authority portion of this URI context.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    */<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   public String getAbsoluteAuthority() {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      return authority == null ? "/" : authority;<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>    * Returns the absolute URI of the context-root portion of this URI context.<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    * &lt;p&gt;<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    * Example:  &lt;js&gt;"http://hostname:port/context-root"&lt;/js&gt;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    *<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    * @return The absolute URI of the context-root portion of this URI context.<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    */<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   public String getAbsoluteContextRoot() {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      if (aContextRoot == null) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>         if (authority == null)<a name="line.102"></a>
+<span class="sourceLineNo">103</span>            aContextRoot = getRootRelativeContextRoot();<a name="line.103"></a>
+<span class="sourceLineNo">104</span>         else<a name="line.104"></a>
+<span class="sourceLineNo">105</span>            aContextRoot = (contextRoot == null ? authority : (authority + '/' + contextRoot));<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      }<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      return aContextRoot;<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>    * Returns the root-relative URI of the context portion of this URI context.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    * &lt;p&gt;<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    * Example:  &lt;js&gt;"/context-root"&lt;/js&gt;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    *<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    * @return The root-relative URI of the context portion of this URI context.<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    */<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   public String getRootRelativeContextRoot() {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      if (rContextRoot == null)<a name="line.119"></a>
+<span class="sourceLineNo">120</span>         rContextRoot = contextRoot == null ? "/" : ('/' + contextRoot);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      return rContextRoot;<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 absolute URI of the resource portion of this URI context.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    * &lt;p&gt;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    * Example:  &lt;js&gt;"http://hostname:port/context-root/servlet-path"&lt;/js&gt;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    *<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    * @return The absolute URI of the resource portion of this URI context.<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    */<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   public String getAbsoluteServletPath() {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      if (aServletPath == null) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>         if (authority == null)<a name="line.134"></a>
+<span class="sourceLineNo">135</span>            aServletPath = getRootRelativeServletPath();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>         else {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>            if (contextRoot == null)<a name="line.137"></a>
+<span class="sourceLineNo">138</span>               aServletPath = (servletPath == null ? authority : authority + '/' + servletPath);<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            else<a name="line.139"></a>
+<span class="sourceLineNo">140</span>               aServletPath = (servletPath == null ? (authority + '/' + contextRoot) : (authority + '/' + contextRoot + '/' + servletPath));<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>      return aServletPath;<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>    * Returns the root-relative URI of the resource portion of this URI context.<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    * &lt;p&gt;<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    * Example:  &lt;js&gt;"/context-root/servlet-path"&lt;/js&gt;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    *<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    * @return The root-relative URI of the resource portion of this URI context.<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    */<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   public String getRootRelativeServletPath() {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      if (rResource == null) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>         if (contextRoot == null)<a name="line.156"></a>
+<span class="sourceLineNo">157</span>            rResource = (servletPath == null ? "/" : ('/' + servletPath));<a name="line.157"></a>
+<span class="sourceLineNo">158</span>         else<a name="line.158"></a>
+<span class="sourceLineNo">159</span>            rResource = (servletPath == null ? ('/' + contextRoot) : ('/' + contextRoot + '/' + servletPath));<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      return rResource;<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>    * Returns the parent of the URL returned by {@link #getAbsoluteServletPath()}.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    *<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    * @return The parent of the URL returned by {@link #getAbsoluteServletPath()}.<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    */<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   public String getAbsoluteServletPathParent() {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      return getParent(getAbsoluteServletPath());<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   }<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span>   /**<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    * Returns the parent of the URL returned by {@link #getRootRelativeServletPath()}.<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    *<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    * @return The parent of the URL returned by {@link #getRootRelativeServletPath()}.<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    */<a name="line.177"></a>
+<span class="sourceLineNo">178</span>   public String getRootRelativeServletPathParent() {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      return getParent(getRootRelativeServletPath());<a name="line.179"></a>
+<span class="sourceLineNo">180</span>   }<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>    * Returns the absolute URI of the path portion of this URI context.<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    * &lt;p&gt;<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    * Example:  &lt;js&gt;"http://hostname:port/context-root/servlet-path/path-info"&lt;/js&gt;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    *<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    * @return The absolute URI of the path portion of this URI context.<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    */<a name="line.189"></a>
+<span class="sourceLineNo">190</span>   public String getAbsolutePathInfo() {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      if (aPathInfo == null) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>         if (authority == null)<a name="line.192"></a>
+<span class="sourceLineNo">193</span>            aPathInfo = getRootRelativePathInfo();<a name="line.193"></a>
+<span class="sourceLineNo">194</span>         else {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>            if (contextRoot == null) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span>               if (servletPath == null)<a name="line.196"></a>
+<span class="sourceLineNo">197</span>                  aPathInfo = (pathInfo == null ? authority : (authority + '/' + pathInfo));<a name="line.197"></a>
+<span class="sourceLineNo">198</span>               else<a name="line.198"></a>
+<span class="sourceLineNo">199</span>                  aPathInfo = (pathInfo == null ? (authority + '/' + servletPath) : (authority + '/' + servletPath + '/' + pathInfo));<a name="line.199"></a>
+<span class="sourceLineNo">200</span>            } else {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>               if (servletPath == null)<a name="line.201"></a>
+<span class="sourceLineNo">202</span>                  aPathInfo = (pathInfo == null ? authority + '/' + contextRoot : (authority + '/' + contextRoot + '/' + pathInfo));<a name="line.202"></a>
+<span class="sourceLineNo">203</span>               else<a name="line.203"></a>
+<span class="sourceLineNo">204</span>                  aPathInfo = (pathInfo == null ? (authority + '/' + contextRoot + '/' + servletPath) : (authority + '/' + contextRoot + '/' + servletPath + '/' + pathInfo));<a name="line.204"></a>
+<span class="sourceLineNo">205</span>            }<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>      return aPathInfo;<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>   /**<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    * Returns the root-relative URI of the path portion of this URI context.<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    * &lt;p&gt;<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    * Example:  &lt;js&gt;"/context-root/servlet-path/path-info"&lt;/js&gt;<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    *<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    * @return The root-relative URI of the path portion of this URI context.<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    */<a name="line.218"></a>
+<span class="sourceLineNo">219</span>   public String getRootRelativePathInfo() {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      if (rPath == null) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>         if (contextRoot == null) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span>            if (servletPath == null)<a name="line.222"></a>
+<span class="sourceLineNo">223</span>               rPath = (pathInfo == null ? "/" : ('/' + pathInfo));<a name="line.223"></a>
+<span class="sourceLineNo">224</span>            else<a name="line.224"></a>
+<span class="sourceLineNo">225</span>               rPath = (pathInfo == null ? ('/' + servletPath) : ('/' + servletPath + '/' + pathInfo));<a name="line.225"></a>
+<span class="sourceLineNo">226</span>         } else {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>            if (servletPath == null)<a name="line.227"></a>
+<span class="sourceLineNo">228</span>               rPath = (pathInfo == null ? ('/' + contextRoot) : ('/' + contextRoot + '/' + pathInfo));<a name="line.228"></a>
+<span class="sourceLineNo">229</span>            else<a name="line.229"></a>
+<span class="sourceLineNo">230</span>               rPath = (pathInfo == null ? ('/' + contextRoot + '/' + servletPath) : ('/' + contextRoot + '/' + servletPath + '/' + pathInfo));<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>      return rPath;<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>    * Returns the parent of the URL returned by {@link #getAbsolutePathInfo()}.<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    *<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    * @return The parent of the URL returned by {@link #getAbsolutePathInfo()}.<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    */<a name="line.240"></a>
+<span class="sourceLineNo">241</span>   public String getAbsolutePathInfoParent() {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      return getParent(getAbsolutePathInfo());<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>    * Returns the parent of the URL returned by {@link #getRootRelativePathInfo()}.<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    *<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    * @return The parent of the URL returned by {@link #getRootRelativePathInfo()}.<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    */<a name="line.249"></a>
+<span class="sourceLineNo">250</span>   public String getRootRelativePathInfoParent() {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      return getParent(getRootRelativePathInfo());<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>    * Converts the specified URI to absolute form based on values in this context.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    *<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    * @param uri The URI to convert to absolute form.<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    * @return The converted URI.<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    */<a name="line.259"></a>
+<span class="sourceLineNo">260</span>   public String resolveAbsolute(String uri) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      if (isAbsoluteUri(uri))<a name="line.261"></a>
+<span class="sourceLineNo">262</span>         return uri;<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      return appendAbsolute(new StringBuilder(), uri).toString();<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>    * Converts the specified URI to root-relative form based on values in this context.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    *<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    * @param uri The URI to convert to root-relative form.<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    * @return The converted URI.<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    */<a name="line.271"></a>
+<span class="sourceLineNo">272</span>   public String resolveRootRelative(String uri) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      if (isAbsoluteUri(uri))<a name="line.273"></a>
+<span class="sourceLineNo">274</span>         return uri;<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      if (startsWith(uri, '/'))<a name="line.275"></a>
+<span class="sourceLineNo">276</span>         return uri;<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      return appendRootRelative(new StringBuilder(), uri).toString();<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>   /**<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    * Same as {@link #resolveAbsolute(String)} except appends result to the specified appendable.<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    *<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    * @param a The appendable to append the URL to.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    * @param uri The URI to convert to absolute form.<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    * @return The same appendable passed in.<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    */<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   public Appendable appendAbsolute(Appendable a, String uri) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>      try {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>         uri = nullIfEmpty(uri);<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>         // Absolute paths are not changed.<a name="line.292"></a>
+<span class="sourceLineNo">293</span>         if (isAbsoluteUri(uri))<a name="line.293"></a>
+<span class="sourceLineNo">294</span>            return a.append(uri);<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>         // Root-relative path<a name="line.296"></a>
+<span class="sourceLineNo">297</span>         if (startsWith(uri, '/')) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>            if (authority != null){<a name="line.298"></a>
+<span class="sourceLineNo">299</span>               a.append(authority);<a name="line.299"></a>
+<span class="sourceLineNo">300</span>               if (uri.length() == 1)<a name="line.300"></a>
+<span class="sourceLineNo">301</span>                  return a;<a name="line.301"></a>
+<span class="sourceLineNo">302</span>            }<a name="line.302"></a>
+<span class="sourceLineNo">303</span>            return a.append(uri);<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>         // Context-relative path<a name="line.305"></a>
+<span class="sourceLineNo">306</span>         } else if (uri != null &amp;&amp; uri.startsWith("context:/")) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span>            if (authority != null)<a name="line.307"></a>
+<span class="sourceLineNo">308</span>               a.append(authority);<a name="line.308"></a>
+<span class="sourceLineNo">309</span>            if (contextRoot != null)<a name="line.309"></a>
+<span class="sourceLineNo">310</span>               a.append('/').append(contextRoot);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>            if (uri.length() &gt; 9)<a name="line.311"></a>
+<span class="sourceLineNo">312</span>               a.append('/').append(uri.substring(9));<a name="line.312"></a>
+<span class="sourceLineNo">313</span>            else if (contextRoot == null &amp;&amp; authority == null)<a name="line.313"></a>
+<span class="sourceLineNo">314</span>               a.append('/');<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span>         // Resource-relative path<a name="line.316"></a>
+<span class="sourceLineNo">317</span>         } else if (uri != null &amp;&amp; uri.startsWith("servlet:/")) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span>            if (authority != null)<a name="line.318"></a>
+<span class="sourceLineNo">319</span>               a.append(authority);<a name="line.319"></a>
+<span class="sourceLineNo">320</span>            if (contextRoot != null)<a name="line.320"></a>
+<span class="sourceLineNo">321</span>               a.append('/').append(contextRoot);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>            if (servletPath != null)<a name="line.322"></a>
+<span class="sourceLineNo">323</span>               a.append('/').append(servletPath);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>            if (uri.length() &gt; 9)<a name="line.324"></a>
+<span class="sourceLineNo">325</span>               a.append('/').append(uri.substring(9));<a name="line.325"></a>
+<span class="sourceLineNo">326</span>            else if (servletPath == null &amp;&amp; contextRoot == null &amp;&amp; authority == null)<a name="line.326"></a>
+<span class="sourceLineNo">327</span>               a.append('/');<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>         // Relative path<a name="line.329"></a>
+<span class="sourceLineNo">330</span>         } else {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>            if (authority != null)<a name="line.331"></a>
+<span class="sourceLineNo">332</span>               a.append(authority);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>            if (contextRoot != null)<a name="line.333"></a>
+<span class="sourceLineNo">334</span>               a.append('/').append(contextRoot);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>            if (servletPath != null)<a name="line.335"></a>
+<span class="sourceLineNo">336</span>               a.append('/').append(servletPath);<a name="line.336"></a>
+<span class="sourceLineNo">337</span>            if (uri == null) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>               if (pathInfo != null)<a name="line.338"></a>
+<span class="sourceLineNo">339</span>                  a.append('/').append(pathInfo);<a name="line.339"></a>
+<span class="sourceLineNo">340</span>            } else {<a name="line.340"></a>
+<span class="sourceLineNo">341</span>               if (parentPath != null)<a name="line.341"></a>
+<span class="sourceLineNo">342</span>                  a.append('/').append(parentPath);<a name="line.342"></a>
+<span class="sourceLineNo">343</span>               a.append('/').append(uri);<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><a name="line.346"></a>
+<span class="sourceLineNo">347</span>         return a;<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      } catch (IOException e) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>         throw new RuntimeException(e);<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><a name="line.352"></a>
+<span class="sourceLineNo">353</span>   /**<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    * Same as {@link #resolveRootRelative(String)} except appends result to the specified appendable.<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    *<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    * @param a The appendable to append the URL to.<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    * @param uri The URI to convert to root-relative form.<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    * @return The same appendable passed in.<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    */<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   public Appendable appendRootRelative(Appendable a, String uri) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span>      try {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>         uri = nullIfEmpty(uri);<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span>         // Absolute paths are not changed.<a name="line.365"></a>
+<span class="sourceLineNo">366</span>         if (isAbsoluteUri(uri))<a name="line.366"></a>
+<span class="sourceLineNo">367</span>            return a.append(uri);<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span>         // Root-relative path<a name="line.369"></a>
+<span class="sourceLineNo">370</span>         if (startsWith(uri, '/')) {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>            return a.append(uri);<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span>         // Context-relative path<a name="line.373"></a>
+<span class="sourceLineNo">374</span>         } else if (uri != null &amp;&amp; uri.startsWith("context:/")) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            if (contextRoot != null)<a name="line.375"></a>
+<span class="sourceLineNo">376</span>               a.append('/').append(contextRoot);<a name="line.376"></a>
+<span class="sourceLineNo">377</span>            if (uri.length() &gt; 9)<a name="line.377"></a>
+<span class="sourceLineNo">378</span>               a.append('/').append(uri.substring(9));<a name="line.378"></a>
+<span class="sourceLineNo">379</span>            else if (contextRoot == null)<a name="line.379"></a>
+<span class="sourceLineNo">380</span>               a.append('/');<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span>         // Resource-relative path<a name="line.382"></a>
+<span class="sourceLineNo">383</span>         } else if (uri != null &amp;&amp; uri.startsWith("servlet:/")) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>            if (contextRoot != null)<a name="line.384"></a>
+<span class="sourceLineNo">385</span>               a.append('/').append(contextRoot);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>            if (servletPath != null)<a name="line.386"></a>
+<span class="sourceLineNo">387</span>               a.append('/').append(servletPath);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>            if (uri.length() &gt; 9)<a name="line.388"></a>
+<span class="sourceLineNo">389</span>               a.append('/').append(uri.substring(9));<a name="line.389"></a>
+<span class="sourceLineNo">390</span>            else if (servletPath == null &amp;&amp; contextRoot == null)<a name="line.390"></a>
+<span class="sourceLineNo">391</span>               a.append('/');<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span>         // Relative path<a name="line.393"></a>
+<span class="sourceLineNo">394</span>         } else {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            if (contextRoot != null)<a name="line.395"></a>
+<span class="sourceLineNo">396</span>               a.append('/').append(contextRoot);<a name="line.396"></a>
+<span class="sourceLineNo">397</span>            if (servletPath != null)<a name="line.397"></a>
+<span class="sourceLineNo">398</span>               a.append('/').append(servletPath);<a name="line.398"></a>
+<span class="sourceLineNo">399</span>            if (uri == null) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>               if (pathInfo != null)<a name="line.400"></a>
+<span class="sourceLineNo">401</span>                  a.append('/').append(pathInfo);<a name="line.401"></a>
+<span class="sourceLineNo">402</span>            } else {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>               if (parentPath != null)<a name="line.403"></a>
+<span class="sourceLineNo">404</span>                  a.append('/').append(parentPath);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>               a.append('/').append(uri);<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>         return a;<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      } catch (IOException e) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>         throw new RuntimeException(e);<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>   }<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span>   private static String getParent(String uri) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      int i = uri.lastIndexOf('/');<a name="line.416"></a>
+<span class="sourceLineNo">417</span>      if (i &lt;= 1)<a name="line.417"></a>
+<span class="sourceLineNo">418</span>         return "/";<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      return uri.substring(0, i);<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>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/UriRelativity.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/UriRelativity.html b/content/site/apidocs/src-html/org/apache/juneau/UriRelativity.html
new file mode 100644
index 0000000..1716866
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/UriRelativity.html
@@ -0,0 +1,101 @@
+<!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;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>/**<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * Identifies how relative URIs should resolve against.<a name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>public enum UriRelativity {<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>    * Relative URIs should be considered relative to the servlet URI.<a name="line.21"></a>
+<span class="sourceLineNo">022</span>    */<a name="line.22"></a>
+<span class="sourceLineNo">023</span>   RESOURCE,<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>   /**<a name="line.25"></a>
+<span class="sourceLineNo">026</span>    * Relative URIs should be considered relative to the request URI.<a name="line.26"></a>
+<span class="sourceLineNo">027</span>    */<a name="line.27"></a>
+<span class="sourceLineNo">028</span>   PATH_INFO;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>}<a name="line.29"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/UriResolution.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/UriResolution.html b/content/site/apidocs/src-html/org/apache/juneau/UriResolution.html
new file mode 100644
index 0000000..e9858fe
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/UriResolution.html
@@ -0,0 +1,106 @@
+<!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;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>/**<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * Identifies the possible types of URL resolution.<a name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>public enum UriResolution {<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>    * Resolve to an absolute URL (e.g. &lt;js&gt;"http://host:port/context-root/servlet-path/path-info"&lt;/js&gt;).<a name="line.21"></a>
+<span class="sourceLineNo">022</span>    */<a name="line.22"></a>
+<span class="sourceLineNo">023</span>   ABSOLUTE,<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>   /**<a name="line.25"></a>
+<span class="sourceLineNo">026</span>    * Resolve to a root-relative URL (e.g. &lt;js&gt;"/context-root/servlet-path/path-info"&lt;/js&gt;).<a name="line.26"></a>
+<span class="sourceLineNo">027</span>    */<a name="line.27"></a>
+<span class="sourceLineNo">028</span>   ROOT_RELATIVE,<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>    * Don't do any URL resolution.<a name="line.31"></a>
+<span class="sourceLineNo">032</span>    */<a name="line.32"></a>
+<span class="sourceLineNo">033</span>   NONE;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>}<a name="line.34"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/csv/CsvSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/csv/CsvSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/csv/CsvSerializerSession.html
index 4622107..62d3a18 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/csv/CsvSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/csv/CsvSerializerSession.html
@@ -38,21 +38,23 @@
 <span class="sourceLineNo">030</span>    * Create a new session using properties specified in the context.<a name="line.30"></a>
 <span class="sourceLineNo">031</span>    *<a name="line.31"></a>
 <span class="sourceLineNo">032</span>    * @param ctx The context creating this session object.<a name="line.32"></a>
-<span class="sourceLineNo">033</span>    * The context contains all the configuration settings for this object.<a name="line.33"></a>
+<span class="sourceLineNo">033</span>    *    The context contains all the configuration settings for this object.<a name="line.33"></a>
 <span class="sourceLineNo">034</span>    * @param output The output object.<a name="line.34"></a>
 <span class="sourceLineNo">035</span>    * @param op The override properties.<a name="line.35"></a>
-<span class="sourceLineNo">036</span>    * These override any context properties defined in the context.<a name="line.36"></a>
+<span class="sourceLineNo">036</span>    *    These override any context properties defined in the context.<a name="line.36"></a>
 <span class="sourceLineNo">037</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.37"></a>
 <span class="sourceLineNo">038</span>    * @param locale The session locale.<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.39"></a>
+<span class="sourceLineNo">039</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.39"></a>
 <span class="sourceLineNo">040</span>    * @param timeZone The session timezone.<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.41"></a>
+<span class="sourceLineNo">041</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.41"></a>
 <span class="sourceLineNo">042</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    */<a name="line.43"></a>
-<span class="sourceLineNo">044</span>   protected CsvSerializerSession(CsvSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.44"></a>
-<span class="sourceLineNo">045</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType);<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">043</span>    * @param uriContext The URI context.<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    */<a name="line.45"></a>
+<span class="sourceLineNo">046</span>   protected CsvSerializerSession(CsvSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.46"></a>
+<span class="sourceLineNo">047</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.47"></a>
+<span class="sourceLineNo">048</span>   }<a name="line.48"></a>
+<span class="sourceLineNo">049</span>}<a name="line.49"></a>
 
 
 



[22/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlSchemaDocSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlSchemaDocSerializer.html b/content/site/apidocs/org/apache/juneau/xml/XmlSchemaDocSerializer.html
index 33c69d4..df711fe 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSchemaDocSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSchemaDocSerializer.html
@@ -234,7 +234,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html" tit
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.xml.<a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html" title="class in org.apache.juneau.xml">XmlSchemaSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html#getValidator-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">getValidator</a></code></li>
+<code><a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html#getValidator-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">getValidator</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.xml.XmlSerializer">
@@ -324,7 +324,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html" tit
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html" title="class in org.apache.juneau.xml">XmlSchemaSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlSchemaSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlSchemaSerializer.html b/content/site/apidocs/org/apache/juneau/xml/XmlSchemaSerializer.html
index 08754d4..6e530a8 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSchemaSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSchemaSerializer.html
@@ -237,12 +237,13 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" title="class in org.apache.juneau.xml">XmlSerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -365,7 +366,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -385,7 +386,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <div class="block">Returns an XML-Schema validator based on the output returned by <a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-"><code>doSerialize(SerializerSession, Object)</code></a>;</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/xml/XmlSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  Can be <jk>null</jk>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -395,7 +396,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 </dl>
 </li>
 </ul>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -406,15 +407,16 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
                                           <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>&nbsp;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>&nbsp;locale,
                                           <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>&nbsp;timeZone,
-                                          <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">Serializer</a></code></span></div>
+                                          <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                          <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">Serializer</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
    it's going to be a subclass of <a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><code>SerializerSession</code></a>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>output</code> - The output object.
    <br>Character-based serializers can handle the following output class types:
@@ -437,6 +439,8 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.Ns.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.Ns.html b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.Ns.html
index 25167e7..cd9d6a1 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.Ns.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.Ns.html
@@ -224,7 +224,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.xml.<a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Na
 mespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.St
 ring-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.NsSq.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.NsSq.html b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.NsSq.html
index b87f988..3c5ef1e 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.NsSq.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.NsSq.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.xml.<a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Na
 mespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.St
 ring-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
index fbb5202..1c4319a 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.xml.<a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Na
 mespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.St
 ring-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.Sq.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.Sq.html b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.Sq.html
index d26b67d..d92cb49 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.Sq.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.Sq.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.xml.<a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Na
 mespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.St
 ring-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.SqReadable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.SqReadable.html b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.SqReadable.html
index 9f2ccf4..7f337b4 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.SqReadable.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.SqReadable.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.xml.<a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Na
 mespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.St
 ring-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.html b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.html
index e68749b..1d42905 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSerializer.html
@@ -370,12 +370,13 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" title="class in org.apache.juneau.xml">XmlSerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -655,7 +656,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -663,7 +664,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 </dl>
 </li>
 </ul>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -674,15 +675,16 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
                                           <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>&nbsp;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>&nbsp;locale,
                                           <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>&nbsp;timeZone,
-                                          <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">Serializer</a></code></span></div>
+                                          <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                          <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">Serializer</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
    it's going to be a subclass of <a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><code>SerializerSession</code></a>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>output</code> - The output object.
    <br>Character-based serializers can handle the following output class types:
@@ -705,6 +707,8 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlSerializerContext.html b/content/site/apidocs/org/apache/juneau/xml/XmlSerializerContext.html
index df79cdd..da535df 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSerializerContext.html
@@ -263,7 +263,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 89869c4..39dfde5 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html
@@ -165,13 +165,14 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html#XmlSerializerSession-org.apache.juneau.xml.XmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">XmlSerializerSession</a></span>(<a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html" title="class in org.apache.juneau.xml">XmlSerializerContext</a>&nbsp;ctx,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html#XmlSerializerSession-org.apache.juneau.xml.XmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">XmlSerializerSession</a></span>(<a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html" title="class in org.apache.juneau.xml">XmlSerializerContext</a>&nbsp;ctx,
                     <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                     <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>&nbsp;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>&nbsp;locale,
                     <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>&nbsp;timeZone,
-                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                    <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create a new session using properties specified in the context.</div>
 </td>
 </tr>
@@ -256,7 +257,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#
 isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Co
 llection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getUriContext--">getUriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTr
 imEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCu
 rrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.BeanSession">
@@ -293,33 +294,36 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="XmlSerializerSession-org.apache.juneau.xml.XmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="XmlSerializerSession-org.apache.juneau.xml.XmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>XmlSerializerSession</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.64">XmlSerializerSession</a>(<a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html" title="class in org.apache.juneau.xml">XmlSerializerContext</a>&nbsp;ctx,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.66">XmlSerializerSession</a>(<a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html" title="class in org.apache.juneau.xml">XmlSerializerContext</a>&nbsp;ctx,
                             <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                             <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>&nbsp;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>&nbsp;locale,
                             <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>&nbsp;timeZone,
-                            <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
+                            <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                            <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>ctx</code> - The context creating this session object.
- The context contains all the configuration settings for this object.</dd>
+   The context contains all the configuration settings for this object.</dd>
 <dd><code>output</code> - The output object.  See <a href="../../../../org/apache/juneau/json/JsonSerializerSession.html#getWriter--"><code>JsonSerializerSession.getWriter()</code></a> for valid class types.</dd>
 <dd><code>op</code> - The override properties.
- These override any context properties defined in the context.</dd>
+   These override any context properties defined in the context.</dd>
 <dd><code>javaMethod</code> - The java method that called this serializer, usually the method in a REST servlet.</dd>
 <dd><code>locale</code> - The session locale.
- If <jk>null</jk>, then the locale defined on the context is used.</dd>
+   If <jk>null</jk>, then the locale defined on the context is used.</dd>
 <dd><code>timeZone</code> - The session timezone.
- If <jk>null</jk>, then the timezone defined on the context is used.</dd>
+   If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -337,7 +341,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>addNamespace</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.105">addNamespace</a>(<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;ns)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.107">addNamespace</a>(<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;ns)</pre>
 <div class="block">Add a namespace to this session.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -351,7 +355,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getNamespaces</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.124">getNamespaces</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.126">getNamespaces</a>()</pre>
 <div class="block">Returns the list of namespaces being used in the current XML serialization.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -365,7 +369,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isAutoDetectNamespaces</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.133">isAutoDetectNamespaces</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.135">isAutoDetectNamespaces</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html#XML_autoDetectNamespaces"><code>XmlSerializerContext.XML_autoDetectNamespaces</code></a> setting value in this context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -379,7 +383,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isEnableNamespaces</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.142">isEnableNamespaces</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.144">isEnableNamespaces</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html#XML_enableNamespaces"><code>XmlSerializerContext.XML_enableNamespaces</code></a> setting value in this context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -393,7 +397,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddNamespaceUrlsToRoot</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.151">isAddNamespaceUrlsToRoot</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.153">isAddNamespaceUrlsToRoot</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html#XML_addNamespaceUrisToRoot"><code>XmlSerializerContext.XML_addNamespaceUrisToRoot</code></a> setting value in this context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -407,7 +411,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddBeanTypeProperties</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.161">isAddBeanTypeProperties</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.163">isAddBeanTypeProperties</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html#XML_addBeanTypeProperties"><code>XmlSerializerContext.XML_addBeanTypeProperties</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -423,7 +427,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getDefaultNamespace</h4>
-<pre>public final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.170">getDefaultNamespace</a>()</pre>
+<pre>public final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.172">getDefaultNamespace</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html#XML_defaultNamespace"><code>XmlSerializerContext.XML_defaultNamespace</code></a> setting value in this context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -437,7 +441,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getXsNamespace</h4>
-<pre>public final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.179">getXsNamespace</a>()</pre>
+<pre>public final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.181">getXsNamespace</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html#XML_xsNamespace"><code>XmlSerializerContext.XML_xsNamespace</code></a> setting value in this context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -451,7 +455,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isHtmlMode</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.192">isHtmlMode</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.194">isHtmlMode</a>()</pre>
 <div class="block">Returns <jk>true</jk> if we're serializing HTML.
  <p>
  The difference in behavior is how empty non-void elements are handled.
@@ -469,7 +473,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getWriter</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.197">getWriter</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlSerializerSession.html#line.199">getWriter</a>()
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">SerializerSession</a></code></span></div>
 <div class="block">Wraps the specified output object inside a writer.


[05/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerSession.html
index e3d7a9e..7f5cdd3 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerSession.html
@@ -62,711 +62,724 @@
 <span class="sourceLineNo">054</span>      abridged;<a name="line.54"></a>
 <span class="sourceLineNo">055</span>   private final char quoteChar;<a name="line.55"></a>
 <span class="sourceLineNo">056</span>   private final String relativeUriBase, absolutePathUriBase;<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>   /** The current indentation depth into the model. */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   public int indent;<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>   private final Map&lt;Object,Object&gt; set;                                           // Contains the current objects in the current branch of the model.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   private final LinkedList&lt;StackElement&gt; stack = new LinkedList&lt;StackElement&gt;();  // Contains the current objects in the current branch of the model.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   private boolean isBottom;                                                       // If 'true', then we're at a leaf in the model (i.e. a String, Number, Boolean, or null).<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   private final Method javaMethod;                                                // Java method that invoked this serializer.<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   private final Object output;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   private OutputStream outputStream;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   private Writer writer, flushOnlyWriter;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   private BeanPropertyMeta currentProperty;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   private ClassMeta&lt;?&gt; currentClass;<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">057</span>   private final UriContext uriContext;<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>   /** The current indentation depth into the model. */<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   public int indent;<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>   private final Map&lt;Object,Object&gt; set;                                           // Contains the current objects in the current branch of the model.<a name="line.62"></a>
+<span class="sourceLineNo">063</span>   private final LinkedList&lt;StackElement&gt; stack = new LinkedList&lt;StackElement&gt;();  // Contains the current objects in the current branch of the model.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   private boolean isBottom;                                                       // If 'true', then we're at a leaf in the model (i.e. a String, Number, Boolean, or null).<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   private final Method javaMethod;                                                // Java method that invoked this serializer.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   private final Object output;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   private OutputStream outputStream;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   private Writer writer, flushOnlyWriter;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   private BeanPropertyMeta currentProperty;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   private ClassMeta&lt;?&gt; currentClass;<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>    * Create a new session using properties specified in the context.<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    *<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    * @param ctx The context creating this session object.<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    * The context contains all the configuration settings for this object.<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    * @param output The output object.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    * &lt;br&gt;Character-based serializers can handle the following output class types:<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    * &lt;ul&gt;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    *    &lt;li&gt;{@link Writer}<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    *    &lt;li&gt;{@link OutputStream} - Output will be written as UTF-8 encoded stream.<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    *    &lt;li&gt;{@link File} - Output will be written as system-default encoded stream.<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    * &lt;/ul&gt;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    * &lt;br&gt;Stream-based serializers can handle the following output class types:<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    * &lt;ul&gt;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    *    &lt;li&gt;{@link OutputStream}<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    *    &lt;li&gt;{@link File}<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    * &lt;/ul&gt;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    * @param op The override properties.<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    * These override any context properties defined in the context.<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    * @param locale The session locale.<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    * @param timeZone The session timezone.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    */<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   public SerializerSession(SerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      super(ctx, op, locale, timeZone, mediaType);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      this.javaMethod = javaMethod;<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      this.output = output;<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      if (op == null || op.isEmpty()) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>         maxDepth = ctx.maxDepth;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>         initialDepth = ctx.initialDepth;<a name="line.104"></a>
-<span class="sourceLineNo">105</span>         detectRecursions = ctx.detectRecursions;<a name="line.105"></a>
-<span class="sourceLineNo">106</span>         ignoreRecursions = ctx.ignoreRecursions;<a name="line.106"></a>
-<span class="sourceLineNo">107</span>         useWhitespace = ctx.useWhitespace;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.108"></a>
-<span class="sourceLineNo">109</span>         trimNulls = ctx.trimNulls;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>         trimEmptyCollections = ctx.trimEmptyCollections;<a name="line.110"></a>
-<span class="sourceLineNo">111</span>         trimEmptyMaps = ctx.trimEmptyMaps;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>         trimStrings = ctx.trimStrings;<a name="line.112"></a>
-<span class="sourceLineNo">113</span>         quoteChar = ctx.quoteChar;<a name="line.113"></a>
-<span class="sourceLineNo">114</span>         relativeUriBase = ctx.relativeUriBase;<a name="line.114"></a>
-<span class="sourceLineNo">115</span>         absolutePathUriBase = ctx.absolutePathUriBase;<a name="line.115"></a>
-<span class="sourceLineNo">116</span>         sortCollections = ctx.sortCollections;<a name="line.116"></a>
-<span class="sourceLineNo">117</span>         sortMaps = ctx.sortMaps;<a name="line.117"></a>
-<span class="sourceLineNo">118</span>         abridged = ctx.abridged;<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      } else {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>         maxDepth = op.getInt(SERIALIZER_maxDepth, ctx.maxDepth);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>         initialDepth = op.getInt(SERIALIZER_initialDepth, ctx.initialDepth);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>         detectRecursions = op.getBoolean(SERIALIZER_detectRecursions, ctx.detectRecursions);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>         ignoreRecursions = op.getBoolean(SERIALIZER_ignoreRecursions, ctx.ignoreRecursions);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>         useWhitespace = op.getBoolean(SERIALIZER_useWhitespace, ctx.useWhitespace);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>         addBeanTypeProperties = op.getBoolean(SERIALIZER_addBeanTypeProperties, ctx.addBeanTypeProperties);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>         trimNulls = op.getBoolean(SERIALIZER_trimNullProperties, ctx.trimNulls);<a name="line.126"></a>
-<span class="sourceLineNo">127</span>         trimEmptyCollections = op.getBoolean(SERIALIZER_trimEmptyCollections, ctx.trimEmptyCollections);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>         trimEmptyMaps = op.getBoolean(SERIALIZER_trimEmptyMaps, ctx.trimEmptyMaps);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>         trimStrings = op.getBoolean(SERIALIZER_trimStrings, ctx.trimStrings);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>         quoteChar = op.getString(SERIALIZER_quoteChar, ""+ctx.quoteChar).charAt(0);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>         relativeUriBase = op.getString(SERIALIZER_relativeUriBase, ctx.relativeUriBase);<a name="line.131"></a>
-<span class="sourceLineNo">132</span>         absolutePathUriBase = op.getString(SERIALIZER_absolutePathUriBase, ctx.absolutePathUriBase);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>         sortCollections = op.getBoolean(SERIALIZER_sortCollections, ctx.sortMaps);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>         sortMaps = op.getBoolean(SERIALIZER_sortMaps, ctx.sortMaps);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>         abridged = op.getBoolean(SERIALIZER_abridged, ctx.abridged);<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>      this.indent = initialDepth;<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      if (detectRecursions || isDebug()) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>         set = new IdentityHashMap&lt;Object,Object&gt;();<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      } else {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>         set = Collections.emptyMap();<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>   /**<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    * Wraps the specified output object inside an output stream.<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    * Subclasses can override this method to implement their own specialized output streams.<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    * &lt;p&gt;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    * This method can be used if the output object is any of the following class types:<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    * &lt;ul&gt;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    *    &lt;li&gt;{@link OutputStream}<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    *    &lt;li&gt;{@link File}<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    * &lt;/ul&gt;<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    *<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    * @return The output object wrapped in an output stream.<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    * @throws Exception If object could not be converted to an output stream.<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    */<a name="line.158"></a>
-<span class="sourceLineNo">159</span>   public OutputStream getOutputStream() throws Exception {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      if (output == null)<a name="line.160"></a>
-<span class="sourceLineNo">161</span>         throw new SerializeException("Output cannot be null.");<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      if (output instanceof OutputStream)<a name="line.162"></a>
-<span class="sourceLineNo">163</span>         return (OutputStream)output;<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      if (output instanceof File) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>         if (outputStream == null)<a name="line.165"></a>
-<span class="sourceLineNo">166</span>            outputStream = new BufferedOutputStream(new FileOutputStream((File)output));<a name="line.166"></a>
-<span class="sourceLineNo">167</span>         return outputStream;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      throw new SerializeException("Cannot convert object of type {0} to an OutputStream.", output.getClass().getName());<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><a name="line.172"></a>
-<span class="sourceLineNo">173</span>   /**<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    * Wraps the specified output object inside a writer.<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    * Subclasses can override this method to implement their own specialized writers.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    * &lt;p&gt;<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    * This method can be used if the output object is any of the following class types:<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    * &lt;ul&gt;<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    *    &lt;li&gt;{@link Writer}<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    *    &lt;li&gt;{@link OutputStream} - Output will be written as UTF-8 encoded stream.<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    *    &lt;li&gt;{@link File} - Output will be written as system-default encoded stream.<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    * &lt;/ul&gt;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    *<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    * @return The output object wrapped in a Writer.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    * @throws Exception If object could not be converted to a writer.<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    */<a name="line.186"></a>
-<span class="sourceLineNo">187</span>   public Writer getWriter() throws Exception {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      if (output == null)<a name="line.188"></a>
-<span class="sourceLineNo">189</span>         throw new SerializeException("Output cannot be null.");<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      if (output instanceof Writer)<a name="line.190"></a>
-<span class="sourceLineNo">191</span>         return (Writer)output;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      if (output instanceof OutputStream) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>         if (flushOnlyWriter == null)<a name="line.193"></a>
-<span class="sourceLineNo">194</span>            flushOnlyWriter = new OutputStreamWriter((OutputStream)output, IOUtils.UTF8);<a name="line.194"></a>
-<span class="sourceLineNo">195</span>         return flushOnlyWriter;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      if (output instanceof File) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>         if (writer == null)<a name="line.198"></a>
-<span class="sourceLineNo">199</span>            writer = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream((File)output)));<a name="line.199"></a>
-<span class="sourceLineNo">200</span>         return writer;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      }<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      throw new SerializeException("Cannot convert object of type {0} to a Writer.", output.getClass().getName());<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>   /**<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    * Returns the raw output object passed into this session.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    *<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    * @return The raw output object passed into this session.<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   protected Object getOutput() {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      return output;<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>   /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    * Sets the current bean property being serialized for proper error messages.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    * @param currentProperty The current property being serialized.<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    */<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   public void setCurrentProperty(BeanPropertyMeta currentProperty) {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      this.currentProperty = currentProperty;<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>   /**<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    * Sets the current class being serialized for proper error messages.<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    * @param currentClass The current class being serialized.<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    */<a name="line.225"></a>
-<span class="sourceLineNo">226</span>   public void setCurrentClass(ClassMeta&lt;?&gt; currentClass) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      this.currentClass = currentClass;<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>   /**<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    * Returns the Java method that invoked this serializer.<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    * &lt;p&gt;<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    * When using the REST API, this is the Java method invoked by the REST call.<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    * Can be used to access annotations defined on the method or class.<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    *<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    * @return The Java method that invoked this serializer.<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   */<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   public final Method getJavaMethod() {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return javaMethod;<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>   /**<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    * Returns the {@link SerializerContext#SERIALIZER_maxDepth} setting value for this session.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    *<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    * @return The {@link SerializerContext#SERIALIZER_maxDepth} setting value for this session.<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    */<a name="line.246"></a>
-<span class="sourceLineNo">247</span>   public final int getMaxDepth() {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      return maxDepth;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   }<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>    * Returns the {@link SerializerContext#SERIALIZER_initialDepth} setting value for this session.<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    *<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    * @return The {@link SerializerContext#SERIALIZER_initialDepth} setting value for this session.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>   public final int getInitialDepth() {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      return initialDepth;<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>    * Returns the {@link SerializerContext#SERIALIZER_detectRecursions} setting value for this session.<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    *<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    * @return The {@link SerializerContext#SERIALIZER_detectRecursions} setting value for this session.<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    */<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   public final boolean isDetectRecursions() {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      return detectRecursions;<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>    * Returns the {@link SerializerContext#SERIALIZER_ignoreRecursions} setting value for this session.<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    *<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    * @return The {@link SerializerContext#SERIALIZER_ignoreRecursions} setting value for this session.<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    */<a name="line.273"></a>
-<span class="sourceLineNo">274</span>   public final boolean isIgnoreRecursions() {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      return ignoreRecursions;<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>   /**<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    * Returns the {@link SerializerContext#SERIALIZER_useWhitespace} setting value for this session.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    *<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    * @return The {@link SerializerContext#SERIALIZER_useWhitespace} setting value for this session.<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    */<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   public final boolean isUseWhitespace() {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      return useWhitespace;<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>    * Returns the {@link SerializerContext#SERIALIZER_addBeanTypeProperties} setting value for this session.<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    *<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    * @return The {@link SerializerContext#SERIALIZER_addBeanTypeProperties} setting value for this session.<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    */<a name="line.291"></a>
-<span class="sourceLineNo">292</span>   public boolean isAddBeanTypeProperties() {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      return addBeanTypeProperties;<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>    * Returns the {@link SerializerContext#SERIALIZER_quoteChar} setting value for this session.<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    *<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    * @return The {@link SerializerContext#SERIALIZER_quoteChar} setting value for this session.<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    */<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   public final char getQuoteChar() {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      return quoteChar;<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>    * Returns the {@link SerializerContext#SERIALIZER_trimNullProperties} setting value for this session.<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    *<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    * @return The {@link SerializerContext#SERIALIZER_trimNullProperties} setting value for this session.<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    */<a name="line.309"></a>
-<span class="sourceLineNo">310</span>   public final boolean isTrimNulls() {<a name="line.310"></a>
-<span class="sourceLineNo">311</span>      return trimNulls;<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 the {@link SerializerContext#SERIALIZER_trimEmptyCollections} setting value for this session.<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    *<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    * @return The {@link SerializerContext#SERIALIZER_trimEmptyCollections} setting value for this session.<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    */<a name="line.318"></a>
-<span class="sourceLineNo">319</span>   public final boolean isTrimEmptyCollections() {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      return trimEmptyCollections;<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 {@link SerializerContext#SERIALIZER_trimEmptyMaps} setting value for this session.<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    *<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    * @return The {@link SerializerContext#SERIALIZER_trimEmptyMaps} setting value for this session.<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    */<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   public final boolean isTrimEmptyMaps() {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      return trimEmptyMaps;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   }<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>    * Returns the {@link SerializerContext#SERIALIZER_trimStrings} setting value for this session.<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    *<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    * @return The {@link SerializerContext#SERIALIZER_trimStrings} setting value for this session.<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    */<a name="line.336"></a>
-<span class="sourceLineNo">337</span>   public final boolean isTrimStrings() {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      return trimStrings;<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>   /**<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    * Returns the {@link SerializerContext#SERIALIZER_sortCollections} setting value for this session.<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    *<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    * @return The {@link SerializerContext#SERIALIZER_sortCollections} setting value for this session.<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    */<a name="line.345"></a>
-<span class="sourceLineNo">346</span>   public final boolean isSortCollections() {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      return sortCollections;<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>   /**<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    * Returns the {@link SerializerContext#SERIALIZER_sortMaps} setting value for this session.<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    *<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    * @return The {@link SerializerContext#SERIALIZER_sortMaps} setting value for this session.<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    */<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   public final boolean isSortMaps() {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      return sortMaps;<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   }<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>    * Returns the {@link SerializerContext#SERIALIZER_relativeUriBase} setting value for this session.<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    *<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    * @return The {@link SerializerContext#SERIALIZER_relativeUriBase} setting value for this session.<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    */<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   public final String getRelativeUriBase() {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>      return relativeUriBase;<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>    * Returns the {@link SerializerContext#SERIALIZER_absolutePathUriBase} setting value for this session.<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    *<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    * @return The {@link SerializerContext#SERIALIZER_absolutePathUriBase} setting value for this session.<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    */<a name="line.372"></a>
-<span class="sourceLineNo">373</span>   public final String getAbsolutePathUriBase() {<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      return absolutePathUriBase;<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>    * Push the specified object onto the stack.<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    *<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    * @param attrName The attribute name.<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    * @param o The current object being serialized.<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    * @param eType The expected class type.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    * @return The {@link ClassMeta} of the object so that &lt;code&gt;instanceof&lt;/code&gt; operations<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    *    only need to be performed once (since they can be expensive).&lt;br&gt;<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    * @throws SerializeException If recursion occurred.<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    */<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   public ClassMeta&lt;?&gt; push(String attrName, Object o, ClassMeta&lt;?&gt; eType) throws SerializeException {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>      indent++;<a name="line.388"></a>
-<span class="sourceLineNo">389</span>      isBottom = true;<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      if (o == null)<a name="line.390"></a>
-<span class="sourceLineNo">391</span>         return null;<a name="line.391"></a>
-<span class="sourceLineNo">392</span>      Class&lt;?&gt; c = o.getClass();<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      ClassMeta&lt;?&gt; cm = (eType != null &amp;&amp; c == eType.getInnerClass()) ? eType : getClassMeta(c);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      if (cm.isCharSequence() || cm.isNumber() || cm.isBoolean())<a name="line.394"></a>
-<span class="sourceLineNo">395</span>         return cm;<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      if (detectRecursions || isDebug()) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>         if (stack.size() &gt; maxDepth)<a name="line.397"></a>
-<span class="sourceLineNo">398</span>            return null;<a name="line.398"></a>
-<span class="sourceLineNo">399</span>         if (willRecurse(attrName, o, cm))<a name="line.399"></a>
-<span class="sourceLineNo">400</span>            return null;<a name="line.400"></a>
-<span class="sourceLineNo">401</span>         isBottom = false;<a name="line.401"></a>
-<span class="sourceLineNo">402</span>         stack.add(new StackElement(stack.size(), attrName, o, cm));<a name="line.402"></a>
-<span class="sourceLineNo">403</span>         if (isDebug())<a name="line.403"></a>
-<span class="sourceLineNo">404</span>            getLogger().info(getStack(false));<a name="line.404"></a>
-<span class="sourceLineNo">405</span>         set.put(o, o);<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      }<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      return cm;<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if {@link SerializerContext#SERIALIZER_detectRecursions} is enabled, and the specified<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    *    object is already higher up in the serialization chain.<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    *<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    * @param attrName The bean property attribute name, or some other identifier.<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    * @param o The object to check for recursion.<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    * @param cm The metadata on the object class.<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if recursion detected.<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    * @throws SerializeException If recursion occurred.<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    */<a name="line.419"></a>
-<span class="sourceLineNo">420</span>   public boolean willRecurse(String attrName, Object o, ClassMeta&lt;?&gt; cm) throws SerializeException {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      if (! (detectRecursions || isDebug()))<a name="line.421"></a>
-<span class="sourceLineNo">422</span>         return false;<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      if (! set.containsKey(o))<a name="line.423"></a>
-<span class="sourceLineNo">424</span>         return false;<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      if (ignoreRecursions &amp;&amp; ! isDebug())<a name="line.425"></a>
-<span class="sourceLineNo">426</span>         return true;<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span>      stack.add(new StackElement(stack.size(), attrName, o, cm));<a name="line.428"></a>
-<span class="sourceLineNo">429</span>      throw new SerializeException("Recursion occurred, stack={0}", getStack(true));<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>   /**<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    * Pop an object off the stack.<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    */<a name="line.434"></a>
-<span class="sourceLineNo">435</span>   public void pop() {<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      indent--;<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      if ((detectRecursions || isDebug()) &amp;&amp; ! isBottom)  {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>         Object o = stack.removeLast().o;<a name="line.438"></a>
-<span class="sourceLineNo">439</span>         Object o2 = set.remove(o);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>         if (o2 == null)<a name="line.440"></a>
-<span class="sourceLineNo">441</span>            addWarning("Couldn't remove object of type ''{0}'' on attribute ''{1}'' from object stack.", o.getClass().getName(), stack);<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      }<a name="line.442"></a>
-<span class="sourceLineNo">443</span>      isBottom = false;<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>    * The current indentation depth.<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    *<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    * @return The current indentation depth.<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    */<a name="line.450"></a>
-<span class="sourceLineNo">451</span>   public int getIndent() {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      return indent;<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>   /**<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    * Specialized warning when an exception is thrown while executing a bean getter.<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    *<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    * @param p The bean map entry representing the bean property.<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    * @param t The throwable that the bean getter threw.<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    */<a name="line.460"></a>
-<span class="sourceLineNo">461</span>   public void addBeanGetterWarning(BeanPropertyMeta p, Throwable t) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      String prefix = (isDebug() ? getStack(false) + ": " : "");<a name="line.462"></a>
-<span class="sourceLineNo">463</span>      addWarning("{0}Could not call getValue() on property ''{1}'' of class ''{2}'', exception = {3}", prefix, p.getName(), p.getBeanMeta().getClassMeta(), t.getLocalizedMessage());<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>    * Trims the specified string if {@link SerializerSession#isTrimStrings()} returns &lt;jk&gt;true&lt;/jk&gt;.<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    *<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    * @param o The input string to trim.<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    * @return The trimmed string, or &lt;jk&gt;null&lt;/jk&gt; if the input was &lt;jk&gt;null&lt;/jk&gt;.<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    */<a name="line.471"></a>
-<span class="sourceLineNo">472</span>   public final String trim(Object o) {<a name="line.472"></a>
-<span class="sourceLineNo">473</span>      if (o == null)<a name="line.473"></a>
-<span class="sourceLineNo">474</span>         return null;<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      String s = o.toString();<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      if (trimStrings)<a name="line.476"></a>
-<span class="sourceLineNo">477</span>         s = s.trim();<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      return s;<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>    * Generalize the specified object if a POJO swap is associated with it.<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    *<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    * @param o The object to generalize.<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    * @param type The type of object.<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    * @return The generalized object, or &lt;jk&gt;null&lt;/jk&gt; if the object is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    * @throws SerializeException If a problem occurred trying to convert the output.<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.489"></a>
-<span class="sourceLineNo">490</span>   public final Object generalize(Object o, ClassMeta&lt;?&gt; type) throws SerializeException {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      if (o == null)<a name="line.491"></a>
-<span class="sourceLineNo">492</span>         return null;<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      PojoSwap f = (type == null || type.isObject() ? getClassMeta(o.getClass()).getPojoSwap() : type.getPojoSwap());<a name="line.493"></a>
-<span class="sourceLineNo">494</span>      if (f == null)<a name="line.494"></a>
-<span class="sourceLineNo">495</span>         return o;<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      return f.swap(this, 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>   /**<a name="line.499"></a>
-<span class="sourceLineNo">500</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified value should not be serialized.<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    *<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    * @param cm The class type of the object being serialized.<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    * @param attrName The bean attribute name, or &lt;jk&gt;null&lt;/jk&gt; if this isn't a bean attribute.<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    * @param value The object being serialized.<a name="line.504"></a>
-<span class="sourceLineNo">505</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified value should not be serialized.<a name="line.505"></a>
-<span class="sourceLineNo">506</span>    * @throws SerializeException If recursion occurred.<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    */<a name="line.507"></a>
-<span class="sourceLineNo">508</span>   public final boolean canIgnoreValue(ClassMeta&lt;?&gt; cm, String attrName, Object value) throws SerializeException {<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span>      if (trimNulls &amp;&amp; value == null)<a name="line.510"></a>
-<span class="sourceLineNo">511</span>         return true;<a name="line.511"></a>
-<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span>      if (value == null)<a name="line.513"></a>
-<span class="sourceLineNo">514</span>         return false;<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span>      if (cm == null)<a name="line.516"></a>
-<span class="sourceLineNo">517</span>         cm = object();<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span>      if (trimEmptyCollections) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>         if (cm.isArray() || (cm.isObject() &amp;&amp; value.getClass().isArray())) {<a name="line.520"></a>
-<span class="sourceLineNo">521</span>            if (((Object[])value).length == 0)<a name="line.521"></a>
-<span class="sourceLineNo">522</span>               return true;<a name="line.522"></a>
-<span class="sourceLineNo">523</span>         }<a name="line.523"></a>
-<span class="sourceLineNo">524</span>         if (cm.isCollection() || (cm.isObject() &amp;&amp; isParentClass(Collection.class, value.getClass()))) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span>            if (((Collection&lt;?&gt;)value).isEmpty())<a name="line.525"></a>
-<span class="sourceLineNo">526</span>               return true;<a name="line.526"></a>
-<span class="sourceLineNo">527</span>         }<a name="line.527"></a>
-<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>      if (trimEmptyMaps) {<a name="line.530"></a>
-<span class="sourceLineNo">531</span>         if (cm.isMap() || (cm.isObject() &amp;&amp; isParentClass(Map.class, value.getClass()))) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>            if (((Map&lt;?,?&gt;)value).isEmpty())<a name="line.532"></a>
-<span class="sourceLineNo">533</span>               return true;<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>      if (trimNulls &amp;&amp; willRecurse(attrName, value, cm))<a name="line.537"></a>
-<span class="sourceLineNo">538</span>         return true;<a name="line.538"></a>
-<span class="sourceLineNo">539</span><a name="line.539"></a>
-<span class="sourceLineNo">540</span>      return false;<a name="line.540"></a>
-<span class="sourceLineNo">541</span>   }<a name="line.541"></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>    * Create a new session using properties specified in the context.<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    *<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    * @param ctx The context creating this session object.<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    *    The context contains all the configuration settings for this object.<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    * @param output The output object.<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    *    &lt;br&gt;Character-based serializers can handle the following output class types:<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    *    &lt;ul&gt;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    *       &lt;li&gt;{@link Writer}<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    *       &lt;li&gt;{@link OutputStream} - Output will be written as UTF-8 encoded stream.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    *       &lt;li&gt;{@link File} - Output will be written as system-default encoded stream.<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    *    &lt;/ul&gt;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    *    &lt;br&gt;Stream-based serializers can handle the following output class types:<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    *    &lt;ul&gt;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    *       &lt;li&gt;{@link OutputStream}<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    *       &lt;li&gt;{@link File}<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    *    &lt;/ul&gt;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    * @param op The override properties.<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    *    These override any context properties defined in the context.<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    * @param locale The session locale.<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    * @param timeZone The session timezone.<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    * @param uriContext The URI context.<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    */<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   public SerializerSession(SerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      super(ctx, op, locale, timeZone, mediaType);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      this.javaMethod = javaMethod;<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      this.output = output;<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      this.uriContext = uriContext != null ? uriContext : new UriContext(null, null, null, null);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      if (op == null || op.isEmpty()) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>         maxDepth = ctx.maxDepth;<a name="line.107"></a>
+<span class="sourceLineNo">108</span>         initialDepth = ctx.initialDepth;<a name="line.108"></a>
+<span class="sourceLineNo">109</span>         detectRecursions = ctx.detectRecursions;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>         ignoreRecursions = ctx.ignoreRecursions;<a name="line.110"></a>
+<span class="sourceLineNo">111</span>         useWhitespace = ctx.useWhitespace;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.112"></a>
+<span class="sourceLineNo">113</span>         trimNulls = ctx.trimNulls;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>         trimEmptyCollections = ctx.trimEmptyCollections;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>         trimEmptyMaps = ctx.trimEmptyMaps;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>         trimStrings = ctx.trimStrings;<a name="line.116"></a>
+<span class="sourceLineNo">117</span>         quoteChar = ctx.quoteChar;<a name="line.117"></a>
+<span class="sourceLineNo">118</span>         relativeUriBase = ctx.relativeUriBase;<a name="line.118"></a>
+<span class="sourceLineNo">119</span>         absolutePathUriBase = ctx.absolutePathUriBase;<a name="line.119"></a>
+<span class="sourceLineNo">120</span>         sortCollections = ctx.sortCollections;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>         sortMaps = ctx.sortMaps;<a name="line.121"></a>
+<span class="sourceLineNo">122</span>         abridged = ctx.abridged;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      } else {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>         maxDepth = op.getInt(SERIALIZER_maxDepth, ctx.maxDepth);<a name="line.124"></a>
+<span class="sourceLineNo">125</span>         initialDepth = op.getInt(SERIALIZER_initialDepth, ctx.initialDepth);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>         detectRecursions = op.getBoolean(SERIALIZER_detectRecursions, ctx.detectRecursions);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>         ignoreRecursions = op.getBoolean(SERIALIZER_ignoreRecursions, ctx.ignoreRecursions);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>         useWhitespace = op.getBoolean(SERIALIZER_useWhitespace, ctx.useWhitespace);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>         addBeanTypeProperties = op.getBoolean(SERIALIZER_addBeanTypeProperties, ctx.addBeanTypeProperties);<a name="line.129"></a>
+<span class="sourceLineNo">130</span>         trimNulls = op.getBoolean(SERIALIZER_trimNullProperties, ctx.trimNulls);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>         trimEmptyCollections = op.getBoolean(SERIALIZER_trimEmptyCollections, ctx.trimEmptyCollections);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>         trimEmptyMaps = op.getBoolean(SERIALIZER_trimEmptyMaps, ctx.trimEmptyMaps);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>         trimStrings = op.getBoolean(SERIALIZER_trimStrings, ctx.trimStrings);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>         quoteChar = op.getString(SERIALIZER_quoteChar, ""+ctx.quoteChar).charAt(0);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>         relativeUriBase = op.getString(SERIALIZER_relativeUriBase, ctx.relativeUriBase);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>         absolutePathUriBase = op.getString(SERIALIZER_absolutePathUriBase, ctx.absolutePathUriBase);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>         sortCollections = op.getBoolean(SERIALIZER_sortCollections, ctx.sortMaps);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>         sortMaps = op.getBoolean(SERIALIZER_sortMaps, ctx.sortMaps);<a name="line.138"></a>
+<span class="sourceLineNo">139</span>         abridged = op.getBoolean(SERIALIZER_abridged, ctx.abridged);<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>      this.indent = initialDepth;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      if (detectRecursions || isDebug()) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>         set = new IdentityHashMap&lt;Object,Object&gt;();<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      } else {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>         set = Collections.emptyMap();<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>   /**<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    * Wraps the specified output object inside an output stream.<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    * Subclasses can override this method to implement their own specialized output streams.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    * &lt;p&gt;<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    * This method can be used if the output object is any of the following class types:<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    * &lt;ul&gt;<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    *    &lt;li&gt;{@link OutputStream}<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    *    &lt;li&gt;{@link File}<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    * &lt;/ul&gt;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    *<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    * @return The output object wrapped in an output stream.<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    * @throws Exception If object could not be converted to an output stream.<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    */<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   public OutputStream getOutputStream() throws Exception {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      if (output == null)<a name="line.164"></a>
+<span class="sourceLineNo">165</span>         throw new SerializeException("Output cannot be null.");<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      if (output instanceof OutputStream)<a name="line.166"></a>
+<span class="sourceLineNo">167</span>         return (OutputStream)output;<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      if (output instanceof File) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>         if (outputStream == null)<a name="line.169"></a>
+<span class="sourceLineNo">170</span>            outputStream = new BufferedOutputStream(new FileOutputStream((File)output));<a name="line.170"></a>
+<span class="sourceLineNo">171</span>         return outputStream;<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      }<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      throw new SerializeException("Cannot convert object of type {0} to an OutputStream.", output.getClass().getName());<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>   /**<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    * Wraps the specified output object inside a writer.<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    * Subclasses can override this method to implement their own specialized writers.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    * &lt;p&gt;<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    * This method can be used if the output object is any of the following class types:<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    * &lt;ul&gt;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    *    &lt;li&gt;{@link Writer}<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    *    &lt;li&gt;{@link OutputStream} - Output will be written as UTF-8 encoded stream.<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    *    &lt;li&gt;{@link File} - Output will be written as system-default encoded stream.<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    * &lt;/ul&gt;<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    *<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    * @return The output object wrapped in a Writer.<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    * @throws Exception If object could not be converted to a writer.<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    */<a name="line.190"></a>
+<span class="sourceLineNo">191</span>   public Writer getWriter() throws Exception {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      if (output == null)<a name="line.192"></a>
+<span class="sourceLineNo">193</span>         throw new SerializeException("Output cannot be null.");<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      if (output instanceof Writer)<a name="line.194"></a>
+<span class="sourceLineNo">195</span>         return (Writer)output;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      if (output instanceof OutputStream) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>         if (flushOnlyWriter == null)<a name="line.197"></a>
+<span class="sourceLineNo">198</span>            flushOnlyWriter = new OutputStreamWriter((OutputStream)output, IOUtils.UTF8);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>         return flushOnlyWriter;<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      if (output instanceof File) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>         if (writer == null)<a name="line.202"></a>
+<span class="sourceLineNo">203</span>            writer = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream((File)output)));<a name="line.203"></a>
+<span class="sourceLineNo">204</span>         return writer;<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      }<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      throw new SerializeException("Cannot convert object of type {0} to a Writer.", output.getClass().getName());<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>   /**<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    * Returns the raw output object passed into this session.<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    *<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    * @return The raw output object passed into this session.<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    */<a name="line.213"></a>
+<span class="sourceLineNo">214</span>   protected Object getOutput() {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      return output;<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>    * Sets the current bean property being serialized for proper error messages.<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    * @param currentProperty The current property being serialized.<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    */<a name="line.221"></a>
+<span class="sourceLineNo">222</span>   public void setCurrentProperty(BeanPropertyMeta currentProperty) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      this.currentProperty = currentProperty;<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>   /**<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    * Sets the current class being serialized for proper error messages.<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    * @param currentClass The current class being serialized.<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    */<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   public void setCurrentClass(ClassMeta&lt;?&gt; currentClass) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      this.currentClass = currentClass;<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>    * Returns the Java method that invoked this serializer.<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    * &lt;p&gt;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    * When using the REST API, this is the Java method invoked by the REST call.<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    * Can be used to access annotations defined on the method or class.<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    *<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    * @return The Java method that invoked this serializer.<a name="line.240"></a>
+<span class="sourceLineNo">241</span>   */<a name="line.241"></a>
+<span class="sourceLineNo">242</span>   public final Method getJavaMethod() {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      return javaMethod;<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>    * Returns the URI context passed in to this constructor.<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    *<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    * @return The URI context passed in to this constructor.<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    */<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   public final UriContext getUriContext() {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      return uriContext;<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>   /**<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    * Returns the {@link SerializerContext#SERIALIZER_maxDepth} setting value for this session.<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    *<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    * @return The {@link SerializerContext#SERIALIZER_maxDepth} setting value for this session.<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    */<a name="line.259"></a>
+<span class="sourceLineNo">260</span>   public final int getMaxDepth() {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      return maxDepth;<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>    * Returns the {@link SerializerContext#SERIALIZER_initialDepth} setting value for this session.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    *<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    * @return The {@link SerializerContext#SERIALIZER_initialDepth} setting value for this session.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    */<a name="line.268"></a>
+<span class="sourceLineNo">269</span>   public final int getInitialDepth() {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      return initialDepth;<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>    * Returns the {@link SerializerContext#SERIALIZER_detectRecursions} setting value for this session.<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    *<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    * @return The {@link SerializerContext#SERIALIZER_detectRecursions} setting value for this session.<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    */<a name="line.277"></a>
+<span class="sourceLineNo">278</span>   public final boolean isDetectRecursions() {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      return detectRecursions;<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>    * Returns the {@link SerializerContext#SERIALIZER_ignoreRecursions} setting value for this session.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    *<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    * @return The {@link SerializerContext#SERIALIZER_ignoreRecursions} setting value for this session.<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    */<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   public final boolean isIgnoreRecursions() {<a name="line.287"></a>
+<span class="sourceLineNo">288</span>      return ignoreRecursions;<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>   /**<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    * Returns the {@link SerializerContext#SERIALIZER_useWhitespace} setting value for this session.<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    *<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    * @return The {@link SerializerContext#SERIALIZER_useWhitespace} setting value for this session.<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    */<a name="line.295"></a>
+<span class="sourceLineNo">296</span>   public final boolean isUseWhitespace() {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      return useWhitespace;<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>    * Returns the {@link SerializerContext#SERIALIZER_addBeanTypeProperties} setting value for this session.<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    *<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    * @return The {@link SerializerContext#SERIALIZER_addBeanTypeProperties} setting value for this session.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>   public boolean isAddBeanTypeProperties() {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      return addBeanTypeProperties;<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>    * Returns the {@link SerializerContext#SERIALIZER_quoteChar} setting value for this session.<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    *<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    * @return The {@link SerializerContext#SERIALIZER_quoteChar} setting value for this session.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    */<a name="line.313"></a>
+<span class="sourceLineNo">314</span>   public final char getQuoteChar() {<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      return quoteChar;<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>    * Returns the {@link SerializerContext#SERIALIZER_trimNullProperties} setting value for this session.<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    *<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    * @return The {@link SerializerContext#SERIALIZER_trimNullProperties} setting value for this session.<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    */<a name="line.322"></a>
+<span class="sourceLineNo">323</span>   public final boolean isTrimNulls() {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      return trimNulls;<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>   /**<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    * Returns the {@link SerializerContext#SERIALIZER_trimEmptyCollections} setting value for this session.<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    *<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    * @return The {@link SerializerContext#SERIALIZER_trimEmptyCollections} setting value for this session.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    */<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   public final boolean isTrimEmptyCollections() {<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      return trimEmptyCollections;<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>    * Returns the {@link SerializerContext#SERIALIZER_trimEmptyMaps} setting value for this session.<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    *<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    * @return The {@link SerializerContext#SERIALIZER_trimEmptyMaps} setting value for this session.<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    */<a name="line.340"></a>
+<span class="sourceLineNo">341</span>   public final boolean isTrimEmptyMaps() {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      return trimEmptyMaps;<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>    * Returns the {@link SerializerContext#SERIALIZER_trimStrings} setting value for this session.<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    *<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    * @return The {@link SerializerContext#SERIALIZER_trimStrings} setting value for this session.<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    */<a name="line.349"></a>
+<span class="sourceLineNo">350</span>   public final boolean isTrimStrings() {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      return trimStrings;<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>   /**<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    * Returns the {@link SerializerContext#SERIALIZER_sortCollections} setting value for this session.<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    *<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    * @return The {@link SerializerContext#SERIALIZER_sortCollections} setting value for this session.<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    */<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   public final boolean isSortCollections() {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>      return sortCollections;<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>    * Returns the {@link SerializerContext#SERIALIZER_sortMaps} setting value for this session.<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    *<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    * @return The {@link SerializerContext#SERIALIZER_sortMaps} setting value for this session.<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    */<a name="line.367"></a>
+<span class="sourceLineNo">368</span>   public final boolean isSortMaps() {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      return sortMaps;<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>    * Returns the {@link SerializerContext#SERIALIZER_relativeUriBase} setting value for this session.<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    *<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    * @return The {@link SerializerContext#SERIALIZER_relativeUriBase} setting value for this session.<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    */<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   public final String getRelativeUriBase() {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      return relativeUriBase;<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>    * Returns the {@link SerializerContext#SERIALIZER_absolutePathUriBase} setting value for this session.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    *<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    * @return The {@link SerializerContext#SERIALIZER_absolutePathUriBase} setting value for this session.<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    */<a name="line.385"></a>
+<span class="sourceLineNo">386</span>   public final String getAbsolutePathUriBase() {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      return absolutePathUriBase;<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>   /**<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    * Push the specified object onto the stack.<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    *<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    * @param attrName The attribute name.<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    * @param o The current object being serialized.<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    * @param eType The expected class type.<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    * @return The {@link ClassMeta} of the object so that &lt;code&gt;instanceof&lt;/code&gt; operations<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    *    only need to be performed once (since they can be expensive).&lt;br&gt;<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    * @throws SerializeException If recursion occurred.<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    */<a name="line.399"></a>
+<span class="sourceLineNo">400</span>   public ClassMeta&lt;?&gt; push(String attrName, Object o, ClassMeta&lt;?&gt; eType) throws SerializeException {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      indent++;<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      isBottom = true;<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      if (o == null)<a name="line.403"></a>
+<span class="sourceLineNo">404</span>         return null;<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      Class&lt;?&gt; c = o.getClass();<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      ClassMeta&lt;?&gt; cm = (eType != null &amp;&amp; c == eType.getInnerClass()) ? eType : getClassMeta(c);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if (cm.isCharSequence() || cm.isNumber() || cm.isBoolean())<a name="line.407"></a>
+<span class="sourceLineNo">408</span>         return cm;<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      if (detectRecursions || isDebug()) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>         if (stack.size() &gt; maxDepth)<a name="line.410"></a>
+<span class="sourceLineNo">411</span>            return null;<a name="line.411"></a>
+<span class="sourceLineNo">412</span>         if (willRecurse(attrName, o, cm))<a name="line.412"></a>
+<span class="sourceLineNo">413</span>            return null;<a name="line.413"></a>
+<span class="sourceLineNo">414</span>         isBottom = false;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>         stack.add(new StackElement(stack.size(), attrName, o, cm));<a name="line.415"></a>
+<span class="sourceLineNo">416</span>         if (isDebug())<a name="line.416"></a>
+<span class="sourceLineNo">417</span>            getLogger().info(getStack(false));<a name="line.417"></a>
+<span class="sourceLineNo">418</span>         set.put(o, o);<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>      return cm;<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if {@link SerializerContext#SERIALIZER_detectRecursions} is enabled, and the specified<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    *    object is already higher up in the serialization chain.<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    *<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    * @param attrName The bean property attribute name, or some other identifier.<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    * @param o The object to check for recursion.<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    * @param cm The metadata on the object class.<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if recursion detected.<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    * @throws SerializeException If recursion occurred.<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    */<a name="line.432"></a>
+<span class="sourceLineNo">433</span>   public boolean willRecurse(String attrName, Object o, ClassMeta&lt;?&gt; cm) throws SerializeException {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      if (! (detectRecursions || isDebug()))<a name="line.434"></a>
+<span class="sourceLineNo">435</span>         return false;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      if (! set.containsKey(o))<a name="line.436"></a>
+<span class="sourceLineNo">437</span>         return false;<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      if (ignoreRecursions &amp;&amp; ! isDebug())<a name="line.438"></a>
+<span class="sourceLineNo">439</span>         return true;<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>      stack.add(new StackElement(stack.size(), attrName, o, cm));<a name="line.441"></a>
+<span class="sourceLineNo">442</span>      throw new SerializeException("Recursion occurred, stack={0}", getStack(true));<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>    * Pop an object off the stack.<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    */<a name="line.447"></a>
+<span class="sourceLineNo">448</span>   public void pop() {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      indent--;<a name="line.449"></a>
+<span c

<TRUNCATED>


[16/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 519255b..8d17234 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
@@ -408,305 +408,331 @@
 <span class="sourceLineNo">400</span>      out.eTag(i, "table").nl();<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 void serializeBeanMap(HtmlSerializerSession session, HtmlWriter out, BeanMap&lt;?&gt; m, ClassMeta&lt;?&gt; eType, BeanPropertyMeta ppMeta) throws Exception {<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      int i = session.getIndent();<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span>      out.oTag(i, "table");<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span>      String typeName = m.getMeta().getDictionaryName();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      if (typeName != null &amp;&amp; eType != m.getClassMeta())<a name="line.409"></a>
-<span class="sourceLineNo">410</span>         out.attr(session.getBeanTypePropertyName(m.getClassMeta()), typeName);<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>      out.append('&gt;').nl();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      if (session.isAddKeyValueTableHeaders() &amp;&amp; ! (m.getClassMeta().getExtendedMeta(HtmlClassMeta.class).isNoTableHeaders() || (ppMeta != null &amp;&amp; ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isNoTableHeaders()))) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>         out.sTag(i+1, "tr").nl();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>         out.sTag(i+2, "th").append("key").eTag("th").nl();<a name="line.415"></a>
-<span class="sourceLineNo">416</span>         out.sTag(i+2, "th").append("value").eTag("th").nl();<a name="line.416"></a>
-<span class="sourceLineNo">417</span>         out.eTag(i+1, "tr").nl();<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>      for (BeanPropertyValue p : m.getValues(session.isTrimNulls())) {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>         BeanPropertyMeta pMeta = p.getMeta();<a name="line.421"></a>
-<span class="sourceLineNo">422</span>         ClassMeta&lt;?&gt; cMeta = p.getClassMeta();<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span>         String key = p.getName();<a name="line.424"></a>
-<span class="sourceLineNo">425</span>         Object value = p.getValue();<a name="line.425"></a>
-<span class="sourceLineNo">426</span>         Throwable t = p.getThrown();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>         if (t != null)<a name="line.427"></a>
-<span class="sourceLineNo">428</span>            session.addBeanGetterWarning(pMeta, t);<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span>         if (session.canIgnoreValue(cMeta, key, value))<a name="line.430"></a>
-<span class="sourceLineNo">431</span>            continue;<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>         out.sTag(i+1, "tr").nl();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>         out.sTag(i+2, "td").text(key).eTag("td").nl();<a name="line.434"></a>
-<span class="sourceLineNo">435</span>         out.sTag(i+2, "td");<a name="line.435"></a>
-<span class="sourceLineNo">436</span>         try {<a name="line.436"></a>
-<span class="sourceLineNo">437</span>            ContentResult cr = serializeAnything(session, out, value, cMeta, key, 2, pMeta, false);<a name="line.437"></a>
-<span class="sourceLineNo">438</span>            if (cr == CR_NORMAL)<a name="line.438"></a>
-<span class="sourceLineNo">439</span>               out.i(i+2);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>         } catch (SerializeException e) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>            throw e;<a name="line.441"></a>
-<span class="sourceLineNo">442</span>         } catch (Error e) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>            throw e;<a name="line.443"></a>
-<span class="sourceLineNo">444</span>         } catch (Throwable e) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span>            e.printStackTrace();<a name="line.445"></a>
-<span class="sourceLineNo">446</span>            session.addBeanGetterWarning(pMeta, e);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>         }<a name="line.447"></a>
-<span class="sourceLineNo">448</span>         out.eTag("td").nl();<a name="line.448"></a>
-<span class="sourceLineNo">449</span>         out.eTag(i+1, "tr").nl();<a name="line.449"></a>
-<span class="sourceLineNo">450</span>      }<a name="line.450"></a>
-<span class="sourceLineNo">451</span>      out.eTag(i, "table").nl();<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>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.454"></a>
-<span class="sourceLineNo">455</span>   private void serializeCollection(HtmlSerializerSession session, HtmlWriter out, Object in, ClassMeta&lt;?&gt; sType, ClassMeta&lt;?&gt; eType, String name, BeanPropertyMeta ppMeta) throws Exception {<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>      ClassMeta&lt;?&gt; seType = sType.getElementType();<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      if (seType == null)<a name="line.458"></a>
-<span class="sourceLineNo">459</span>         seType = session.object();<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span>      Collection c = (sType.isCollection() ? (Collection)in : toList(sType.getInnerClass(), in));<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>      int i = session.getIndent();<a name="line.463"></a>
-<span class="sourceLineNo">464</span>      if (c.isEmpty()) {<a name="line.464"></a>
-<span class="sourceLineNo">465</span>         out.appendln(i, "&lt;ul&gt;&lt;/ul&gt;");<a name="line.465"></a>
-<span class="sourceLineNo">466</span>         return;<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>      String type2 = null;<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      if (sType != eType)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>         type2 = sType.getDictionaryName();<a name="line.471"></a>
-<span class="sourceLineNo">472</span>      if (type2 == null)<a name="line.472"></a>
-<span class="sourceLineNo">473</span>         type2 = "array";<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span>      c = session.sort(c);<a name="line.475"></a>
-<span class="sourceLineNo">476</span><a name="line.476"></a>
-<span class="sourceLineNo">477</span>      HtmlBeanPropertyMeta hbpMeta = (ppMeta == null ? null : ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class));<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      String btpn = session.getBeanTypePropertyName(eType);<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span>      // Look at the objects to see how we're going to handle them.  Check the first object to see how we're going to handle this.<a name="line.480"></a>
-<span class="sourceLineNo">481</span>      // If it's a map or bean, then we'll create a table.<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      // Otherwise, we'll create a list.<a name="line.482"></a>
-<span class="sourceLineNo">483</span>      Object[] th = getTableHeaders(session, c, hbpMeta);<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>      if (th != null) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>         out.oTag(i, "table").attr(btpn, type2).append('&gt;').nl();<a name="line.487"></a>
-<span class="sourceLineNo">488</span>         out.sTag(i+1, "tr").nl();<a name="line.488"></a>
-<span class="sourceLineNo">489</span>         for (Object key : th) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>            out.sTag(i+2, "th");<a name="line.490"></a>
-<span class="sourceLineNo">491</span>            out.text(session.convertToType(key, String.class));<a name="line.491"></a>
-<span class="sourceLineNo">492</span>            out.eTag("th").nl();<a name="line.492"></a>
-<span class="sourceLineNo">493</span>         }<a name="line.493"></a>
-<span class="sourceLineNo">494</span>         out.eTag(i+1, "tr").nl();<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span>         for (Object o : c) {<a name="line.496"></a>
-<span class="sourceLineNo">497</span>            ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o);<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>            if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.499"></a>
-<span class="sourceLineNo">500</span>               PojoSwap f = cm.getPojoSwap();<a name="line.500"></a>
-<span class="sourceLineNo">501</span>               o = f.swap(session, o);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>               cm = cm.getSerializedClassMeta();<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>            out.oTag(i+1, "tr");<a name="line.505"></a>
-<span class="sourceLineNo">506</span>            String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.506"></a>
-<span class="sourceLineNo">507</span>            String typeProperty = session.getBeanTypePropertyName(cm);<a name="line.507"></a>
+<span class="sourceLineNo">403</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.403"></a>
+<span class="sourceLineNo">404</span>   private void serializeBeanMap(HtmlSerializerSession session, HtmlWriter out, BeanMap&lt;?&gt; m, ClassMeta&lt;?&gt; eType, BeanPropertyMeta ppMeta) throws Exception {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      int i = session.getIndent();<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>      out.oTag(i, "table");<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span>      String typeName = m.getMeta().getDictionaryName();<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      if (typeName != null &amp;&amp; eType != m.getClassMeta())<a name="line.410"></a>
+<span class="sourceLineNo">411</span>         out.attr(session.getBeanTypePropertyName(m.getClassMeta()), typeName);<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span>      out.append('&gt;').nl();<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      if (session.isAddKeyValueTableHeaders() &amp;&amp; ! (m.getClassMeta().getExtendedMeta(HtmlClassMeta.class).isNoTableHeaders() || (ppMeta != null &amp;&amp; ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isNoTableHeaders()))) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>         out.sTag(i+1, "tr").nl();<a name="line.415"></a>
+<span class="sourceLineNo">416</span>         out.sTag(i+2, "th").append("key").eTag("th").nl();<a name="line.416"></a>
+<span class="sourceLineNo">417</span>         out.sTag(i+2, "th").append("value").eTag("th").nl();<a name="line.417"></a>
+<span class="sourceLineNo">418</span>         out.eTag(i+1, "tr").nl();<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>      for (BeanPropertyValue p : m.getValues(session.isTrimNulls())) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>         BeanPropertyMeta pMeta = p.getMeta();<a name="line.422"></a>
+<span class="sourceLineNo">423</span>         ClassMeta&lt;?&gt; cMeta = p.getClassMeta();<a name="line.423"></a>
+<span class="sourceLineNo">424</span>         HtmlBeanPropertyMeta hbpMeta = pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>         String link = hbpMeta.getLink();<a name="line.425"></a>
+<span class="sourceLineNo">426</span>         HtmlRender render = hbpMeta.getRender();<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span>         String key = p.getName();<a name="line.428"></a>
+<span class="sourceLineNo">429</span>         Object value = p.getValue();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>         Throwable t = p.getThrown();<a name="line.430"></a>
+<span class="sourceLineNo">431</span>         if (t != null)<a name="line.431"></a>
+<span class="sourceLineNo">432</span>            session.addBeanGetterWarning(pMeta, t);<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>         if (session.canIgnoreValue(cMeta, key, value))<a name="line.434"></a>
+<span class="sourceLineNo">435</span>            continue;<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span>         out.sTag(i+1, "tr").nl();<a name="line.437"></a>
+<span class="sourceLineNo">438</span>         out.sTag(i+2, "td").text(key).eTag("td").nl();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>         out.oTag(i+2, "td");<a name="line.439"></a>
+<span class="sourceLineNo">440</span>         String style = render.getStyle(session, value);<a name="line.440"></a>
+<span class="sourceLineNo">441</span>         if (style != null)<a name="line.441"></a>
+<span class="sourceLineNo">442</span>            out.attr("style", style);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>         out.cTag();<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span>         try {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>            if (link != null) <a name="line.446"></a>
+<span class="sourceLineNo">447</span>               out.oTag(i+3, "a").attrUri("href", m.resolveVars(link)).cTag();<a name="line.447"></a>
+<span class="sourceLineNo">448</span>            ContentResult cr = serializeAnything(session, out, render.getContent(session, value), cMeta, key, 2, pMeta, false);<a name="line.448"></a>
+<span class="sourceLineNo">449</span>            if (cr == CR_NORMAL)<a name="line.449"></a>
+<span class="sourceLineNo">450</span>               out.i(i+2);<a name="line.450"></a>
+<span class="sourceLineNo">451</span>            if (link != null) <a name="line.451"></a>
+<span class="sourceLineNo">452</span>               out.eTag("a");<a name="line.452"></a>
+<span class="sourceLineNo">453</span>         } catch (SerializeException e) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>            throw e;<a name="line.454"></a>
+<span class="sourceLineNo">455</span>         } catch (Error e) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>            throw e;<a name="line.456"></a>
+<span class="sourceLineNo">457</span>         } catch (Throwable e) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>            e.printStackTrace();<a name="line.458"></a>
+<span class="sourceLineNo">459</span>            session.addBeanGetterWarning(pMeta, e);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>         }<a name="line.460"></a>
+<span class="sourceLineNo">461</span>         out.eTag("td").nl();<a name="line.461"></a>
+<span class="sourceLineNo">462</span>         out.eTag(i+1, "tr").nl();<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      }<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      out.eTag(i, "table").nl();<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>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.467"></a>
+<span class="sourceLineNo">468</span>   private void serializeCollection(HtmlSerializerSession session, HtmlWriter out, Object in, ClassMeta&lt;?&gt; sType, ClassMeta&lt;?&gt; eType, String name, BeanPropertyMeta ppMeta) throws Exception {<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span>      ClassMeta&lt;?&gt; seType = sType.getElementType();<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      if (seType == null)<a name="line.471"></a>
+<span class="sourceLineNo">472</span>         seType = session.object();<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span>      Collection c = (sType.isCollection() ? (Collection)in : toList(sType.getInnerClass(), in));<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span>      int i = session.getIndent();<a name="line.476"></a>
+<span class="sourceLineNo">477</span>      if (c.isEmpty()) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span>         out.appendln(i, "&lt;ul&gt;&lt;/ul&gt;");<a name="line.478"></a>
+<span class="sourceLineNo">479</span>         return;<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>      String type2 = null;<a name="line.482"></a>
+<span class="sourceLineNo">483</span>      if (sType != eType)<a name="line.483"></a>
+<span class="sourceLineNo">484</span>         type2 = sType.getDictionaryName();<a name="line.484"></a>
+<span class="sourceLineNo">485</span>      if (type2 == null)<a name="line.485"></a>
+<span class="sourceLineNo">486</span>         type2 = "array";<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span>      c = session.sort(c);<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span>      HtmlBeanPropertyMeta hbpMeta = (ppMeta == null ? null : ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class));<a name="line.490"></a>
+<span class="sourceLineNo">491</span>      String btpn = session.getBeanTypePropertyName(eType);<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span>      // Look at the objects to see how we're going to handle them.  Check the first object to see how we're going to handle this.<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      // If it's a map or bean, then we'll create a table.<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      // Otherwise, we'll create a list.<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      Object[] th = getTableHeaders(session, c, hbpMeta);<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span>      if (th != null) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span>         out.oTag(i, "table").attr(btpn, type2).append('&gt;').nl();<a name="line.500"></a>
+<span class="sourceLineNo">501</span>         out.sTag(i+1, "tr").nl();<a name="line.501"></a>
+<span class="sourceLineNo">502</span>         for (Object key : th) {<a name="line.502"></a>
+<span class="sourceLineNo">503</span>            out.sTag(i+2, "th");<a name="line.503"></a>
+<span class="sourceLineNo">504</span>            out.text(session.convertToType(key, String.class));<a name="line.504"></a>
+<span class="sourceLineNo">505</span>            out.eTag("th").nl();<a name="line.505"></a>
+<span class="sourceLineNo">506</span>         }<a name="line.506"></a>
+<span class="sourceLineNo">507</span>         out.eTag(i+1, "tr").nl();<a name="line.507"></a>
 <span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span>            if (typeName != null &amp;&amp; eType.getElementType() != cm)<a name="line.509"></a>
-<span class="sourceLineNo">510</span>               out.attr(typeProperty, typeName);<a name="line.510"></a>
-<span class="sourceLineNo">511</span>            out.cTag().nl();<a name="line.511"></a>
-<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span>            if (cm == null) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>               serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span>            } else if (cm.isMap() &amp;&amp; ! (cm.isBeanMap())) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span>               Map m2 = session.sort((Map)o);<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span>               for (Object k : th) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>                  out.sTag(i+2, "td");<a name="line.520"></a>
-<span class="sourceLineNo">521</span>                  ContentResult cr = serializeAnything(session, out, m2.get(k), eType.getElementType(), session.toString(k), 2, null, false);<a name="line.521"></a>
-<span class="sourceLineNo">522</span>                  if (cr == CR_NORMAL)<a name="line.522"></a>
-<span class="sourceLineNo">523</span>                     out.i(i+2);<a name="line.523"></a>
-<span class="sourceLineNo">524</span>                  out.eTag("td").nl();<a name="line.524"></a>
-<span class="sourceLineNo">525</span>               }<a name="line.525"></a>
-<span class="sourceLineNo">526</span>            } else {<a name="line.526"></a>
-<span class="sourceLineNo">527</span>               BeanMap m2 = null;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>               if (o instanceof BeanMap)<a name="line.528"></a>
-<span class="sourceLineNo">529</span>                  m2 = (BeanMap)o;<a name="line.529"></a>
-<span class="sourceLineNo">530</span>               else<a name="line.530"></a>
-<span class="sourceLineNo">531</span>                  m2 = session.toBeanMap(o);<a name="line.531"></a>
-<span class="sourceLineNo">532</span><a name="line.532"></a>
-<span class="sourceLineNo">533</span>               for (Object k : th) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>                  BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.534"></a>
-<span class="sourceLineNo">535</span>                  BeanPropertyMeta pMeta = p.getMeta();<a name="line.535"></a>
-<span class="sourceLineNo">536</span>                  out.sTag(i+2, "td");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>                  ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>                  if (cr == CR_NORMAL)<a name="line.538"></a>
-<span class="sourceLineNo">539</span>                     out.i(i+2);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>                  out.eTag("td").nl();<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>            out.eTag(i+1, "tr").nl();<a name="line.543"></a>
-<span class="sourceLineNo">544</span>         }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>         out.eTag(i, "table").nl();<a name="line.545"></a>
-<span class="sourceLineNo">546</span><a name="line.546"></a>
-<span class="sourceLineNo">547</span>      } else {<a name="line.547"></a>
-<span class="sourceLineNo">548</span>         out.oTag(i, "ul");<a name="line.548"></a>
-<span class="sourceLineNo">549</span>         if (! type2.equals("array"))<a name="line.549"></a>
-<span class="sourceLineNo">550</span>            out.attr(btpn, type2);<a name="line.550"></a>
-<span class="sourceLineNo">551</span>         out.append('&gt;').nl();<a name="line.551"></a>
-<span class="sourceLineNo">552</span>         for (Object o : c) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span>            out.sTag(i+1, "li");<a name="line.553"></a>
-<span class="sourceLineNo">554</span>            ContentResult cr = serializeAnything(session, out, o, eType.getElementType(), name, 1, null, false);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>            if (cr == CR_NORMAL)<a name="line.555"></a>
-<span class="sourceLineNo">556</span>               out.i(i+1);<a name="line.556"></a>
-<span class="sourceLineNo">557</span>            out.eTag("li").nl();<a name="line.557"></a>
-<span class="sourceLineNo">558</span>         }<a name="line.558"></a>
-<span class="sourceLineNo">559</span>         out.eTag(i, "ul").nl();<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>   /*<a name="line.563"></a>
-<span class="sourceLineNo">564</span>    * Returns the table column headers for the specified collection of objects.<a name="line.564"></a>
-<span class="sourceLineNo">565</span>    * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    */<a name="line.567"></a>
-<span class="sourceLineNo">568</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.568"></a>
-<span class="sourceLineNo">569</span>   private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      if (c.size() == 0)<a name="line.570"></a>
-<span class="sourceLineNo">571</span>         return null;<a name="line.571"></a>
-<span class="sourceLineNo">572</span>      c = session.sort(c);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>      Object[] th;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      Set&lt;ClassMeta&gt; prevC = new HashSet&lt;ClassMeta&gt;();<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      Object o1 = null;<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      for (Object o : c)<a name="line.576"></a>
-<span class="sourceLineNo">577</span>         if (o != null) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>            o1 = o;<a name="line.578"></a>
-<span class="sourceLineNo">579</span>            break;<a name="line.579"></a>
-<span class="sourceLineNo">580</span>         }<a name="line.580"></a>
-<span class="sourceLineNo">581</span>      if (o1 == null)<a name="line.581"></a>
-<span class="sourceLineNo">582</span>         return null;<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o1);<a name="line.583"></a>
-<span class="sourceLineNo">584</span>      if (cm.getPojoSwap() != null) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span>         PojoSwap f = cm.getPojoSwap();<a name="line.585"></a>
-<span class="sourceLineNo">586</span>         o1 = f.swap(session, o1);<a name="line.586"></a>
-<span class="sourceLineNo">587</span>         cm = cm.getSerializedClassMeta();<a name="line.587"></a>
-<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
-<span class="sourceLineNo">589</span>      if (cm == null || ! cm.isMapOrBean())<a name="line.589"></a>
-<span class="sourceLineNo">590</span>         return null;<a name="line.590"></a>
-<span class="sourceLineNo">591</span>      if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.591"></a>
-<span class="sourceLineNo">592</span>         return null;<a name="line.592"></a>
-<span class="sourceLineNo">593</span>      HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.593"></a>
-<span class="sourceLineNo">594</span>      if (h.isNoTables() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTables()))<a name="line.594"></a>
-<span class="sourceLineNo">595</span>         return null;<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      if (h.isNoTableHeaders() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTableHeaders()))<a name="line.596"></a>
-<span class="sourceLineNo">597</span>         return new Object[0];<a name="line.597"></a>
-<span class="sourceLineNo">598</span>      if (session.canIgnoreValue(cm, null, o1))<a name="line.598"></a>
-<span class="sourceLineNo">599</span>         return null;<a name="line.599"></a>
-<span class="sourceLineNo">600</span>      if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.601"></a>
-<span class="sourceLineNo">602</span>         for (Object o : c) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span>               if (! cm.isInstance(o))<a name="line.604"></a>
-<span class="sourceLineNo">605</span>                  return null;<a name="line.605"></a>
-<span class="sourceLineNo">606</span>               Map m = session.sort((Map)o);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>               for (Map.Entry e : (Set&lt;Map.Entry&gt;)m.entrySet()) {<a name="line.607"></a>
-<span class="sourceLineNo">608</span>                  if (e.getValue() != null)<a name="line.608"></a>
-<span class="sourceLineNo">609</span>                     set.add(e.getKey() == null ? null : e.getKey());<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>         }<a name="line.612"></a>
-<span class="sourceLineNo">613</span>         th = set.toArray(new Object[set.size()]);<a name="line.613"></a>
-<span class="sourceLineNo">614</span>      } else {<a name="line.614"></a>
-<span class="sourceLineNo">615</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.615"></a>
-<span class="sourceLineNo">616</span>         for (Object o : c) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>               if (! cm.isInstance(o))<a name="line.618"></a>
-<span class="sourceLineNo">619</span>                  return null;<a name="line.619"></a>
-<span class="sourceLineNo">620</span>               BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.620"></a>
-<span class="sourceLineNo">621</span>               for (Map.Entry&lt;String,Object&gt; e : bm.entrySet()) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>                  if (e.getValue() != null)<a name="line.622"></a>
-<span class="sourceLineNo">623</span>                     set.add(e.getKey());<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>         }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>         th = set.toArray(new Object[set.size()]);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>      }<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      prevC.add(cm);<a name="line.629"></a>
-<span class="sourceLineNo">630</span>      boolean isSortable = true;<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      for (Object o : th)<a name="line.631"></a>
-<span class="sourceLineNo">632</span>         isSortable &amp;= (o instanceof Comparable);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      Set&lt;Object&gt; s = (isSortable ? new TreeSet&lt;Object&gt;() : new LinkedHashSet&lt;Object&gt;());<a name="line.633"></a>
-<span class="sourceLineNo">634</span>      s.addAll(Arrays.asList(th));<a name="line.634"></a>
-<span class="sourceLineNo">635</span><a name="line.635"></a>
-<span class="sourceLineNo">636</span>      for (Object o : c) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span>         if (o == null)<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            continue;<a name="line.638"></a>
-<span class="sourceLineNo">639</span>         cm = session.getClassMetaForObject(o);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>         if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            PojoSwap f = cm.getPojoSwap();<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            o = f.swap(session, o);<a name="line.642"></a>
-<span class="sourceLineNo">643</span>            cm = cm.getSerializedClassMeta();<a name="line.643"></a>
-<span class="sourceLineNo">644</span>         }<a name="line.644"></a>
-<span class="sourceLineNo">645</span>         if (prevC.contains(cm))<a name="line.645"></a>
-<span class="sourceLineNo">646</span>            continue;<a name="line.646"></a>
-<span class="sourceLineNo">647</span>         if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.647"></a>
-<span class="sourceLineNo">648</span>            return null;<a name="line.648"></a>
-<span class="sourceLineNo">649</span>         if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.649"></a>
-<span class="sourceLineNo">650</span>            return null;<a name="line.650"></a>
-<span class="sourceLineNo">651</span>         if (session.canIgnoreValue(cm, null, o))<a name="line.651"></a>
-<span class="sourceLineNo">652</span>            return null;<a name="line.652"></a>
-<span class="sourceLineNo">653</span>         if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>            Map m = (Map)o;<a name="line.654"></a>
-<span class="sourceLineNo">655</span>            if (th.length != m.keySet().size())<a name="line.655"></a>
-<span class="sourceLineNo">656</span>               return null;<a name="line.656"></a>
-<span class="sourceLineNo">657</span>            for (Object k : m.keySet())<a name="line.657"></a>
-<span class="sourceLineNo">658</span>               if (! s.contains(k.toString()))<a name="line.658"></a>
-<span class="sourceLineNo">659</span>                  return null;<a name="line.659"></a>
-<span class="sourceLineNo">660</span>         } else {<a name="line.660"></a>
-<span class="sourceLineNo">661</span>            BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            int l = 0;<a name="line.662"></a>
-<span class="sourceLineNo">663</span>            for (String k : bm.keySet()) {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>               if (! s.contains(k))<a name="line.664"></a>
-<span class="sourceLineNo">665</span>                  return null;<a name="line.665"></a>
-<span class="sourceLineNo">666</span>               l++;<a name="line.666"></a>
-<span class="sourceLineNo">667</span>            }<a name="line.667"></a>
-<span class="sourceLineNo">668</span>            if (s.size() != l)<a name="line.668"></a>
-<span class="sourceLineNo">669</span>               return null;<a name="line.669"></a>
+<span class="sourceLineNo">509</span>         for (Object o : c) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>            ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o);<a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span>            if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span>               PojoSwap f = cm.getPojoSwap();<a name="line.513"></a>
+<span class="sourceLineNo">514</span>               o = f.swap(session, o);<a name="line.514"></a>
+<span class="sourceLineNo">515</span>               cm = cm.getSerializedClassMeta();<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>            out.oTag(i+1, "tr");<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            String typeProperty = session.getBeanTypePropertyName(cm);<a name="line.520"></a>
+<span class="sourceLineNo">521</span><a name="line.521"></a>
+<span class="sourceLineNo">522</span>            if (typeName != null &amp;&amp; eType.getElementType() != cm)<a name="line.522"></a>
+<span class="sourceLineNo">523</span>               out.attr(typeProperty, typeName);<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            out.cTag().nl();<a name="line.524"></a>
+<span class="sourceLineNo">525</span><a name="line.525"></a>
+<span class="sourceLineNo">526</span>            if (cm == null) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>               serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span>            } else if (cm.isMap() &amp;&amp; ! (cm.isBeanMap())) {<a name="line.529"></a>
+<span class="sourceLineNo">530</span>               Map m2 = session.sort((Map)o);<a name="line.530"></a>
+<span class="sourceLineNo">531</span><a name="line.531"></a>
+<span class="sourceLineNo">532</span>               for (Object k : th) {<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, m2.get(k), eType.getElementType(), session.toString(k), 2, null, 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>            } else {<a name="line.539"></a>
+<span class="sourceLineNo">540</span>               BeanMap m2 = null;<a name="line.540"></a>
+<span class="sourceLineNo">541</span>               if (o instanceof BeanMap)<a name="line.541"></a>
+<span class="sourceLineNo">542</span>                  m2 = (BeanMap)o;<a name="line.542"></a>
+<span class="sourceLineNo">543</span>               else<a name="line.543"></a>
+<span class="sourceLineNo">544</span>                  m2 = session.toBeanMap(o);<a name="line.544"></a>
+<span class="sourceLineNo">545</span><a name="line.545"></a>
+<span class="sourceLineNo">546</span>               for (Object k : th) {<a name="line.546"></a>
+<span class="sourceLineNo">547</span>                  BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.547"></a>
+<span class="sourceLineNo">548</span>                  BeanPropertyMeta pMeta = p.getMeta();<a name="line.548"></a>
+<span class="sourceLineNo">549</span>                  HtmlBeanPropertyMeta hpMeta = pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class);<a name="line.549"></a>
+<span class="sourceLineNo">550</span>                  String link = hpMeta.getLink();<a name="line.550"></a>
+<span class="sourceLineNo">551</span>                  HtmlRender render = hpMeta.getRender();<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span>                  Object value = p.getValue();<a name="line.553"></a>
+<span class="sourceLineNo">554</span>                  out.oTag(i+2, "td");<a name="line.554"></a>
+<span class="sourceLineNo">555</span>                  String style = render.getStyle(session, value);<a name="line.555"></a>
+<span class="sourceLineNo">556</span>                  if (style != null)<a name="line.556"></a>
+<span class="sourceLineNo">557</span>                     out.attr("style", style);<a name="line.557"></a>
+<span class="sourceLineNo">558</span>                  out.cTag();<a name="line.558"></a>
+<span class="sourceLineNo">559</span>                  if (link != null) <a name="line.559"></a>
+<span class="sourceLineNo">560</span>                     out.oTag(i+3, "a").attrUri("href", m2.resolveVars(link)).cTag();<a name="line.560"></a>
+<span class="sourceLineNo">561</span>                  ContentResult cr = serializeAnything(session, out, render.getContent(session, value), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.561"></a>
+<span class="sourceLineNo">562</span>                  if (cr == CR_NORMAL)<a name="line.562"></a>
+<span class="sourceLineNo">563</span>                     out.i(i+2);<a name="line.563"></a>
+<span class="sourceLineNo">564</span>                  if (link != null) <a name="line.564"></a>
+<span class="sourceLineNo">565</span>                     out.eTag("a");<a name="line.565"></a>
+<span class="sourceLineNo">566</span>                  out.eTag("td").nl();<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>            out.eTag(i+1, "tr").nl();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>         }<a name="line.570"></a>
+<span class="sourceLineNo">571</span>         out.eTag(i, "table").nl();<a name="line.571"></a>
+<span class="sourceLineNo">572</span><a name="line.572"></a>
+<span class="sourceLineNo">573</span>      } else {<a name="line.573"></a>
+<span class="sourceLineNo">574</span>         out.oTag(i, "ul");<a name="line.574"></a>
+<span class="sourceLineNo">575</span>         if (! type2.equals("array"))<a name="line.575"></a>
+<span class="sourceLineNo">576</span>            out.attr(btpn, type2);<a name="line.576"></a>
+<span class="sourceLineNo">577</span>         out.append('&gt;').nl();<a name="line.577"></a>
+<span class="sourceLineNo">578</span>         for (Object o : c) {<a name="line.578"></a>
+<span class="sourceLineNo">579</span>            out.sTag(i+1, "li");<a name="line.579"></a>
+<span class="sourceLineNo">580</span>            ContentResult cr = serializeAnything(session, out, o, eType.getElementType(), name, 1, null, false);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>            if (cr == CR_NORMAL)<a name="line.581"></a>
+<span class="sourceLineNo">582</span>               out.i(i+1);<a name="line.582"></a>
+<span class="sourceLineNo">583</span>            out.eTag("li").nl();<a name="line.583"></a>
+<span class="sourceLineNo">584</span>         }<a name="line.584"></a>
+<span class="sourceLineNo">585</span>         out.eTag(i, "ul").nl();<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>   /*<a name="line.589"></a>
+<span class="sourceLineNo">590</span>    * Returns the table column headers for the specified collection of objects.<a name="line.590"></a>
+<span class="sourceLineNo">591</span>    * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.591"></a>
+<span class="sourceLineNo">592</span>    * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.592"></a>
+<span class="sourceLineNo">593</span>    */<a name="line.593"></a>
+<span class="sourceLineNo">594</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.594"></a>
+<span class="sourceLineNo">595</span>   private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.595"></a>
+<span class="sourceLineNo">596</span>      if (c.size() == 0)<a name="line.596"></a>
+<span class="sourceLineNo">597</span>         return null;<a name="line.597"></a>
+<span class="sourceLineNo">598</span>      c = session.sort(c);<a name="line.598"></a>
+<span class="sourceLineNo">599</span>      Object[] th;<a name="line.599"></a>
+<span class="sourceLineNo">600</span>      Set&lt;ClassMeta&gt; prevC = new HashSet&lt;ClassMeta&gt;();<a name="line.600"></a>
+<span class="sourceLineNo">601</span>      Object o1 = null;<a name="line.601"></a>
+<span class="sourceLineNo">602</span>      for (Object o : c)<a name="line.602"></a>
+<span class="sourceLineNo">603</span>         if (o != null) {<a name="line.603"></a>
+<span class="sourceLineNo">604</span>            o1 = o;<a name="line.604"></a>
+<span class="sourceLineNo">605</span>            break;<a name="line.605"></a>
+<span class="sourceLineNo">606</span>         }<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      if (o1 == null)<a name="line.607"></a>
+<span class="sourceLineNo">608</span>         return null;<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o1);<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      if (cm.getPojoSwap() != null) {<a name="line.610"></a>
+<span class="sourceLineNo">611</span>         PojoSwap f = cm.getPojoSwap();<a name="line.611"></a>
+<span class="sourceLineNo">612</span>         o1 = f.swap(session, o1);<a name="line.612"></a>
+<span class="sourceLineNo">613</span>         cm = cm.getSerializedClassMeta();<a name="line.613"></a>
+<span class="sourceLineNo">614</span>      }<a name="line.614"></a>
+<span class="sourceLineNo">615</span>      if (cm == null || ! cm.isMapOrBean())<a name="line.615"></a>
+<span class="sourceLineNo">616</span>         return null;<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.617"></a>
+<span class="sourceLineNo">618</span>         return null;<a name="line.618"></a>
+<span class="sourceLineNo">619</span>      HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.619"></a>
+<span class="sourceLineNo">620</span>      if (h.isNoTables() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTables()))<a name="line.620"></a>
+<span class="sourceLineNo">621</span>         return null;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>      if (h.isNoTableHeaders() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTableHeaders()))<a name="line.622"></a>
+<span class="sourceLineNo">623</span>         return new Object[0];<a name="line.623"></a>
+<span class="sourceLineNo">624</span>      if (session.canIgnoreValue(cm, null, o1))<a name="line.624"></a>
+<span class="sourceLineNo">625</span>         return null;<a name="line.625"></a>
+<span class="sourceLineNo">626</span>      if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.626"></a>
+<span class="sourceLineNo">627</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.627"></a>
+<span class="sourceLineNo">628</span>         for (Object o : c) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.629"></a>
+<span class="sourceLineNo">630</span>               if (! cm.isInstance(o))<a name="line.630"></a>
+<span class="sourceLineNo">631</span>                  return null;<a name="line.631"></a>
+<span class="sourceLineNo">632</span>               Map m = session.sort((Map)o);<a name="line.632"></a>
+<span class="sourceLineNo">633</span>               for (Map.Entry e : (Set&lt;Map.Entry&gt;)m.entrySet()) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>                  if (e.getValue() != null)<a name="line.634"></a>
+<span class="sourceLineNo">635</span>                     set.add(e.getKey() == null ? null : e.getKey());<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>         th = set.toArray(new Object[set.size()]);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>      } else {<a name="line.640"></a>
+<span class="sourceLineNo">641</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.641"></a>
+<span class="sourceLineNo">642</span>         for (Object o : c) {<a name="line.642"></a>
+<span class="sourceLineNo">643</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.643"></a>
+<span class="sourceLineNo">644</span>               if (! cm.isInstance(o))<a name="line.644"></a>
+<span class="sourceLineNo">645</span>                  return null;<a name="line.645"></a>
+<span class="sourceLineNo">646</span>               BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.646"></a>
+<span class="sourceLineNo">647</span>               for (Map.Entry&lt;String,Object&gt; e : bm.entrySet()) {<a name="line.647"></a>
+<span class="sourceLineNo">648</span>                  if (e.getValue() != null)<a name="line.648"></a>
+<span class="sourceLineNo">649</span>                     set.add(e.getKey());<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>         th = set.toArray(new Object[set.size()]);<a name="line.653"></a>
+<span class="sourceLineNo">654</span>      }<a name="line.654"></a>
+<span class="sourceLineNo">655</span>      prevC.add(cm);<a name="line.655"></a>
+<span class="sourceLineNo">656</span>      boolean isSortable = true;<a name="line.656"></a>
+<span class="sourceLineNo">657</span>      for (Object o : th)<a name="line.657"></a>
+<span class="sourceLineNo">658</span>         isSortable &amp;= (o instanceof Comparable);<a name="line.658"></a>
+<span class="sourceLineNo">659</span>      Set&lt;Object&gt; s = (isSortable ? new TreeSet&lt;Object&gt;() : new LinkedHashSet&lt;Object&gt;());<a name="line.659"></a>
+<span class="sourceLineNo">660</span>      s.addAll(Arrays.asList(th));<a name="line.660"></a>
+<span class="sourceLineNo">661</span><a name="line.661"></a>
+<span class="sourceLineNo">662</span>      for (Object o : c) {<a name="line.662"></a>
+<span class="sourceLineNo">663</span>         if (o == null)<a name="line.663"></a>
+<span class="sourceLineNo">664</span>            continue;<a name="line.664"></a>
+<span class="sourceLineNo">665</span>         cm = session.getClassMetaForObject(o);<a name="line.665"></a>
+<span class="sourceLineNo">666</span>         if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.666"></a>
+<span class="sourceLineNo">667</span>            PojoSwap f = cm.getPojoSwap();<a name="line.667"></a>
+<span class="sourceLineNo">668</span>            o = f.swap(session, o);<a name="line.668"></a>
+<span class="sourceLineNo">669</span>            cm = cm.getSerializedClassMeta();<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>      return th;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>   }<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>    * Returns the schema serializer based on the settings of this serializer.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    * @return The schema serializer.<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    */<a name="line.678"></a>
-<span class="sourceLineNo">679</span>   @Override /* XmlSerializer */<a name="line.679"></a>
-<span class="sourceLineNo">680</span>   public HtmlSerializer getSchemaSerializer() {<a name="line.680"></a>
-<span class="sourceLineNo">681</span>      if (schemaSerializer == null)<a name="line.681"></a>
-<span class="sourceLineNo">682</span>         schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.682"></a>
-<span class="sourceLineNo">683</span>      return schemaSerializer;<a name="line.683"></a>
-<span class="sourceLineNo">684</span>   }<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>   //--------------------------------------------------------------------------------<a name="line.687"></a>
-<span class="sourceLineNo">688</span>   // Entry point methods<a name="line.688"></a>
-<span class="sourceLineNo">689</span>   //--------------------------------------------------------------------------------<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span>   @Override /* Serializer */<a name="line.691"></a>
-<span class="sourceLineNo">692</span>   public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.692"></a>
-<span class="sourceLineNo">693</span>      return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<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>   @Override /* Serializer */<a name="line.696"></a>
-<span class="sourceLineNo">697</span>   protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.697"></a>
-<span class="sourceLineNo">698</span>      HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.698"></a>
-<span class="sourceLineNo">699</span>      doSerialize(s, o, s.getWriter());<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">671</span>         if (prevC.contains(cm))<a name="line.671"></a>
+<span class="sourceLineNo">672</span>            continue;<a name="line.672"></a>
+<span class="sourceLineNo">673</span>         if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.673"></a>
+<span class="sourceLineNo">674</span>            return null;<a name="line.674"></a>
+<span class="sourceLineNo">675</span>         if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.675"></a>
+<span class="sourceLineNo">676</span>            return null;<a name="line.676"></a>
+<span class="sourceLineNo">677</span>         if (session.canIgnoreValue(cm, null, o))<a name="line.677"></a>
+<span class="sourceLineNo">678</span>            return null;<a name="line.678"></a>
+<span class="sourceLineNo">679</span>         if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>            Map m = (Map)o;<a name="line.680"></a>
+<span class="sourceLineNo">681</span>            if (th.length != m.keySet().size())<a name="line.681"></a>
+<span class="sourceLineNo">682</span>               return null;<a name="line.682"></a>
+<span class="sourceLineNo">683</span>            for (Object k : m.keySet())<a name="line.683"></a>
+<span class="sourceLineNo">684</span>               if (! s.contains(k.toString()))<a name="line.684"></a>
+<span class="sourceLineNo">685</span>                  return null;<a name="line.685"></a>
+<span class="sourceLineNo">686</span>         } else {<a name="line.686"></a>
+<span class="sourceLineNo">687</span>            BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.687"></a>
+<span class="sourceLineNo">688</span>            int l = 0;<a name="line.688"></a>
+<span class="sourceLineNo">689</span>            for (String k : bm.keySet()) {<a name="line.689"></a>
+<span class="sourceLineNo">690</span>               if (! s.contains(k))<a name="line.690"></a>
+<span class="sourceLineNo">691</span>                  return null;<a name="line.691"></a>
+<span class="sourceLineNo">692</span>               l++;<a name="line.692"></a>
+<span class="sourceLineNo">693</span>            }<a name="line.693"></a>
+<span class="sourceLineNo">694</span>            if (s.size() != l)<a name="line.694"></a>
+<span class="sourceLineNo">695</span>               return null;<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>      return th;<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>    * Returns the schema serializer based on the settings of this serializer.<a name="line.702"></a>
+<span class="sourceLineNo">703</span>    * @return The schema serializer.<a name="line.703"></a>
+<span class="sourceLineNo">704</span>    */<a name="line.704"></a>
+<span class="sourceLineNo">705</span>   @Override /* XmlSerializer */<a name="line.705"></a>
+<span class="sourceLineNo">706</span>   public HtmlSerializer getSchemaSerializer() {<a name="line.706"></a>
+<span class="sourceLineNo">707</span>      if (schemaSerializer == null)<a name="line.707"></a>
+<span class="sourceLineNo">708</span>         schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.708"></a>
+<span class="sourceLineNo">709</span>      return schemaSerializer;<a name="line.709"></a>
+<span class="sourceLineNo">710</span>   }<a name="line.710"></a>
+<span class="sourceLineNo">711</span><a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>   //--------------------------------------------------------------------------------<a name="line.713"></a>
+<span class="sourceLineNo">714</span>   // Entry point methods<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>   @Override /* Serializer */<a name="line.717"></a>
+<span class="sourceLineNo">718</span>   public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span>      return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.719"></a>
+<span class="sourceLineNo">720</span>   }<a name="line.720"></a>
+<span class="sourceLineNo">721</span><a name="line.721"></a>
+<span class="sourceLineNo">722</span>   @Override /* Serializer */<a name="line.722"></a>
+<span class="sourceLineNo">723</span>   protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.723"></a>
+<span class="sourceLineNo">724</span>      HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.724"></a>
+<span class="sourceLineNo">725</span>      doSerialize(s, o, s.getWriter());<a name="line.725"></a>
+<span class="sourceLineNo">726</span>   }<a name="line.726"></a>
+<span class="sourceLineNo">727</span>}<a name="line.727"></a>
 
 
 


[25/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 a1c574f..145a774 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/SerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/SerializerSession.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};
+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};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -174,13 +174,14 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <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/SerializerSession.html#SerializerSession-org.apache.juneau.serializer.SerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">SerializerSession</a></span>(<a href="../../../../org/apache/juneau/serializer/SerializerContext.html" title="class in org.apache.juneau.serializer">SerializerContext</a>&nbsp;ctx,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#SerializerSession-org.apache.juneau.serializer.SerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">SerializerSession</a></span>(<a href="../../../../org/apache/juneau/serializer/SerializerContext.html" title="class in org.apache.juneau.serializer">SerializerContext</a>&nbsp;ctx,
                  <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                  <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>&nbsp;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>&nbsp;locale,
                  <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>&nbsp;timeZone,
-                 <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+                 <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                 <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create a new session using properties specified in the context.</div>
 </td>
 </tr>
@@ -309,78 +310,84 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 </td>
 </tr>
 <tr id="i17" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getUriContext--">getUriContext</a></span>()</code>
+<div class="block">Returns the URI context passed in to this constructor.</div>
+</td>
+</tr>
+<tr id="i18" class="altColor">
 <td class="colFirst"><code><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></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">getWriter</a></span>()</code>
 <div class="block">Wraps the specified output object inside a writer.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isAddBeanTypeProperties--">isAddBeanTypeProperties</a></span>()</code>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_addBeanTypeProperties"><code>SerializerContext.SERIALIZER_addBeanTypeProperties</code></a> setting value for this session.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a></span>()</code>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_detectRecursions"><code>SerializerContext.SERIALIZER_detectRecursions</code></a> setting value for this session.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a></span>()</code>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_ignoreRecursions"><code>SerializerContext.SERIALIZER_ignoreRecursions</code></a> setting value for this session.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a></span>()</code>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortCollections"><code>SerializerContext.SERIALIZER_sortCollections</code></a> setting value for this session.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a></span>()</code>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortMaps"><code>SerializerContext.SERIALIZER_sortMaps</code></a> setting value for this session.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a></span>()</code>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyCollections"><code>SerializerContext.SERIALIZER_trimEmptyCollections</code></a> setting value for this session.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps--">isTrimEmptyMaps</a></span>()</code>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyMaps"><code>SerializerContext.SERIALIZER_trimEmptyMaps</code></a> setting value for this session.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a></span>()</code>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimNullProperties"><code>SerializerContext.SERIALIZER_trimNullProperties</code></a> setting value for this session.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a></span>()</code>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings"><code>SerializerContext.SERIALIZER_trimStrings</code></a> setting value for this session.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a></span>()</code>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_useWhitespace"><code>SerializerContext.SERIALIZER_useWhitespace</code></a> setting value for this session.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a></span>()</code>
 <div class="block">Pop an object off the stack.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</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>&nbsp;attrName,
     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
@@ -388,50 +395,50 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <div class="block">Push the specified object onto the stack.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<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/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</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>&nbsp;uri)</code>
 <div class="block">Converts a String to an absolute URI based on the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_absolutePathUriBase"><code>SerializerContext.SERIALIZER_absolutePathUriBase</code></a> and
    <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_relativeUriBase"><code>SerializerContext.SERIALIZER_relativeUriBase</code></a> settings on this context.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a></span>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;currentClass)</code>
 <div class="block">Sets the current class being serialized for proper error messages.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentProperty</a></span>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;currentProperty)</code>
 <div class="block">Sets the current bean property being serialized for proper error messages.</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code>&lt;E&gt;&nbsp;<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>&lt;E&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a></span>(<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>&lt;E&gt;&nbsp;c)</code>
 <div class="block">Sorts the specified collection if <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--"><code>isSortCollections()</code></a> returns <jk>true</jk>.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code>&lt;K,V&gt;&nbsp;<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>&lt;K,V&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</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>&lt;K,V&gt;&nbsp;m)</code>
 <div class="block">Sorts the specified map if <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--"><code>isSortMaps()</code></a> returns <jk>true</jk>.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr id="i36" 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/SerializerSession.html#toString-java.lang.Object-">toString</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>&nbsp;o)</code>
 <div class="block">Converts the specified object to a <code>String</code>.</div>
 </td>
 </tr>
-<tr id="i36" class="altColor">
+<tr id="i37" 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/serializer/SerializerSession.html#trim-java.lang.Object-">trim</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>&nbsp;o)</code>
 <div class="block">Trims the specified string if <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--"><code>isTrimStrings()</code></a> returns <jk>true</jk>.</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr id="i38" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</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>&nbsp;attrName,
            <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
@@ -482,7 +489,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockListLast">
 <li class="blockList">
 <h4>indent</h4>
-<pre>public&nbsp;int <a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.59">indent</a></pre>
+<pre>public&nbsp;int <a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.60">indent</a></pre>
 <div class="block">The current indentation depth into the model.</div>
 </li>
 </ul>
@@ -494,44 +501,47 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SerializerSession-org.apache.juneau.serializer.SerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="SerializerSession-org.apache.juneau.serializer.SerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SerializerSession</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.98">SerializerSession</a>(<a href="../../../../org/apache/juneau/serializer/SerializerContext.html" title="class in org.apache.juneau.serializer">SerializerContext</a>&nbsp;ctx,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.101">SerializerSession</a>(<a href="../../../../org/apache/juneau/serializer/SerializerContext.html" title="class in org.apache.juneau.serializer">SerializerContext</a>&nbsp;ctx,
                          <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                          <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>&nbsp;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>&nbsp;locale,
                          <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>&nbsp;timeZone,
-                         <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
+                         <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                         <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>ctx</code> - The context creating this session object.
- The context contains all the configuration settings for this object.</dd>
+   The context contains all the configuration settings for this object.</dd>
 <dd><code>output</code> - The output object.
- <br>Character-based serializers can handle the following output class types:
- <ul>
-   <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>
-   <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io"><code>OutputStream</code></a> - Output will be written as UTF-8 encoded stream.
-   <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a> - Output will be written as system-default encoded stream.
- </ul>
- <br>Stream-based serializers can handle the following output class types:
- <ul>
-   <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io"><code>OutputStream</code></a>
-   <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a>
- </ul></dd>
+   <br>Character-based serializers can handle the following output class types:
+   <ul>
+      <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>
+      <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io"><code>OutputStream</code></a> - Output will be written as UTF-8 encoded stream.
+      <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a> - Output will be written as system-default encoded stream.
+   </ul>
+   <br>Stream-based serializers can handle the following output class types:
+   <ul>
+      <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io"><code>OutputStream</code></a>
+      <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a>
+   </ul></dd>
 <dd><code>op</code> - The override properties.
- These override any context properties defined in the context.</dd>
+   These override any context properties defined in the context.</dd>
 <dd><code>javaMethod</code> - The java method that called this serializer, usually the method in a REST servlet.</dd>
 <dd><code>locale</code> - The session locale.
- If <jk>null</jk>, then the locale defined on the context is used.</dd>
+   If <jk>null</jk>, then the locale defined on the context is used.</dd>
 <dd><code>timeZone</code> - The session timezone.
- If <jk>null</jk>, then the timezone defined on the context is used.</dd>
+   If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -549,7 +559,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getOutputStream</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.159">getOutputStream</a>()
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.163">getOutputStream</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">Wraps the specified output object inside an output stream.
  Subclasses can override this method to implement their own specialized output streams.
@@ -573,7 +583,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getWriter</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.187">getWriter</a>()
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.191">getWriter</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">Wraps the specified output object inside a writer.
  Subclasses can override this method to implement their own specialized writers.
@@ -598,7 +608,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getOutput</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.210">getOutput</a>()</pre>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.214">getOutput</a>()</pre>
 <div class="block">Returns the raw output object passed into this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -612,7 +622,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>setCurrentProperty</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.218">setCurrentProperty</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;currentProperty)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.222">setCurrentProperty</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;currentProperty)</pre>
 <div class="block">Sets the current bean property being serialized for proper error messages.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -626,7 +636,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>setCurrentClass</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.226">setCurrentClass</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;currentClass)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.230">setCurrentClass</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;currentClass)</pre>
 <div class="block">Sets the current class being serialized for proper error messages.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -640,7 +650,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getJavaMethod</h4>
-<pre>public final&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.238">getJavaMethod</a>()</pre>
+<pre>public final&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.242">getJavaMethod</a>()</pre>
 <div class="block">Returns the Java method that invoked this serializer.
  <p>
  When using the REST API, this is the Java method invoked by the REST call.
@@ -651,13 +661,27 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 </dl>
 </li>
 </ul>
+<a name="getUriContext--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUriContext</h4>
+<pre>public final&nbsp;<a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.251">getUriContext</a>()</pre>
+<div class="block">Returns the URI context passed in to this constructor.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The URI context passed in to this constructor.</dd>
+</dl>
+</li>
+</ul>
 <a name="getMaxDepth--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getMaxDepth</h4>
-<pre>public final&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.247">getMaxDepth</a>()</pre>
+<pre>public final&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.260">getMaxDepth</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_maxDepth"><code>SerializerContext.SERIALIZER_maxDepth</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -671,7 +695,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getInitialDepth</h4>
-<pre>public final&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.256">getInitialDepth</a>()</pre>
+<pre>public final&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.269">getInitialDepth</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_initialDepth"><code>SerializerContext.SERIALIZER_initialDepth</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -685,7 +709,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>isDetectRecursions</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.265">isDetectRecursions</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.278">isDetectRecursions</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_detectRecursions"><code>SerializerContext.SERIALIZER_detectRecursions</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -699,7 +723,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>isIgnoreRecursions</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.274">isIgnoreRecursions</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.287">isIgnoreRecursions</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_ignoreRecursions"><code>SerializerContext.SERIALIZER_ignoreRecursions</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -713,7 +737,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>isUseWhitespace</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.283">isUseWhitespace</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.296">isUseWhitespace</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_useWhitespace"><code>SerializerContext.SERIALIZER_useWhitespace</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -727,7 +751,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddBeanTypeProperties</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.292">isAddBeanTypeProperties</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.305">isAddBeanTypeProperties</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_addBeanTypeProperties"><code>SerializerContext.SERIALIZER_addBeanTypeProperties</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -741,7 +765,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getQuoteChar</h4>
-<pre>public final&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.301">getQuoteChar</a>()</pre>
+<pre>public final&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.314">getQuoteChar</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_quoteChar"><code>SerializerContext.SERIALIZER_quoteChar</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -755,7 +779,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>isTrimNulls</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.310">isTrimNulls</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.323">isTrimNulls</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimNullProperties"><code>SerializerContext.SERIALIZER_trimNullProperties</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -769,7 +793,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>isTrimEmptyCollections</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.319">isTrimEmptyCollections</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.332">isTrimEmptyCollections</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyCollections"><code>SerializerContext.SERIALIZER_trimEmptyCollections</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -783,7 +807,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>isTrimEmptyMaps</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.328">isTrimEmptyMaps</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.341">isTrimEmptyMaps</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyMaps"><code>SerializerContext.SERIALIZER_trimEmptyMaps</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -797,7 +821,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>isTrimStrings</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.337">isTrimStrings</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.350">isTrimStrings</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings"><code>SerializerContext.SERIALIZER_trimStrings</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -811,7 +835,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>isSortCollections</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.346">isSortCollections</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.359">isSortCollections</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortCollections"><code>SerializerContext.SERIALIZER_sortCollections</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -825,7 +849,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>isSortMaps</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.355">isSortMaps</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.368">isSortMaps</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortMaps"><code>SerializerContext.SERIALIZER_sortMaps</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -839,7 +863,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getRelativeUriBase</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.364">getRelativeUriBase</a>()</pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.377">getRelativeUriBase</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_relativeUriBase"><code>SerializerContext.SERIALIZER_relativeUriBase</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -853,7 +877,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getAbsolutePathUriBase</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.373">getAbsolutePathUriBase</a>()</pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.386">getAbsolutePathUriBase</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_absolutePathUriBase"><code>SerializerContext.SERIALIZER_absolutePathUriBase</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -867,7 +891,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>push</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.387">push</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;attrName,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.400">push</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;attrName,
                          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
                          <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;eType)
                   throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
@@ -891,7 +915,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>willRecurse</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.420">willRecurse</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;attrName,
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.433">willRecurse</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;attrName,
                            <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
                            <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;cm)
                     throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
@@ -915,7 +939,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>pop</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.435">pop</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.448">pop</a>()</pre>
 <div class="block">Pop an object off the stack.</div>
 </li>
 </ul>
@@ -925,7 +949,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getIndent</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.451">getIndent</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.464">getIndent</a>()</pre>
 <div class="block">The current indentation depth.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -939,7 +963,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>addBeanGetterWarning</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.461">addBeanGetterWarning</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;p,
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.474">addBeanGetterWarning</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;p,
                                  <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>&nbsp;t)</pre>
 <div class="block">Specialized warning when an exception is thrown while executing a bean getter.</div>
 <dl>
@@ -955,7 +979,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>trim</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.472">trim</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>&nbsp;o)</pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.485">trim</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>&nbsp;o)</pre>
 <div class="block">Trims the specified string if <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--"><code>isTrimStrings()</code></a> returns <jk>true</jk>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -971,7 +995,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>generalize</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.490">generalize</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>&nbsp;o,
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.503">generalize</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>&nbsp;o,
                                <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;type)
                         throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
 <div class="block">Generalize the specified object if a POJO swap is associated with it.</div>
@@ -992,7 +1016,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>canIgnoreValue</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.508">canIgnoreValue</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;cm,
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.521">canIgnoreValue</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;cm,
                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;attrName,
                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)
                              throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
@@ -1015,7 +1039,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>sort</h4>
-<pre>public final&nbsp;&lt;K,V&gt;&nbsp;<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>&lt;K,V&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.549">sort</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>&lt;K,V&gt;&nbsp;m)</pre>
+<pre>public final&nbsp;&lt;K,V&gt;&nbsp;<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>&lt;K,V&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.562">sort</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>&lt;K,V&gt;&nbsp;m)</pre>
 <div class="block">Sorts the specified map if <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--"><code>isSortMaps()</code></a> returns <jk>true</jk>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1031,7 +1055,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>sort</h4>
-<pre>public final&nbsp;&lt;E&gt;&nbsp;<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>&lt;E&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.561">sort</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>&lt;E&gt;&nbsp;c)</pre>
+<pre>public final&nbsp;&lt;E&gt;&nbsp;<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>&lt;E&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.574">sort</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>&lt;E&gt;&nbsp;c)</pre>
 <div class="block">Sorts the specified collection if <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--"><code>isSortCollections()</code></a> returns <jk>true</jk>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1047,7 +1071,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>resolveUri</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.574">resolveUri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uri)</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.587">resolveUri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uri)</pre>
 <div class="block">Converts a String to an absolute URI based on the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_absolutePathUriBase"><code>SerializerContext.SERIALIZER_absolutePathUriBase</code></a> and
    <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_relativeUriBase"><code>SerializerContext.SERIALIZER_relativeUriBase</code></a> settings on this context.</div>
 <dl>
@@ -1064,7 +1088,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.600">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>&nbsp;o)</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.613">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>&nbsp;o)</pre>
 <div class="block">Converts the specified object to a <code>String</code>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1080,7 +1104,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>close</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.612">close</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.625">close</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/Session.html#close--">Session</a></code></span></div>
 <div class="block">Perform cleanup on this context object if necessary.</div>
 <dl>
@@ -1097,7 +1121,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getLastLocation</h4>
-<pre>public&nbsp;<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>&lt;<a href="http://docs.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>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.674">getLastLocation</a>()</pre>
+<pre>public&nbsp;<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>&lt;<a href="http://docs.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>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.687">getLastLocation</a>()</pre>
 <div class="block">Returns information used to determine at what location in the parse a failure occurred.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1111,7 +1135,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>createBeanTypeNameProperty</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/BeanPropertyValue.html" title="class in org.apache.juneau">BeanPropertyValue</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.692">createBeanTypeNameProperty</a>(<a href="../../../../org/apache/juneau/BeanMap.html" title="class in org.apache.juneau">BeanMap</a>&lt;?&gt;&nbsp;m,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/BeanPropertyValue.html" title="class in org.apache.juneau">BeanPropertyValue</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.705">createBeanTypeNameProperty</a>(<a href="../../../../org/apache/juneau/BeanMap.html" title="class in org.apache.juneau">BeanMap</a>&lt;?&gt;&nbsp;m,
                                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;typeName)</pre>
 <div class="block">Create a "_type" property that contains the dictionary name of the bean.</div>
 <dl>
@@ -1129,7 +1153,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getBeanTypeName</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.705">getBeanTypeName</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;eType,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.718">getBeanTypeName</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;eType,
                               <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;aType,
                               <a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;pMeta)</pre>
 <div class="block">Resolves the dictionary name for the actual type.</div>
@@ -1149,7 +1173,7 @@ extends <a href="../../../../org/apache/juneau/BeanSession.html" title="class in
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getExpectedRootType</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.758">getExpectedRootType</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>&nbsp;o)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerSession.html#line.771">getExpectedRootType</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>&nbsp;o)</pre>
 <div class="block">Returns the parser-side expected type for the object.
  <p>
  The return value depends on the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_abridged"><code>SerializerContext.SERIALIZER_abridged</code></a> setting.


[31/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 22bdb70..271e382 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html
@@ -163,13 +163,14 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/json/JsonSerializerSession.html#JsonSerializerSession-org.apache.juneau.json.JsonSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">JsonSerializerSession</a></span>(<a href="../../../../org/apache/juneau/json/JsonSerializerContext.html" title="class in org.apache.juneau.json">JsonSerializerContext</a>&nbsp;ctx,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/json/JsonSerializerSession.html#JsonSerializerSession-org.apache.juneau.json.JsonSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">JsonSerializerSession</a></span>(<a href="../../../../org/apache/juneau/json/JsonSerializerContext.html" title="class in org.apache.juneau.json">JsonSerializerContext</a>&nbsp;ctx,
                      <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                      <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>&nbsp;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>&nbsp;locale,
                      <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>&nbsp;timeZone,
-                     <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+                     <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                     <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create a new session using properties specified in the context.</div>
 </td>
 </tr>
@@ -218,7 +219,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#
 isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Co
 llection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getUriContext--">getUriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTr
 imEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCu
 rrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.BeanSession">
@@ -255,33 +256,36 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="JsonSerializerSession-org.apache.juneau.json.JsonSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="JsonSerializerSession-org.apache.juneau.json.JsonSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>JsonSerializerSession</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonSerializerSession.html#line.51">JsonSerializerSession</a>(<a href="../../../../org/apache/juneau/json/JsonSerializerContext.html" title="class in org.apache.juneau.json">JsonSerializerContext</a>&nbsp;ctx,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonSerializerSession.html#line.53">JsonSerializerSession</a>(<a href="../../../../org/apache/juneau/json/JsonSerializerContext.html" title="class in org.apache.juneau.json">JsonSerializerContext</a>&nbsp;ctx,
                                 <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                                 <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>&nbsp;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>&nbsp;locale,
                                 <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>&nbsp;timeZone,
-                                <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
+                                <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>ctx</code> - The context creating this session object.
- The context contains all the configuration settings for this object.</dd>
+   The context contains all the configuration settings for this object.</dd>
 <dd><code>output</code> - The output object.  See <a href="../../../../org/apache/juneau/json/JsonSerializerSession.html#getWriter--"><code>getWriter()</code></a> for valid class types.</dd>
 <dd><code>op</code> - The override properties.
- These override any context properties defined in the context.</dd>
+   These override any context properties defined in the context.</dd>
 <dd><code>javaMethod</code> - The java method that called this serializer, usually the method in a REST servlet.</dd>
 <dd><code>locale</code> - The session locale.
- If <jk>null</jk>, then the locale defined on the context is used.</dd>
+   If <jk>null</jk>, then the locale defined on the context is used.</dd>
 <dd><code>timeZone</code> - The session timezone.
- If <jk>null</jk>, then the timezone defined on the context is used.</dd>
+   If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -299,7 +303,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isSimpleMode</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonSerializerSession.html#line.69">isSimpleMode</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonSerializerSession.html#line.71">isSimpleMode</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/json/JsonSerializerContext.html#JSON_simpleMode"><code>JsonSerializerContext.JSON_simpleMode</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -313,7 +317,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isEscapeSolidus</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonSerializerSession.html#line.78">isEscapeSolidus</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonSerializerSession.html#line.80">isEscapeSolidus</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/json/JsonSerializerContext.html#JSON_escapeSolidus"><code>JsonSerializerContext.JSON_escapeSolidus</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -327,7 +331,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddBeanTypeProperties</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonSerializerSession.html#line.88">isAddBeanTypeProperties</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonSerializerSession.html#line.90">isAddBeanTypeProperties</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/json/JsonSerializerContext.html#JSON_addBeanTypeProperties"><code>JsonSerializerContext.JSON_addBeanTypeProperties</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -343,7 +347,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getWriter</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonSerializerSession.html#line.93">getWriter</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonSerializerSession.html#line.95">getWriter</a>()
                      throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">SerializerSession</a></code></span></div>
 <div class="block">Wraps the specified output object inside a writer.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/json/JsonWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/JsonWriter.html b/content/site/apidocs/org/apache/juneau/json/JsonWriter.html
index b0137df..45ed5f3 100644
--- a/content/site/apidocs/org/apache/juneau/json/JsonWriter.html
+++ b/content/site/apidocs/org/apache/juneau/json/JsonWriter.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.28">JsonWriter</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.29">JsonWriter</a>
 extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></pre>
 <div class="block">Specialized writer for serializing JSON.
  <p>
@@ -147,7 +147,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#absolutePathUriBase">absolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#out">out</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#quoteChar">quoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#relativeUriBase">relativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#trimStrings">trimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#useWhitespace">useWhitespace</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#absolutePathUriBase">absolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#out">out</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#quoteChar">quoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#relativeUriBase">relativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#trimStrings">trimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#uriContext">uriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#useWhitespace">useWhitespace</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="fields.inherited.from.class.java.io.Writer">
@@ -172,14 +172,15 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/json/JsonWriter.html#JsonWriter-java.io.Writer-boolean-boolean-char-boolean-boolean-java.lang.String-java.lang.String-">JsonWriter</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>&nbsp;out,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/json/JsonWriter.html#JsonWriter-java.io.Writer-boolean-boolean-char-boolean-boolean-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">JsonWriter</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>&nbsp;out,
           boolean&nbsp;useWhitespace,
           boolean&nbsp;escapeSolidus,
           char&nbsp;quoteChar,
           boolean&nbsp;laxMode,
           boolean&nbsp;trimStrings,
           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;relativeUriBase,
-          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase)</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>&nbsp;absolutePathUriBase,
+          <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -334,20 +335,21 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="JsonWriter-java.io.Writer-boolean-boolean-char-boolean-boolean-java.lang.String-java.lang.String-">
+<a name="JsonWriter-java.io.Writer-boolean-boolean-char-boolean-boolean-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>JsonWriter</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.66">JsonWriter</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>&nbsp;out,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.69">JsonWriter</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>&nbsp;out,
                      boolean&nbsp;useWhitespace,
                      boolean&nbsp;escapeSolidus,
                      char&nbsp;quoteChar,
                      boolean&nbsp;laxMode,
                      boolean&nbsp;trimStrings,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;relativeUriBase,
-                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase)</pre>
+                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase,
+                     <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -359,6 +361,8 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <dd><code>trimStrings</code> - If <jk>true</jk>, strings will be trimmed before being serialized.</dd>
 <dd><code>relativeUriBase</code> - The base (e.g. <js>https://localhost:9443/contextPath"</js>) for relative URIs (e.g. <js>"my/path"</js>).</dd>
 <dd><code>absolutePathUriBase</code> - The base (e.g. <js>https://localhost:9443"</js>) for relative URIs with absolute paths (e.g. <js>"/contextPath/my/path"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -376,7 +380,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>stringValue</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.79">stringValue</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.82">stringValue</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)
                        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">Serializes the specified object as a JSON string value.</div>
 <dl>
@@ -395,7 +399,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>attr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.125">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.128">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)
                 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">Serializes the specified object as a JSON attribute name.</div>
 <dl>
@@ -414,7 +418,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>cr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.172">cr</a>(int&nbsp;depth)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.175">cr</a>(int&nbsp;depth)
               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#cr-int-">SerializerWriter</a></code></span></div>
 <div class="block">Performs a carriage return.
@@ -438,7 +442,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.178">appendln</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.181">appendln</a>(int&nbsp;indent,
                            <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendln-int-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -463,7 +467,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.184">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.187">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendln-java.lang.String-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text followed by a newline (if the <code>useWhitespace</code> setting is enabled).</div>
@@ -485,7 +489,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.190">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.193">append</a>(int&nbsp;indent,
                          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-int-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -509,7 +513,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.196">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.199">append</a>(int&nbsp;indent,
                          char&nbsp;c)
                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-int-char-">SerializerWriter</a></code></span></div>
@@ -533,7 +537,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>s</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.202">s</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.205">s</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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#s--">SerializerWriter</a></code></span></div>
 <div class="block">Adds a whitespace character to the output if the <code>useWhitespace</code> setting is enabled.</div>
@@ -553,7 +557,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>q</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.208">q</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.211">q</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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#q--">SerializerWriter</a></code></span></div>
 <div class="block">Adds the quote character specified by the <code>quoteChar</code> setting to the output.</div>
@@ -573,7 +577,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>i</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.214">i</a>(int&nbsp;indent)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.217">i</a>(int&nbsp;indent)
              throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#i-int-">SerializerWriter</a></code></span></div>
 <div class="block">Writes an indent to the writer if the <code>useWhitespace</code> setting is enabled.</div>
@@ -595,7 +599,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>nl</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.220">nl</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.223">nl</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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#nl--">SerializerWriter</a></code></span></div>
 <div class="block">Writes a newline to the writer if the <code>useWhitespace</code> setting is enabled.</div>
@@ -615,7 +619,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.226">append</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>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.229">append</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>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-java.lang.Object-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text to the writer.</div>
@@ -637,7 +641,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.232">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.235">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-java.lang.String-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text to the writer.</div>
@@ -659,7 +663,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendIf</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.238">appendIf</a>(boolean&nbsp;b,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.241">appendIf</a>(boolean&nbsp;b,
                            <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendIf-boolean-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -683,7 +687,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendIf</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.244">appendIf</a>(boolean&nbsp;b,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.247">appendIf</a>(boolean&nbsp;b,
                            char&nbsp;c)
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendIf-boolean-char-">SerializerWriter</a></code></span></div>
@@ -707,7 +711,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockListLast">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.250">append</a>(char&nbsp;c)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/json/JsonWriter.html#line.253">append</a>(char&nbsp;c)
                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParserContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParserContext.html b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParserContext.html
index ed319da..8f36a36 100644
--- a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParserContext.html
+++ b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParserContext.html
@@ -210,7 +210,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserContext.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializer.html b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializer.html
index f1ab7a1..d7738aa 100644
--- a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializer.html
@@ -216,12 +216,13 @@ extends <a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/msgpack/MsgPackSerializerSession.html" title="class in org.apache.juneau.msgpack">MsgPackSerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/msgpack/MsgPackSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/msgpack/MsgPackSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -333,7 +334,7 @@ extends <a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer
 </dl>
 </li>
 </ul>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -344,15 +345,16 @@ extends <a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer
                                               <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>&nbsp;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>&nbsp;locale,
                                               <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>&nbsp;timeZone,
-                                              <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">Serializer</a></code></span></div>
+                                              <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                              <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">Serializer</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
    it's going to be a subclass of <a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><code>SerializerSession</code></a>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>output</code> - The output object.
    <br>Character-based serializers can handle the following output class types:
@@ -375,6 +377,8 @@ extends <a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>
@@ -397,7 +401,7 @@ extends <a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerContext.html b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerContext.html
index dcf2f0a..806fe33 100644
--- a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerContext.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 69293d1..00ca730 100644
--- a/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/msgpack/MsgPackSerializerSession.html
@@ -163,13 +163,14 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/msgpack/MsgPackSerializerSession.html#MsgPackSerializerSession-org.apache.juneau.msgpack.MsgPackSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">MsgPackSerializerSession</a></span>(<a href="../../../../org/apache/juneau/msgpack/MsgPackSerializerContext.html" title="class in org.apache.juneau.msgpack">MsgPackSerializerContext</a>&nbsp;ctx,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/msgpack/MsgPackSerializerSession.html#MsgPackSerializerSession-org.apache.juneau.msgpack.MsgPackSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">MsgPackSerializerSession</a></span>(<a href="../../../../org/apache/juneau/msgpack/MsgPackSerializerContext.html" title="class in org.apache.juneau.msgpack">MsgPackSerializerContext</a>&nbsp;ctx,
                         <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                         <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>&nbsp;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>&nbsp;locale,
                         <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>&nbsp;timeZone,
-                        <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+                        <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                        <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create a new session using properties specified in the context.</div>
 </td>
 </tr>
@@ -206,7 +207,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a hre
 f="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">getWriter</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls-
 -">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">s
 ort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a hre
 f="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getUriContext--">getUriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">getWriter</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps-
 -">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentPropert
 y</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.BeanSession">
@@ -243,33 +244,36 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="MsgPackSerializerSession-org.apache.juneau.msgpack.MsgPackSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="MsgPackSerializerSession-org.apache.juneau.msgpack.MsgPackSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>MsgPackSerializerSession</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html#line.50">MsgPackSerializerSession</a>(<a href="../../../../org/apache/juneau/msgpack/MsgPackSerializerContext.html" title="class in org.apache.juneau.msgpack">MsgPackSerializerContext</a>&nbsp;ctx,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html#line.52">MsgPackSerializerSession</a>(<a href="../../../../org/apache/juneau/msgpack/MsgPackSerializerContext.html" title="class in org.apache.juneau.msgpack">MsgPackSerializerContext</a>&nbsp;ctx,
                                    <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                                    <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>&nbsp;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>&nbsp;locale,
                                    <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>&nbsp;timeZone,
-                                   <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
+                                   <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                   <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>ctx</code> - The context creating this session object.
- The context contains all the configuration settings for this object.</dd>
+   The context contains all the configuration settings for this object.</dd>
 <dd><code>output</code> - The output object.  See <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--"><code>SerializerSession.getOutputStream()</code></a> for valid class types.</dd>
 <dd><code>op</code> - The override properties.
- These override any context properties defined in the context.</dd>
+   These override any context properties defined in the context.</dd>
 <dd><code>javaMethod</code> - The java method that called this serializer, usually the method in a REST servlet.</dd>
 <dd><code>locale</code> - The session locale.
- If <jk>null</jk>, then the locale defined on the context is used.</dd>
+   If <jk>null</jk>, then the locale defined on the context is used.</dd>
 <dd><code>timeZone</code> - The session timezone.
- If <jk>null</jk>, then the timezone defined on the context is used.</dd>
+   If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -287,7 +291,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddBeanTypeProperties</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html#line.65">isAddBeanTypeProperties</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html#line.67">isAddBeanTypeProperties</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/msgpack/MsgPackSerializerContext.html#MSGPACK_addBeanTypeProperties"><code>MsgPackSerializerContext.MSGPACK_addBeanTypeProperties</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -303,7 +307,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getOutputStream</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/msgpack/MsgPackOutputStream.html" title="class in org.apache.juneau.msgpack">MsgPackOutputStream</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html#line.70">getOutputStream</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/msgpack/MsgPackOutputStream.html" title="class in org.apache.juneau.msgpack">MsgPackOutputStream</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html#line.72">getOutputStream</a>()
                                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">SerializerSession</a></code></span></div>
 <div class="block">Wraps the specified output object inside an output stream.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/package-frame.html b/content/site/apidocs/org/apache/juneau/package-frame.html
index dfac8c0..1ab22ae 100644
--- a/content/site/apidocs/org/apache/juneau/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/package-frame.html
@@ -46,9 +46,12 @@
 <li><a href="PropertyNamerDefault.html" title="class in org.apache.juneau" target="classFrame">PropertyNamerDefault</a></li>
 <li><a href="PropertyStore.html" title="class in org.apache.juneau" target="classFrame">PropertyStore</a></li>
 <li><a href="Session.html" title="class in org.apache.juneau" target="classFrame">Session</a></li>
+<li><a href="UriContext.html" title="class in org.apache.juneau" target="classFrame">UriContext</a></li>
 </ul>
 <h2 title="Enums">Enums</h2>
 <ul title="Enums">
+<li><a href="UriRelativity.html" title="enum in org.apache.juneau" target="classFrame">UriRelativity</a></li>
+<li><a href="UriResolution.html" title="enum in org.apache.juneau" target="classFrame">UriResolution</a></li>
 <li><a href="Visibility.html" title="enum in org.apache.juneau" target="classFrame">Visibility</a></li>
 </ul>
 <h2 title="Exceptions">Exceptions</h2>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/package-summary.html b/content/site/apidocs/org/apache/juneau/package-summary.html
index 3f1ec7e..1598046 100644
--- a/content/site/apidocs/org/apache/juneau/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/package-summary.html
@@ -278,6 +278,12 @@
 <div class="block">A one-time-use non-thread-safe object that's meant to be used once and then thrown away.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></td>
+<td class="colLast">
+<div class="block">Represents a URL broken into authority/context-root/servlet-path/path-info parts.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -290,6 +296,18 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a></td>
+<td class="colLast">
+<div class="block">Identifies how relative URIs should resolve against.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a></td>
+<td class="colLast">
+<div class="block">Identifies the possible types of URL resolution.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a></td>
 <td class="colLast">
 <div class="block">Defines class/field/method visibilities.</div>



[23/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/uon/UonWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonWriter.html b/content/site/apidocs/org/apache/juneau/uon/UonWriter.html
index 0592d83..dd61468 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonWriter.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonWriter.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.28">UonWriter</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.29">UonWriter</a>
 extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></pre>
 <div class="block">Specialized writer for serializing UON-encoded text.
  <p>
@@ -147,7 +147,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#absolutePathUriBase">absolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#out">out</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#quoteChar">quoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#relativeUriBase">relativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#trimStrings">trimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#useWhitespace">useWhitespace</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#absolutePathUriBase">absolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#out">out</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#quoteChar">quoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#relativeUriBase">relativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#trimStrings">trimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#uriContext">uriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#useWhitespace">useWhitespace</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="fields.inherited.from.class.java.io.Writer">
@@ -172,13 +172,14 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonWriter.html#UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-java.lang.String-java.lang.String-">UonWriter</a></span>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a>&nbsp;session,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonWriter.html#UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">UonWriter</a></span>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a>&nbsp;session,
          <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>&nbsp;out,
          boolean&nbsp;useWhitespace,
          boolean&nbsp;encodeChars,
          boolean&nbsp;trimStrings,
          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;relativeUriBase,
-         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase)</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>&nbsp;absolutePathUriBase,
+         <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -341,19 +342,20 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-java.lang.String-java.lang.String-">
+<a name="UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>UonWriter</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.58">UonWriter</a>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a>&nbsp;session,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.61">UonWriter</a>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a>&nbsp;session,
                     <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>&nbsp;out,
                     boolean&nbsp;useWhitespace,
                     boolean&nbsp;encodeChars,
                     boolean&nbsp;trimStrings,
                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;relativeUriBase,
-                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase)</pre>
+                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase,
+                    <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -364,6 +366,8 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <dd><code>trimStrings</code> - If <jk>true</jk>, strings should be trimmed before they're serialized.</dd>
 <dd><code>relativeUriBase</code> - The base (e.g. <js>https://localhost:9443/contextPath"</js>) for relative URIs (e.g. <js>"my/path"</js>).</dd>
 <dd><code>absolutePathUriBase</code> - The base (e.g. <js>https://localhost:9443"</js>) for relative URIs with absolute paths (e.g. <js>"/contextPath/my/path"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -381,7 +385,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendObject</h4>
-<pre>public final&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.73">appendObject</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>&nbsp;o,
+<pre>public final&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.76">appendObject</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>&nbsp;o,
                                     boolean&nbsp;isTopAttrName,
                                     boolean&nbsp;plainTextParams)
                              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>
@@ -404,7 +408,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendBoolean</h4>
-<pre>protected&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.131">appendBoolean</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>&nbsp;o)
+<pre>protected&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.134">appendBoolean</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>&nbsp;o)
                            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">Appends a boolean value to the output.</div>
 <dl>
@@ -423,7 +427,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendNumber</h4>
-<pre>protected&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.143">appendNumber</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>&nbsp;o)
+<pre>protected&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.146">appendNumber</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>&nbsp;o)
                           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">Appends a numeric value to the output.</div>
 <dl>
@@ -442,7 +446,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendUri</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.166">appendUri</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>&nbsp;uri)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.169">appendUri</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>&nbsp;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">Appends a URI to the output.</div>
 <dl>
@@ -463,7 +467,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>cr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.189">cr</a>(int&nbsp;depth)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.192">cr</a>(int&nbsp;depth)
              throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#cr-int-">SerializerWriter</a></code></span></div>
 <div class="block">Performs a carriage return.
@@ -487,7 +491,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.195">appendln</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.198">appendln</a>(int&nbsp;indent,
                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendln-int-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -512,7 +516,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.201">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.204">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendln-java.lang.String-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text followed by a newline (if the <code>useWhitespace</code> setting is enabled).</div>
@@ -534,7 +538,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.207">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.210">append</a>(int&nbsp;indent,
                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-int-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -558,7 +562,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.213">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.216">append</a>(int&nbsp;indent,
                         char&nbsp;c)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-int-char-">SerializerWriter</a></code></span></div>
@@ -582,7 +586,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>q</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.219">q</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.222">q</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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#q--">SerializerWriter</a></code></span></div>
 <div class="block">Adds the quote character specified by the <code>quoteChar</code> setting to the output.</div>
@@ -602,7 +606,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>i</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.225">i</a>(int&nbsp;indent)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.228">i</a>(int&nbsp;indent)
             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#i-int-">SerializerWriter</a></code></span></div>
 <div class="block">Writes an indent to the writer if the <code>useWhitespace</code> setting is enabled.</div>
@@ -624,7 +628,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>nl</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.231">nl</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.234">nl</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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#nl--">SerializerWriter</a></code></span></div>
 <div class="block">Writes a newline to the writer if the <code>useWhitespace</code> setting is enabled.</div>
@@ -644,7 +648,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.237">append</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>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.240">append</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>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-java.lang.Object-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text to the writer.</div>
@@ -666,7 +670,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.243">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.246">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-java.lang.String-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text to the writer.</div>
@@ -688,7 +692,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendIf</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.249">appendIf</a>(boolean&nbsp;b,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.252">appendIf</a>(boolean&nbsp;b,
                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendIf-boolean-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -712,7 +716,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendIf</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.255">appendIf</a>(boolean&nbsp;b,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.258">appendIf</a>(boolean&nbsp;b,
                           char&nbsp;c)
                    throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendIf-boolean-char-">SerializerWriter</a></code></span></div>
@@ -736,7 +740,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockListLast">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.261">append</a>(char&nbsp;c)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.264">append</a>(char&nbsp;c)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParserContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParserContext.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParserContext.html
index 9d24a89..23e3132 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParserContext.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingParserContext.html
@@ -214,7 +214,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParserContext.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
index adb2be8..c7e57d6 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
@@ -243,7 +243,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.urlencoding.<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-">serializePart</a></code></li>
+<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-">serializePart</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.uon.UonSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
index 143b13d..aedab97 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
@@ -241,7 +241,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.urlencoding.<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-">serializePart</a></code></li>
+<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-">serializePart</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.uon.UonSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
index 7ff727b..0bfa9e9 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
@@ -362,12 +362,13 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="cl
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -567,7 +568,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="cl
 </dl>
 </li>
 </ul>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -578,15 +579,16 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="cl
                                                   <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>&nbsp;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>&nbsp;locale,
                                                   <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>&nbsp;timeZone,
-                                                  <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">Serializer</a></code></span></div>
+                                                  <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                                  <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">Serializer</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
    it's going to be a subclass of <a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><code>SerializerSession</code></a>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>output</code> - The output object.
    <br>Character-based serializers can handle the following output class types:
@@ -609,6 +611,8 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="cl
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>
@@ -631,7 +635,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="cl
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
index 2b43504..2b74b72 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
@@ -227,7 +227,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" ti
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 5430859..dc5fb9d 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
@@ -166,14 +166,15 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
 <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/urlencoding/UrlEncodingSerializerSession.html#UrlEncodingSerializerSession-org.apache.juneau.urlencoding.UrlEncodingSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">UrlEncodingSerializerSession</a></span>(<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerContext</a>&nbsp;ctx,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#UrlEncodingSerializerSession-org.apache.juneau.urlencoding.UrlEncodingSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">UrlEncodingSerializerSession</a></span>(<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerContext</a>&nbsp;ctx,
                             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>&nbsp;encode,
                             <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                             <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>&nbsp;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>&nbsp;locale,
                             <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>&nbsp;timeZone,
-                            <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+                            <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                            <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create a new session using properties specified in the context.</div>
 </td>
 </tr>
@@ -223,7 +224,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#
 isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Co
 llection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getUriContext--">getUriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTr
 imEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCu
 rrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.BeanSession">
@@ -260,35 +261,38 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="UrlEncodingSerializerSession-org.apache.juneau.urlencoding.UrlEncodingSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="UrlEncodingSerializerSession-org.apache.juneau.urlencoding.UrlEncodingSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>UrlEncodingSerializerSession</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.48">UrlEncodingSerializerSession</a>(<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerContext</a>&nbsp;ctx,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.50">UrlEncodingSerializerSession</a>(<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerContext</a>&nbsp;ctx,
                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>&nbsp;encode,
                                     <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                                     <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>&nbsp;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>&nbsp;locale,
                                     <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>&nbsp;timeZone,
-                                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
+                                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                    <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>ctx</code> - The context creating this session object.
- The context contains all the configuration settings for this object.</dd>
+   The context contains all the configuration settings for this object.</dd>
 <dd><code>encode</code> - Overrides the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_encodeChars"><code>UonSerializerContext.UON_encodeChars</code></a> setting.</dd>
 <dd><code>output</code> - The output object.  See <a href="../../../../org/apache/juneau/json/JsonSerializerSession.html#getWriter--"><code>JsonSerializerSession.getWriter()</code></a> for valid class types.</dd>
 <dd><code>op</code> - The override properties.
- These override any context properties defined in the context.</dd>
+   These override any context properties defined in the context.</dd>
 <dd><code>javaMethod</code> - The java method that called this serializer, usually the method in a REST servlet.</dd>
 <dd><code>locale</code> - The session locale.
- If <jk>null</jk>, then the locale defined on the context is used.</dd>
+   If <jk>null</jk>, then the locale defined on the context is used.</dd>
 <dd><code>timeZone</code> - The session timezone.
- If <jk>null</jk>, then the timezone defined on the context is used.</dd>
+   If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -306,7 +310,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>shouldUseExpandedParams</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.65">shouldUseExpandedParams</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;pMeta)</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.67">shouldUseExpandedParams</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;pMeta)</pre>
 <div class="block">Returns <jk>true</jk> if the specified bean property should be expanded as multiple key-value pairs.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -322,7 +326,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>shouldUseExpandedParams</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.82">shouldUseExpandedParams</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>&nbsp;value)</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.84">shouldUseExpandedParams</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>&nbsp;value)</pre>
 <div class="block">Returns <jk>true</jk> if the specified value should be represented as an expanded parameter list.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -338,7 +342,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
 <ul class="blockListLast">
 <li class="blockList">
 <h4>plainTextParams</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.97">plainTextParams</a>()</pre>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.99">plainTextParams</a>()</pre>
 <div class="block">Returns <jk>true</jk> if the <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat"><code>UrlEncodingSerializerContext.URLENC_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlDocSerializer.Ns.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlDocSerializer.Ns.html b/content/site/apidocs/org/apache/juneau/xml/XmlDocSerializer.Ns.html
index e789308..8641369 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlDocSerializer.Ns.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlDocSerializer.Ns.html
@@ -243,7 +243,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlDocSerializer.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.xml.<a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnythin
 g</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlDocSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlDocSerializer.html b/content/site/apidocs/org/apache/juneau/xml/XmlDocSerializer.html
index b7f76c9..904245c 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlDocSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlDocSerializer.html
@@ -246,7 +246,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.xml.<a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnythin
 g</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">
@@ -329,7 +329,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlParserContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlParserContext.html b/content/site/apidocs/org/apache/juneau/xml/XmlParserContext.html
index b4dc3cb..f2094e3 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlParserContext.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlParserContext.html
@@ -251,7 +251,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserContext.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">


[27/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 db396bb..c96f0fd 100644
--- a/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html
+++ b/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html
@@ -712,7 +712,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>finalize</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.615">finalize</a>()
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.620">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/37ddf434/content/site/apidocs/org/apache/juneau/rest/client/RestClientBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/client/RestClientBuilder.html b/content/site/apidocs/org/apache/juneau/rest/client/RestClientBuilder.html
index 484ddad..3aa9ceb 100644
--- a/content/site/apidocs/org/apache/juneau/rest/client/RestClientBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/rest/client/RestClientBuilder.html
@@ -1155,14 +1155,14 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
 </tr>
 <tr id="i173" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#trimStringsP-boolean-">trimStringsP</a></span>(boolean&nbsp;value)</code>
-<div class="block">Sets the <a href="../../../../../org/apache/juneau/parser/ParserContext.html#PARSER_trimStrings"><code>ParserContext.PARSER_trimStrings</code></a> property on all parsers in this group.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#trimStrings-boolean-">trimStrings</a></span>(boolean&nbsp;value)</code>
+<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings"><code>SerializerContext.SERIALIZER_trimStrings</code></a> property on all serializers in this group.</div>
 </td>
 </tr>
 <tr id="i174" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#trimStringsS-boolean-">trimStringsS</a></span>(boolean&nbsp;value)</code>
-<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings"><code>SerializerContext.SERIALIZER_trimStrings</code></a> property on all serializers in this group.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#trimStringsP-boolean-">trimStringsP</a></span>(boolean&nbsp;value)</code>
+<div class="block">Sets the <a href="../../../../../org/apache/juneau/parser/ParserContext.html#PARSER_trimStrings"><code>ParserContext.PARSER_trimStrings</code></a> property on all parsers in this group.</div>
 </td>
 </tr>
 <tr id="i175" class="rowColor">
@@ -2416,13 +2416,13 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
 </dl>
 </li>
 </ul>
-<a name="trimStringsS-boolean-">
+<a name="trimStrings-boolean-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>trimStringsS</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.939">trimStringsS</a>(boolean&nbsp;value)</pre>
+<h4>trimStrings</h4>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.939">trimStrings</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings"><code>SerializerContext.SERIALIZER_trimStrings</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/serializer/OutputStreamSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/OutputStreamSerializer.html b/content/site/apidocs/org/apache/juneau/serializer/OutputStreamSerializer.html
index 36bcdf5..c1e7b52 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/OutputStreamSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/OutputStreamSerializer.html
@@ -218,7 +218,7 @@ extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../../../org/apache/juneau/seriali
 zer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../..
 /../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</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/37ddf434/content/site/apidocs/org/apache/juneau/serializer/Serializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/Serializer.html b/content/site/apidocs/org/apache/juneau/serializer/Serializer.html
index 1aaf938..5a9f894 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/Serializer.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/Serializer.html
@@ -181,12 +181,13 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -330,7 +331,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
  This method should NOT close the context object.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -373,7 +374,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
 <div class="block">Serialize the specified object using the specified session.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -413,18 +414,19 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
 </dl>
 </li>
 </ul>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createSession</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.188">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>&nbsp;output,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.190">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>&nbsp;output,
                                        <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
                                        <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>&nbsp;timeZone,
-                                       <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
+                                       <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                       <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
@@ -452,6 +454,8 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>
@@ -463,7 +467,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>createSession</h4>
-<pre>protected&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.211">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>&nbsp;output)</pre>
+<pre>protected&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.213">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>&nbsp;output)</pre>
 <div class="block">Create a basic session object without overriding properties or specifying <code>javaMethod</code>.
  <p>
  Equivalent to calling <code>createSession(<jk>null</jk>, <jk>null</jk>)</code>.</div>
@@ -492,7 +496,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>toList</h4>
-<pre>protected static final&nbsp;<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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.228">toList</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>&lt;?&gt;&nbsp;type,
+<pre>protected static final&nbsp;<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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.230">toList</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>&lt;?&gt;&nbsp;type,
                                            <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;array)</pre>
 <div class="block">Converts the contents of the specified object array to a list.
  <p>
@@ -516,7 +520,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getMediaTypes</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.247">getMediaTypes</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.249">getMediaTypes</a>()</pre>
 <div class="block">Returns the media types handled based on the value of the <a href="../../../../org/apache/juneau/annotation/Produces.html" title="annotation in org.apache.juneau.annotation"><code>Produces</code></a> annotation on the serializer class.
  <p>
  This method can be overridden by subclasses to determine the media types programatically.</div>
@@ -532,7 +536,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getPrimaryMediaType</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.256">getPrimaryMediaType</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.258">getPrimaryMediaType</a>()</pre>
 <div class="block">Returns the first media type specified on this serializer via the <a href="../../../../org/apache/juneau/annotation/Produces.html" title="annotation in org.apache.juneau.annotation"><code>Produces</code></a> annotation.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -546,7 +550,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getResponseHeaders</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.272">getResponseHeaders</a>(<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;properties)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.274">getResponseHeaders</a>(<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;properties)</pre>
 <div class="block">Optional method that specifies HTTP request headers for this serializer.
  <p>
  For example, <a href="../../../../org/apache/juneau/soap/SoapXmlSerializer.html" title="class in org.apache.juneau.soap"><code>SoapXmlSerializer</code></a> needs to set a <code>SOAPAction</code> header.
@@ -568,7 +572,7 @@ extends <a href="../../../../org/apache/juneau/CoreObject.html" title="class in
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getResponseContentType</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.288">getResponseContentType</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/Serializer.html#line.290">getResponseContentType</a>()</pre>
 <div class="block">Optional method that returns the response <code>Content-Type</code> for this serializer if it is different from the matched media type.
  <p>
  This method is specified to override the content type for this serializer.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/serializer/SerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/SerializerContext.html b/content/site/apidocs/org/apache/juneau/serializer/SerializerContext.html
index 754df54..3311570 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/SerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/SerializerContext.html
@@ -292,7 +292,7 @@ extends <a href="../../../../org/apache/juneau/BeanContext.html" title="class in
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">


[29/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 0bf0cd5..4d24028 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};
+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 tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -465,36 +465,42 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 </td>
 </tr>
 <tr id="i49" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestRequest.html#getUriContext--">getUriContext</a></span>()</code>
+<div class="block">Returns the URI context of the request.</div>
+</td>
+</tr>
+<tr id="i50" 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>&nbsp;path)</code>
 <div class="block">Returns a resolved URL.</div>
 </td>
 </tr>
-<tr id="i50" class="altColor">
+<tr id="i51" 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="i51" 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/rest/RestRequest.html#isPlainText--">isPlainText</a></span>()</code>
 <div class="block">Returns <jk>true</jk> if <code>&amp;plainText=true</code> was specified as a URL parameter.</div>
 </td>
 </tr>
-<tr id="i52" class="altColor">
+<tr id="i53" 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#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>&nbsp;input)</code>
 <div class="block">Shortcut for calling <code>getVarResolverSession().resolve(input)</code>.</div>
 </td>
 </tr>
-<tr id="i53" class="rowColor">
+<tr id="i54" class="altColor">
 <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>&nbsp;charset)</code>
 <div class="block">Sets the charset to expect on the request body.</div>
 </td>
 </tr>
-<tr id="i54" class="altColor">
+<tr id="i55" 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#toString--">toString</a></span>()</code>&nbsp;</td>
 </tr>
@@ -547,7 +553,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&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.202">getDescription</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.203">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>
@@ -561,7 +567,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&nbsp;<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.227">getProperties</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.228">getProperties</a>()</pre>
 <div class="block">Retrieve the properties active for this request.
  <p>
  These properties can be modified by the request.</div>
@@ -577,7 +583,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&nbsp;<a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.241">getHeaders</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.242">getHeaders</a>()</pre>
 <div class="block">Returns the headers on this request.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -591,7 +597,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&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.246">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>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.247">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>&nbsp;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#getHeader-java.lang.String-" title="class or interface in javax.servlet.http">getHeader</a></code>&nbsp;in interface&nbsp;<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>
@@ -606,7 +612,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&nbsp;<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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.251">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>&nbsp;name)</pre>
+<pre>public&nbsp;<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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.252">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>&nbsp;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>&nbsp;in interface&nbsp;<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>
@@ -621,7 +627,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&nbsp;<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>&lt;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.263">getSupportedMediaTypes</a>()</pre>
+<pre>public&nbsp;<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>&lt;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.264">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>
@@ -635,7 +641,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&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.271">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>&nbsp;charset)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.272">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>&nbsp;charset)</pre>
 <div class="block">Sets the charset to expect on the request body.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -651,7 +657,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&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.279">getCharacterEncoding</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.280">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>
@@ -667,7 +673,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&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.299">getLocale</a>()</pre>
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.300">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>&nbsp;in interface&nbsp;<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>
@@ -682,7 +688,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&nbsp;<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>&lt;<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>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.310">getLocales</a>()</pre>
+<pre>public&nbsp;<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>&lt;<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>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.311">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>&nbsp;in interface&nbsp;<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>
@@ -697,7 +703,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getQuery</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestQuery.html" title="class in org.apache.juneau.rest">RequestQuery</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.338">getQuery</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestQuery.html" title="class in org.apache.juneau.rest">RequestQuery</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.339">getQuery</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.
@@ -715,7 +721,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getQuery</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.347">getQuery</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.348">getQuery</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Shortcut for calling <code>getQuery().getFirst(name)</code>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -731,7 +737,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getFormData</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestFormData.html" title="class in org.apache.juneau.rest">RequestFormData</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.361">getFormData</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestFormData.html" title="class in org.apache.juneau.rest">RequestFormData</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.362">getFormData</a>()</pre>
 <div class="block">Retrieves the URL-encoded form data from the request if the body has already been cached locally.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -745,7 +751,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getFormData</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.387">getFormData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.388">getFormData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Shortcut for calling <code>getFormData().getFirst(name)</code>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -761,7 +767,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getPathMatch</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestPathMatch.html" title="class in org.apache.juneau.rest">RequestPathMatch</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.401">getPathMatch</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestPathMatch.html" title="class in org.apache.juneau.rest">RequestPathMatch</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.402">getPathMatch</a>()</pre>
 <div class="block">Retrieves the URL-encoded form data from the request if the body has already been cached locally.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -775,7 +781,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getBody</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestBody.html" title="class in org.apache.juneau.rest">RequestBody</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.415">getBody</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestBody.html" title="class in org.apache.juneau.rest">RequestBody</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.416">getBody</a>()</pre>
 <div class="block">Returns the body of this HTTP request.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -789,7 +795,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getReader</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.427">getReader</a>()
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.428">getReader</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 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>.
  <p>
@@ -812,7 +818,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getInputStream</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletInputStream.html?is-external=true" title="class or interface in javax.servlet">ServletInputStream</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.441">getInputStream</a>()
+<pre>public&nbsp;<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletInputStream.html?is-external=true" title="class or interface in javax.servlet">ServletInputStream</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.442">getInputStream</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 HTTP body content as 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>.
  <p>
@@ -830,13 +836,30 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 </dl>
 </li>
 </ul>
+<a name="getUriContext--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUriContext</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.463">getUriContext</a>()</pre>
+<div class="block">Returns the URI context of the request.
+ <p>
+ The URI context contains all the information about the URI of the request, such
+ as the servlet URI, context path, etc...</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The URI context of the request.</dd>
+</dl>
+</li>
+</ul>
 <a name="getPathInfoUndecoded--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getPathInfoUndecoded</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.459">getPathInfoUndecoded</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.476">getPathInfoUndecoded</a>()</pre>
 <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>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -850,7 +873,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getPathInfoParts</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.472">getPathInfoParts</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.489">getPathInfoParts</a>()</pre>
 <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.
  <p>
  If path info is <jk>null</jk>, returns an empty list.
@@ -868,7 +891,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getURL</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.504">getURL</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.521">getURL</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)
            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/net/MalformedURLException.html?is-external=true" title="class or interface in java.net">MalformedURLException</a></pre>
 <div class="block">Returns a resolved URL.
  <p>
@@ -893,7 +916,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getServletParentURI</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.517">getServletParentURI</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.534">getServletParentURI</a>()</pre>
 <div class="block">Returns the URI of the parent of this servlet.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -907,7 +930,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getRequestParentURI</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.561">getRequestParentURI</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.578">getRequestParentURI</a>()</pre>
 <div class="block">Returns the URI of the parent resource.
  <p>
  Trailing slashes in the path are ignored by this method.
@@ -955,7 +978,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getTrimmedRequestURI</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.576">getTrimmedRequestURI</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.593">getTrimmedRequestURI</a>()</pre>
 <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>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -969,7 +992,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getTrimmedRequestURL</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.585">getTrimmedRequestURL</a>()</pre>
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.602">getTrimmedRequestURL</a>()</pre>
 <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>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -983,7 +1006,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getServletURI</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.594">getServletURI</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.611">getServletURI</a>()</pre>
 <div class="block">Gets the URI of the servlet (e.g. <js>"https://localhost:9080/contextPath/servletPath"</js>).</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -997,7 +1020,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getRelativeServletURI</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.609">getRelativeServletURI</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.626">getRelativeServletURI</a>()</pre>
 <div class="block">Gets the path-absolute relative URI of the servlet (e.g. <js>"/contextPath/servletPath"</js>).</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1011,7 +1034,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getServletURIBuilder</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.620">getServletURIBuilder</a>()</pre>
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.637">getServletURIBuilder</a>()</pre>
 <div class="block">Returns a <code>StringBuffer</code> prefilled with the string <code><js>"/[contextPath]/[servletPath]"</js></code>.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1025,7 +1048,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getServletTitle</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.636">getServletTitle</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.653">getServletTitle</a>()</pre>
 <div class="block">Returns the localized servlet title.
  <p>
  Equivalent to calling <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html#getTitle-org.apache.juneau.rest.RestRequest-"><code>RestInfoProvider.getTitle(RestRequest)</code></a> with this object.</div>
@@ -1041,7 +1064,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getServletDescription</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.647">getServletDescription</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.664">getServletDescription</a>()</pre>
 <div class="block">Returns the localized servlet description.
  <p>
  Equivalent to calling <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html#getDescription-org.apache.juneau.rest.RestRequest-"><code>RestInfoProvider.getDescription(RestRequest)</code></a> with this object.</div>
@@ -1057,7 +1080,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getMethodSummary</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.658">getMethodSummary</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.675">getMethodSummary</a>()</pre>
 <div class="block">Returns the localized method summary.
  <p>
  Equivalent to calling <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html#getMethodSummary-java.lang.String-org.apache.juneau.rest.RestRequest-"><code>RestInfoProvider.getMethodSummary(String, RestRequest)</code></a> with this object.</div>
@@ -1073,7 +1096,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getMethodDescription</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.669">getMethodDescription</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.686">getMethodDescription</a>()</pre>
 <div class="block">Returns the localized method description.
  <p>
  Equivalent to calling <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html#getMethodDescription-java.lang.String-org.apache.juneau.rest.RestRequest-"><code>RestInfoProvider.getMethodDescription(String, RestRequest)</code></a> with this object.</div>
@@ -1089,7 +1112,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getPageTitle</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.678">getPageTitle</a>()</pre>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.695">getPageTitle</a>()</pre>
 <div class="block">Returns the localized page title for HTML views.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1103,7 +1126,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getPageText</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.695">getPageText</a>()</pre>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.712">getPageText</a>()</pre>
 <div class="block">Returns the localized page text for HTML views.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1117,7 +1140,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getPageLinks</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.714">getPageLinks</a>()</pre>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.731">getPageLinks</a>()</pre>
 <div class="block">Returns the localized page links for HTML views.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1131,7 +1154,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&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.733">getSerializerGroup</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.750">getSerializerGroup</a>()</pre>
 <div class="block">Returns the serializers associated with this request.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1145,7 +1168,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getParserGroup</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/parser/ParserGroup.html" title="class in org.apache.juneau.parser">ParserGroup</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.742">getParserGroup</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/parser/ParserGroup.html" title="class in org.apache.juneau.parser">ParserGroup</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.759">getParserGroup</a>()</pre>
 <div class="block">Returns the parsers associated with this request.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1159,7 +1182,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getMethod</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.753">getMethod</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.770">getMethod</a>()</pre>
 <div class="block">Returns the method of this request.
  <p>
  If <code>allowHeaderParams</code> init parameter is <jk>true</jk>, then first looks for <code>&amp;method=xxx</code> in the URL query string.</div>
@@ -1177,7 +1200,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getHttpMethod</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/http/HttpMethod.html" title="enum in org.apache.juneau.http">HttpMethod</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.764">getHttpMethod</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/http/HttpMethod.html" title="enum in org.apache.juneau.http">HttpMethod</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.781">getHttpMethod</a>()</pre>
 <div class="block">Returns the HTTP 1.1 method name of the request as an enum.
  <p>
  Note that non-RFC2616 method names resolve as <a href="../../../../org/apache/juneau/http/HttpMethod.html#OTHER"><code>HttpMethod.OTHER</code></a>.</div>
@@ -1193,7 +1216,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getContentLength</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.769">getContentLength</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.786">getContentLength</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#getContentLength--" title="class or interface in javax.servlet">getContentLength</a></code>&nbsp;in interface&nbsp;<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>
@@ -1208,7 +1231,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>isPlainText</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.787">isPlainText</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.804">isPlainText</a>()</pre>
 <div class="block">Returns <jk>true</jk> if <code>&amp;plainText=true</code> was specified as a URL parameter.
  <p>
  This indicates that the <code>Content-Type</code> of the output should always be set to <js>"text/plain"</js>
@@ -1227,7 +1250,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getMessage</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.798">getMessage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.815">getMessage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key,
                          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;args)</pre>
 <div class="block">Shortcut method for calling <a href="../../../../org/apache/juneau/utils/MessageBundle.html#getString-java.util.Locale-java.lang.String-java.lang.Object...-"><code>MessageBundle.getString(Locale, String, Object...)</code></a> based on the request locale.</div>
 <dl>
@@ -1245,7 +1268,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getResourceBundle</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.807">getResourceBundle</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.824">getResourceBundle</a>()</pre>
 <div class="block">Returns the resource bundle for the request locale.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1259,7 +1282,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getContext</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.819">getContext</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.836">getContext</a>()</pre>
 <div class="block">Returns the servlet handling the request.
  <p>
  Can be used to access servlet-init parameters or annotations during requests,
@@ -1276,7 +1299,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getJavaMethod</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.837">getJavaMethod</a>()</pre>
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.854">getJavaMethod</a>()</pre>
 <div class="block">Returns the java method handling the request.
  <p>
  Can be used to access the method name or method annotations during requests, such
@@ -1299,7 +1322,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getBeanSession</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.846">getBeanSession</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.863">getBeanSession</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau"><code>BeanSession</code></a> associated with this request.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1313,7 +1336,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getVarResolverSession</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.855">getVarResolverSession</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.872">getVarResolverSession</a>()</pre>
 <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>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1327,7 +1350,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>resolveVars</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.867">resolveVars</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;input)</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.884">resolveVars</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;input)</pre>
 <div class="block">Shortcut for calling <code>getVarResolverSession().resolve(input)</code>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1343,7 +1366,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getReaderResource</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.881">getReaderResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.898">getReaderResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                         boolean&nbsp;resolveVars,
                                         <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)
                                  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>
@@ -1367,7 +1390,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getReaderResource</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.901">getReaderResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.918">getReaderResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                         boolean&nbsp;resolveVars)
                                  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="../../../../org/apache/juneau/rest/RestRequest.html#getReaderResource-java.lang.String-boolean-org.apache.juneau.http.MediaType-"><code>getReaderResource(String, boolean, MediaType)</code></a> except uses the resource mime-type map
@@ -1390,7 +1413,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getReaderResource</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.912">getReaderResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.929">getReaderResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                                  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="../../../../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>
 <dl>
@@ -1409,7 +1432,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getConfigFile</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.921">getConfigFile</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.938">getConfigFile</a>()</pre>
 <div class="block">Returns the config file associated with the servlet.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1423,7 +1446,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getSwagger</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.932">getSwagger</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.949">getSwagger</a>()</pre>
 <div class="block">Returns the localized swagger associated with the servlet.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1437,7 +1460,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockList">
 <li class="blockList">
 <h4>getSwaggerFromFile</h4>
-<pre>protected&nbsp;<a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.948">getSwaggerFromFile</a>()</pre>
+<pre>protected&nbsp;<a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.965">getSwaggerFromFile</a>()</pre>
 <div class="block">Returns the localized Swagger from the file system.
  <p>
  Looks for a file called <js>"{ServletClass}_{locale}.json"</js> in the same package
@@ -1456,7 +1479,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
 <ul class="blockListLast">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.957">toString</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.974">toString</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#toString--" title="class or interface in java.lang">toString</a></code>&nbsp;in class&nbsp;<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>


[37/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 eb88ff3..1b35563 100644
--- a/content/site/apidocs/org/apache/juneau/BeanContext.html
+++ b/content/site/apidocs/org/apache/juneau/BeanContext.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":9,"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};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":9,"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 tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -674,19 +674,25 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
 </td>
 </tr>
 <tr id="i15" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</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>&nbsp;o)</code>
+<div class="block">Returns <jk>true</jk> if the specified object is a bean.</div>
+</td>
+</tr>
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>protected boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</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>&lt;?&gt;&nbsp;c)</code>
 <div class="block">Determines whether the specified class is ignored as a bean class based on the various
    exclusion parameters specified on this context class.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanContext.html#object--">object</a></span>()</code>
 <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>.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>protected &lt;T&gt;&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;T&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a></span>(<a href="../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">BeanProperty</a>&nbsp;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>&nbsp;t,
@@ -695,7 +701,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
    may be present.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanContext.html#string--">string</a></span>()</code>
 <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>.</div>
@@ -1762,13 +1768,29 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
 </dl>
 </li>
 </ul>
+<a name="isBean-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isBean</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1008">isBean</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>&nbsp;o)</pre>
+<div class="block">Returns <jk>true</jk> if the specified object is a bean.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>o</code> - The object to test.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if the specified object is a bean.  <jk>false</jk> if the bean is <jk>null</jk>.</dd>
+</dl>
+</li>
+</ul>
 <a name="dumpCacheStats--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>dumpCacheStats</h4>
-<pre>protected static&nbsp;void&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1005">dumpCacheStats</a>()</pre>
+<pre>protected static&nbsp;void&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1017">dumpCacheStats</a>()</pre>
 <div class="block">Prints meta cache statistics to <code>System.out</code>.</div>
 </li>
 </ul>
@@ -1778,7 +1800,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
 <ul class="blockList">
 <li class="blockList">
 <h4>getBeanMeta</h4>
-<pre>public final&nbsp;&lt;T&gt;&nbsp;<a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a>&lt;T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1024">getBeanMeta</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>&lt;T&gt;&nbsp;c)</pre>
+<pre>public final&nbsp;&lt;T&gt;&nbsp;<a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a>&lt;T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1036">getBeanMeta</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>&lt;T&gt;&nbsp;c)</pre>
 <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>
 <dl>
 <dt><span class="paramLabel">Type Parameters:</span></dt>
@@ -1797,7 +1819,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
 <ul class="blockList">
 <li class="blockList">
 <h4>getClassMeta</h4>
-<pre>public final&nbsp;&lt;T&gt;&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1038">getClassMeta</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>&lt;T&gt;&nbsp;type)</pre>
+<pre>public final&nbsp;&lt;T&gt;&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1050">getClassMeta</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>&lt;T&gt;&nbsp;type)</pre>
 <div class="block">Construct 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>
 <dl>
 <dt><span class="paramLabel">Type Parameters:</span></dt>
@@ -1816,7 +1838,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
 <ul class="blockList">
 <li class="blockList">
 <h4>getClassMeta</h4>
-<pre>public final&nbsp;&lt;T&gt;&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1092">getClassMeta</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>&nbsp;type,
+<pre>public final&nbsp;&lt;T&gt;&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1104">getClassMeta</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>&nbsp;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>...&nbsp;args)</pre>
 <div class="block">Used to resolve <code>ClassMetas</code> of type <code>Collection</code> and <code>Map</code> that have
  <code>ClassMeta</code> values that themselves could be collections or maps.
@@ -1858,7 +1880,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&nbsp;&lt;T&gt;&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1276">getClassMetaForObject</a>(T&nbsp;o)</pre>
+<pre>public final&nbsp;&lt;T&gt;&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1288">getClassMetaForObject</a>(T&nbsp;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 +1898,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&nbsp;&lt;T&gt;&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1295">resolveClassMeta</a>(<a href="../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">BeanProperty</a>&nbsp;p,
+<pre>protected final&nbsp;&lt;T&gt;&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1307">resolveClassMeta</a>(<a href="../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">BeanProperty</a>&nbsp;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>&nbsp;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>&lt;<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>&lt;?&gt;,<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>&lt;?&gt;[]&gt;&nbsp;typeVarImpls)</pre>
 <div class="block">Used for determining the class type on a method or field where a <code>@BeanProperty</code> annotation
@@ -1901,7 +1923,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&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1398">getBeanTypePropertyName</a>()</pre>
+<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1410">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 +1937,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&nbsp;<a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a>&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1407">getBeanRegistry</a>()</pre>
+<pre>protected final&nbsp;<a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a>&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1419">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 +1951,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&nbsp;&lt;T&gt;&nbsp;<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>&lt;? extends T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1419">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>&lt;T&gt;&nbsp;c,
+<pre>protected final&nbsp;&lt;T&gt;&nbsp;<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>&lt;? extends T&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1431">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>&lt;T&gt;&nbsp;c,
                                                                      <a href="../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;v)</pre>
 <div class="block">Gets the no-arg constructor for the specified class.</div>
 <dl>
@@ -1949,7 +1971,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&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1466">object</a>()</pre>
+<pre>protected final&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1478">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 +1991,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&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1480">string</a>()</pre>
+<pre>protected final&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1492">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 +2010,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&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<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>&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1494">_class</a>()</pre>
+<pre>protected final&nbsp;<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<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>&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1506">_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 +2029,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&nbsp;int&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1499">hashCode</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1511">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>&nbsp;in class&nbsp;<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 +2042,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&nbsp;boolean&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1504">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>&nbsp;o)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1516">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>&nbsp;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>&nbsp;in class&nbsp;<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 +2055,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&nbsp;<a href="../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1513">asMap</a>()</pre>
+<pre>public&nbsp;<a href="../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1525">asMap</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<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/37ddf434/content/site/apidocs/org/apache/juneau/BeanMap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/BeanMap.html b/content/site/apidocs/org/apache/juneau/BeanMap.html
index 7f6c57f..fd73d3f 100644
--- a/content/site/apidocs/org/apache/juneau/BeanMap.html
+++ b/content/site/apidocs/org/apache/juneau/BeanMap.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};
+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};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -361,6 +361,13 @@ implements <a href="../../../org/apache/juneau/Delegate.html" title="interface i
 <div class="block">Sets a property on the bean.</div>
 </td>
 </tr>
+<tr id="i17" 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/BeanMap.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>&nbsp;s)</code>
+<div class="block">Given a string containing variables of the form <code>"{property}"</code>, replaces those variables with
+ property values in this bean.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.util.AbstractMap">
@@ -823,13 +830,30 @@ implements <a href="../../../org/apache/juneau/Delegate.html" title="interface i
 </dl>
 </li>
 </ul>
+<a name="resolveVars-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>resolveVars</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/BeanMap.html#line.449">resolveVars</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<div class="block">Given a string containing variables of the form <code>"{property}"</code>, replaces those variables with
+ property values in this bean.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>s</code> - The string containing variables.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A new string with variables replaced, or the same string if no variables were found.</dd>
+</dl>
+</li>
+</ul>
 <a name="getProperties--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getProperties</h4>
-<pre>protected&nbsp;<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>&lt;<a href="../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanMap.html#line.446">getProperties</a>()</pre>
+<pre>protected&nbsp;<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>&lt;<a href="../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanMap.html#line.457">getProperties</a>()</pre>
 <div class="block">Returns a simple collection of properties for this bean map.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -843,7 +867,7 @@ implements <a href="../../../org/apache/juneau/Delegate.html" title="interface i
 <ul class="blockListLast">
 <li class="blockList">
 <h4>entrySet</h4>
-<pre>public&nbsp;<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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a>&lt;<a href="http://docs.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>&gt;&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanMap.html#line.455">entrySet</a>()</pre>
+<pre>public&nbsp;<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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a>&lt;<a href="http://docs.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>&gt;&gt;&nbsp;<a href="../../../src-html/org/apache/juneau/BeanMap.html#line.466">entrySet</a>()</pre>
 <div class="block">Returns all the properties associated with the bean.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/BeanProxyInvocationHandler.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/BeanProxyInvocationHandler.html b/content/site/apidocs/org/apache/juneau/BeanProxyInvocationHandler.html
index 7e9376d..fe2cadd 100644
--- a/content/site/apidocs/org/apache/juneau/BeanProxyInvocationHandler.html
+++ b/content/site/apidocs/org/apache/juneau/BeanProxyInvocationHandler.html
@@ -116,7 +116,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a href="../../../src-html/org/apache/juneau/BeanProxyInvocationHandler.html#line.26">BeanProxyInvocationHandler</a>&lt;T&gt;
+<pre>public class <a href="../../../src-html/org/apache/juneau/BeanProxyInvocationHandler.html#line.28">BeanProxyInvocationHandler</a>&lt;T&gt;
 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/reflect/InvocationHandler.html?is-external=true" title="class or interface in java.lang.reflect">InvocationHandler</a></pre>
 <div class="block">Provides an <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"><code>InvocationHandler</code></a> for creating beans from bean interfaces.
@@ -196,7 +196,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/I
 <ul class="blockListLast">
 <li class="blockList">
 <h4>BeanProxyInvocationHandler</h4>
-<pre>public&nbsp;<a href="../../../src-html/org/apache/juneau/BeanProxyInvocationHandler.html#line.36">BeanProxyInvocationHandler</a>(<a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a>&lt;<a href="../../../org/apache/juneau/BeanProxyInvocationHandler.html" title="type parameter in BeanProxyInvocationHandler">T</a>&gt;&nbsp;meta)</pre>
+<pre>public&nbsp;<a href="../../../src-html/org/apache/juneau/BeanProxyInvocationHandler.html#line.38">BeanProxyInvocationHandler</a>(<a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a>&lt;<a href="../../../org/apache/juneau/BeanProxyInvocationHandler.html" title="type parameter in BeanProxyInvocationHandler">T</a>&gt;&nbsp;meta)</pre>
 <div class="block">Constructs with the specified <a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau"><code>BeanMeta</code></a>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -218,7 +218,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/I
 <ul class="blockListLast">
 <li class="blockList">
 <h4>invoke</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../src-html/org/apache/juneau/BeanProxyInvocationHandler.html#line.45">invoke</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>&nbsp;proxy,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../src-html/org/apache/juneau/BeanProxyInvocationHandler.html#line.47">invoke</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>&nbsp;proxy,
                      <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>&nbsp;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>[]&nbsp;args)</pre>
 <div class="block">Implemented to handle the method called.</div>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/Streamable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/Streamable.html b/content/site/apidocs/org/apache/juneau/Streamable.html
index b5ddb18..955f401 100644
--- a/content/site/apidocs/org/apache/juneau/Streamable.html
+++ b/content/site/apidocs/org/apache/juneau/Streamable.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../org/apache/juneau/Session.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../index.html?org/apache/juneau/Streamable.html" target="_top">Frames</a></li>
@@ -213,7 +213,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../org/apache/juneau/Session.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../index.html?org/apache/juneau/Streamable.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/UriContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/UriContext.html b/content/site/apidocs/org/apache/juneau/UriContext.html
new file mode 100644
index 0000000..0986fa6
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/UriContext.html
@@ -0,0 +1,643 @@
+<!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>UriContext (Apache Juneau (incubating) 6.2.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="UriContext (Apache Juneau (incubating) 6.2.1-incubating-SNAPSHOT)";
+        }
+    }
+    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};
+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/Streamable.html" title="interface in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?org/apache/juneau/UriContext.html" target="_top">Frames</a></li>
+<li><a href="UriContext.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.juneau</div>
+<h2 title="Class UriContext" class="title">Class UriContext</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.UriContext</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/UriContext.html#line.50">UriContext</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 URL broken into authority/context-root/servlet-path/path-info parts.
+ <p>
+ A typical request against a URL takes the following form:
+ <p class='bcode'>
+   http://host:port/context-root/servlet-path/path-info
+   |   authority   |  context   |  resource  |  path  |
+  +--------------------------------------------------+
+ </p>
+ <p>
+ This class allows you to convert URL strings to absolute (e.g. <js>"http://host:port/foo/bar"</js>) or root-relative
+   (e.g. <js>"/foo/bar"</js>) URLs.
+ <p>
+ Two special protocols are used to represent context-root-relative and servlet-relative URIs:
+   <js>"context:/"</js> and <js>"servlet:/"</js>.
+
+ The following list shows the types of URLs that can be resolved with this class:
+ <ul>
+   <li><js>"foo://foo"</js> - Absolute URI.
+   <li><js>"/foo"</js> - Root-relative URI.
+   <li><js>"/"</js> - Root URI.
+   <li><js>"context:/foo"</js> - Context-root-relative URI.
+   <li><js>"context:/"</js> - Context-root URI.
+   <li><js>"servlet:/foo"</js> - Servlet-path-relative URI.
+   <li><js>"servlet:/"</js> - Servlet-path URI.
+   <li><js>"foo"</js> - Path-info-relative URI.
+   <li><js>""</js> - Path-info URI.
+ </ul>
+
+ The following class shows how</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">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriContext.html#UriContext-java.lang.String-java.lang.String-java.lang.String-java.lang.String-">UriContext</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>&nbsp;authority,
+          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;contextRoot,
+          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;servletPath,
+          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pathInfo)</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">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Appendable.html?is-external=true" title="class or interface in java.lang">Appendable</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriContext.html#appendAbsolute-java.lang.Appendable-java.lang.String-">appendAbsolute</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Appendable.html?is-external=true" title="class or interface in java.lang">Appendable</a>&nbsp;a,
+              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uri)</code>
+<div class="block">Same as <a href="../../../org/apache/juneau/UriContext.html#resolveAbsolute-java.lang.String-"><code>resolveAbsolute(String)</code></a> except appends result to the specified appendable.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Appendable.html?is-external=true" title="class or interface in java.lang">Appendable</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriContext.html#appendRootRelative-java.lang.Appendable-java.lang.String-">appendRootRelative</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Appendable.html?is-external=true" title="class or interface in java.lang">Appendable</a>&nbsp;a,
+                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uri)</code>
+<div class="block">Same as <a href="../../../org/apache/juneau/UriContext.html#resolveRootRelative-java.lang.String-"><code>resolveRootRelative(String)</code></a> except appends result to the specified appendable.</div>
+</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/UriContext.html#getAbsoluteAuthority--">getAbsoluteAuthority</a></span>()</code>
+<div class="block">Returns the absolute URI of just the authority portion of this URI 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/UriContext.html#getAbsoluteContextRoot--">getAbsoluteContextRoot</a></span>()</code>
+<div class="block">Returns the absolute URI of the context-root portion of this URI 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/UriContext.html#getAbsolutePathInfo--">getAbsolutePathInfo</a></span>()</code>
+<div class="block">Returns the absolute URI of the path portion of this URI context.</div>
+</td>
+</tr>
+<tr id="i5" 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/UriContext.html#getAbsolutePathInfoParent--">getAbsolutePathInfoParent</a></span>()</code>
+<div class="block">Returns the parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getAbsolutePathInfo--"><code>getAbsolutePathInfo()</code></a>.</div>
+</td>
+</tr>
+<tr id="i6" 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/UriContext.html#getAbsoluteServletPath--">getAbsoluteServletPath</a></span>()</code>
+<div class="block">Returns the absolute URI of the resource portion of this URI context.</div>
+</td>
+</tr>
+<tr id="i7" 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/UriContext.html#getAbsoluteServletPathParent--">getAbsoluteServletPathParent</a></span>()</code>
+<div class="block">Returns the parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getAbsoluteServletPath--"><code>getAbsoluteServletPath()</code></a>.</div>
+</td>
+</tr>
+<tr id="i8" 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/UriContext.html#getRootRelativeContextRoot--">getRootRelativeContextRoot</a></span>()</code>
+<div class="block">Returns the root-relative URI of the context portion of this URI context.</div>
+</td>
+</tr>
+<tr id="i9" 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/UriContext.html#getRootRelativePathInfo--">getRootRelativePathInfo</a></span>()</code>
+<div class="block">Returns the root-relative URI of the path portion of this URI context.</div>
+</td>
+</tr>
+<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/UriContext.html#getRootRelativePathInfoParent--">getRootRelativePathInfoParent</a></span>()</code>
+<div class="block">Returns the parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getRootRelativePathInfo--"><code>getRootRelativePathInfo()</code></a>.</div>
+</td>
+</tr>
+<tr id="i11" 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/UriContext.html#getRootRelativeServletPath--">getRootRelativeServletPath</a></span>()</code>
+<div class="block">Returns the root-relative URI of the resource portion of this URI context.</div>
+</td>
+</tr>
+<tr id="i12" 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/UriContext.html#getRootRelativeServletPathParent--">getRootRelativeServletPathParent</a></span>()</code>
+<div class="block">Returns the parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getRootRelativeServletPath--"><code>getRootRelativeServletPath()</code></a>.</div>
+</td>
+</tr>
+<tr id="i13" 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/UriContext.html#resolveAbsolute-java.lang.String-">resolveAbsolute</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>&nbsp;uri)</code>
+<div class="block">Converts the specified URI to absolute form based on values in this context.</div>
+</td>
+</tr>
+<tr id="i14" 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/UriContext.html#resolveRootRelative-java.lang.String-">resolveRootRelative</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>&nbsp;uri)</code>
+<div class="block">Converts the specified URI to root-relative form based on values in this context.</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&nbsp;java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://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">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="UriContext-java.lang.String-java.lang.String-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UriContext</h4>
+<pre>public&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.70">UriContext</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;authority,
+                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;contextRoot,
+                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;servletPath,
+                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pathInfo)</pre>
+<div class="block">Constructor.
+ <p>
+ Leading and trailing slashes are trimmed of all parameters.
+ <p>
+ Any parameter can be <jk>null</jk>.  Blanks and nulls are equivalent.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>authority</code> - - The authority portion of URL (e.g. <js>"http://hostname:port"</js>)</dd>
+<dd><code>contextRoot</code> - - The context root of the application (e.g. <js>"/context-root"</js>, or <js>"context-root"</js>)</dd>
+<dd><code>servletPath</code> - - The servlet path (e.g. <js>"/servlet-path"</js>, or <js>"servlet-path"</js>)</dd>
+<dd><code>pathInfo</code> - - The path info (e.g. <js>"/path-info"</js>, or <js>"path-info"</js>)</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="getAbsoluteAuthority--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAbsoluteAuthority</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.88">getAbsoluteAuthority</a>()</pre>
+<div class="block">Returns the absolute URI of just the authority portion of this URI context.
+ <p>
+ Example:  <js>"http://hostname:port"</js>
+ <p>
+ If the authority is null/empty, returns <js>"/"</js>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The absolute URI of just the authority portion of this URI context.
+   Never <jk>null</jk>.</dd>
+</dl>
+</li>
+</ul>
+<a name="getAbsoluteContextRoot--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAbsoluteContextRoot</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.100">getAbsoluteContextRoot</a>()</pre>
+<div class="block">Returns the absolute URI of the context-root portion of this URI context.
+ <p>
+ Example:  <js>"http://hostname:port/context-root"</js></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The absolute URI of the context-root portion of this URI context.
+   Never <jk>null</jk>.</dd>
+</dl>
+</li>
+</ul>
+<a name="getRootRelativeContextRoot--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRootRelativeContextRoot</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.118">getRootRelativeContextRoot</a>()</pre>
+<div class="block">Returns the root-relative URI of the context portion of this URI context.
+ <p>
+ Example:  <js>"/context-root"</js></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The root-relative URI of the context portion of this URI context.
+   Never <jk>null</jk>.</dd>
+</dl>
+</li>
+</ul>
+<a name="getAbsoluteServletPath--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAbsoluteServletPath</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.132">getAbsoluteServletPath</a>()</pre>
+<div class="block">Returns the absolute URI of the resource portion of this URI context.
+ <p>
+ Example:  <js>"http://hostname:port/context-root/servlet-path"</js></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The absolute URI of the resource portion of this URI context.
+   Never <jk>null</jk>.</dd>
+</dl>
+</li>
+</ul>
+<a name="getRootRelativeServletPath--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRootRelativeServletPath</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.154">getRootRelativeServletPath</a>()</pre>
+<div class="block">Returns the root-relative URI of the resource portion of this URI context.
+ <p>
+ Example:  <js>"/context-root/servlet-path"</js></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The root-relative URI of the resource portion of this URI context.
+   Never <jk>null</jk>.</dd>
+</dl>
+</li>
+</ul>
+<a name="getAbsoluteServletPathParent--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAbsoluteServletPathParent</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.169">getAbsoluteServletPathParent</a>()</pre>
+<div class="block">Returns the parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getAbsoluteServletPath--"><code>getAbsoluteServletPath()</code></a>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getAbsoluteServletPath--"><code>getAbsoluteServletPath()</code></a>.</dd>
+</dl>
+</li>
+</ul>
+<a name="getRootRelativeServletPathParent--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRootRelativeServletPathParent</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.178">getRootRelativeServletPathParent</a>()</pre>
+<div class="block">Returns the parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getRootRelativeServletPath--"><code>getRootRelativeServletPath()</code></a>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getRootRelativeServletPath--"><code>getRootRelativeServletPath()</code></a>.</dd>
+</dl>
+</li>
+</ul>
+<a name="getAbsolutePathInfo--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAbsolutePathInfo</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.190">getAbsolutePathInfo</a>()</pre>
+<div class="block">Returns the absolute URI of the path portion of this URI context.
+ <p>
+ Example:  <js>"http://hostname:port/context-root/servlet-path/path-info"</js></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The absolute URI of the path portion of this URI context.
+   Never <jk>null</jk>.</dd>
+</dl>
+</li>
+</ul>
+<a name="getRootRelativePathInfo--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRootRelativePathInfo</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.219">getRootRelativePathInfo</a>()</pre>
+<div class="block">Returns the root-relative URI of the path portion of this URI context.
+ <p>
+ Example:  <js>"/context-root/servlet-path/path-info"</js></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The root-relative URI of the path portion of this URI context.
+   Never <jk>null</jk>.</dd>
+</dl>
+</li>
+</ul>
+<a name="getAbsolutePathInfoParent--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAbsolutePathInfoParent</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.241">getAbsolutePathInfoParent</a>()</pre>
+<div class="block">Returns the parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getAbsolutePathInfo--"><code>getAbsolutePathInfo()</code></a>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getAbsolutePathInfo--"><code>getAbsolutePathInfo()</code></a>.</dd>
+</dl>
+</li>
+</ul>
+<a name="getRootRelativePathInfoParent--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRootRelativePathInfoParent</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.250">getRootRelativePathInfoParent</a>()</pre>
+<div class="block">Returns the parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getRootRelativePathInfo--"><code>getRootRelativePathInfo()</code></a>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The parent of the URL returned by <a href="../../../org/apache/juneau/UriContext.html#getRootRelativePathInfo--"><code>getRootRelativePathInfo()</code></a>.</dd>
+</dl>
+</li>
+</ul>
+<a name="resolveAbsolute-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>resolveAbsolute</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.260">resolveAbsolute</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uri)</pre>
+<div class="block">Converts the specified URI to absolute form based on values in this context.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>uri</code> - The URI to convert to absolute form.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The converted URI.</dd>
+</dl>
+</li>
+</ul>
+<a name="resolveRootRelative-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>resolveRootRelative</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.272">resolveRootRelative</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uri)</pre>
+<div class="block">Converts the specified URI to root-relative form based on values in this context.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>uri</code> - The URI to convert to root-relative form.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The converted URI.</dd>
+</dl>
+</li>
+</ul>
+<a name="appendAbsolute-java.lang.Appendable-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>appendAbsolute</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Appendable.html?is-external=true" title="class or interface in java.lang">Appendable</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.287">appendAbsolute</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Appendable.html?is-external=true" title="class or interface in java.lang">Appendable</a>&nbsp;a,
+                                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uri)</pre>
+<div class="block">Same as <a href="../../../org/apache/juneau/UriContext.html#resolveAbsolute-java.lang.String-"><code>resolveAbsolute(String)</code></a> except appends result to the specified appendable.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>a</code> - The appendable to append the URL to.</dd>
+<dd><code>uri</code> - The URI to convert to absolute form.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The same appendable passed in.</dd>
+</dl>
+</li>
+</ul>
+<a name="appendRootRelative-java.lang.Appendable-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>appendRootRelative</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Appendable.html?is-external=true" title="class or interface in java.lang">Appendable</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriContext.html#line.360">appendRootRelative</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Appendable.html?is-external=true" title="class or interface in java.lang">Appendable</a>&nbsp;a,
+                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uri)</pre>
+<div class="block">Same as <a href="../../../org/apache/juneau/UriContext.html#resolveRootRelative-java.lang.String-"><code>resolveRootRelative(String)</code></a> except appends result to the specified appendable.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>a</code> - The appendable to append the URL to.</dd>
+<dd><code>uri</code> - The URI to convert to root-relative form.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The same appendable passed in.</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/Streamable.html" title="interface in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?org/apache/juneau/UriContext.html" target="_top">Frames</a></li>
+<li><a href="UriContext.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 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/37ddf434/content/site/apidocs/org/apache/juneau/UriRelativity.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/UriRelativity.html b/content/site/apidocs/org/apache/juneau/UriRelativity.html
new file mode 100644
index 0000000..2c67b62
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/UriRelativity.html
@@ -0,0 +1,347 @@
+<!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>UriRelativity (Apache Juneau (incubating) 6.2.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="UriRelativity (Apache Juneau (incubating) 6.2.1-incubating-SNAPSHOT)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static 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/UriContext.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?org/apache/juneau/UriRelativity.html" target="_top">Frames</a></li>
+<li><a href="UriRelativity.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.juneau</div>
+<h2 title="Enum UriRelativity" class="title">Enum UriRelativity</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><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">java.lang.Enum</a>&lt;<a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>org.apache.juneau.UriRelativity</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a>&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public enum <a href="../../../src-html/org/apache/juneau/UriRelativity.html#line.18">UriRelativity</a>
+extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a>&gt;</pre>
+<div class="block">Identifies how relative URIs should resolve against.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!--   -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriRelativity.html#PATH_INFO">PATH_INFO</a></span></code>
+<div class="block">Relative URIs should be considered relative to the request URI.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriRelativity.html#RESOURCE">RESOURCE</a></span></code>
+<div class="block">Relative URIs should be considered relative to the servlet URI.</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">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriRelativity.html#valueOf-java.lang.String-">valueOf</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>&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/UriRelativity.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a></h3>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.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/Enum.html?is-external=true#compareTo-E-" title="class or interface in java.lang">compareTo</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.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/Enum.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/Enum.html?is-external=true#getDeclaringClass--" title="class or interface in java.lang">getDeclaringClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.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/Enum.html?is-external=true#name--" title="class or interface in java.lang">name</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true#ordinal--" title="class or interface in java.lang">ordinal</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.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/Enum.html?is-external=true#valueOf-java.lang.Class-java.lang.String-" title="class or interface in java.lang">valueOf</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#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#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>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!--   -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="RESOURCE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESOURCE</h4>
+<pre>public static final&nbsp;<a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a> <a href="../../../src-html/org/apache/juneau/UriRelativity.html#line.23">RESOURCE</a></pre>
+<div class="block">Relative URIs should be considered relative to the servlet URI.</div>
+</li>
+</ul>
+<a name="PATH_INFO">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>PATH_INFO</h4>
+<pre>public static final&nbsp;<a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a> <a href="../../../src-html/org/apache/juneau/UriRelativity.html#line.28">PATH_INFO</a></pre>
+<div class="block">Relative URIs should be considered relative to the request URI.</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="values--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a>[]&nbsp;<a href="../../../src-html/org/apache/juneau/UriRelativity.html#line.18">values</a>()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (UriRelativity c : UriRelativity.values())
+&nbsp;   System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a>&nbsp;<a href="../../../src-html/org/apache/juneau/UriRelativity.html#line.18">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><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></code> - if this enum type has no constant with the specified name</dd>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/NullPointerException.html?is-external=true" title="class or interface in java.lang">NullPointerException</a></code> - if the argument is null</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/UriContext.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?org/apache/juneau/UriRelativity.html" target="_top">Frames</a></li>
+<li><a href="UriRelativity.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
+</body>
+</html>



[02/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
index 67db679..6ca79f3 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
@@ -58,157 +58,159 @@
 <span class="sourceLineNo">050</span>    * Create a new session using properties specified in the context.<a name="line.50"></a>
 <span class="sourceLineNo">051</span>    *<a name="line.51"></a>
 <span class="sourceLineNo">052</span>    * @param ctx The context creating this session object.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    * The context contains all the configuration settings for this object.<a name="line.53"></a>
+<span class="sourceLineNo">053</span>    *    The context contains all the configuration settings for this object.<a name="line.53"></a>
 <span class="sourceLineNo">054</span>    * @param output The output object.  See {@link JsonSerializerSession#getWriter()} for valid class types.<a name="line.54"></a>
 <span class="sourceLineNo">055</span>    * @param op The override properties.<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    * These override any context properties defined in the context.<a name="line.56"></a>
+<span class="sourceLineNo">056</span>    *    These override any context properties defined in the context.<a name="line.56"></a>
 <span class="sourceLineNo">057</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.57"></a>
 <span class="sourceLineNo">058</span>    * @param locale The session locale.<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.59"></a>
+<span class="sourceLineNo">059</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.59"></a>
 <span class="sourceLineNo">060</span>    * @param timeZone The session timezone.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.61"></a>
+<span class="sourceLineNo">061</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.61"></a>
 <span class="sourceLineNo">062</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    */<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   public XmlSerializerSession(XmlSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      if (op == null || op.isEmpty()) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>         enableNamespaces = ctx.enableNamespaces;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>         autoDetectNamespaces = ctx.autoDetectNamespaces;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>         addNamespaceUrlsToRoot = ctx.addNamespaceUrlsToRoot;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>         addNamespaces(ctx.namespaces);<a name="line.70"></a>
-<span class="sourceLineNo">071</span>         defaultNamespace = findDefaultNamespace(ctx.defaultNamespace);<a name="line.71"></a>
-<span class="sourceLineNo">072</span>         xsNamespace = ctx.xsNamespace;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      } else {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>         enableNamespaces = op.getBoolean(XML_enableNamespaces, ctx.enableNamespaces);<a name="line.75"></a>
-<span class="sourceLineNo">076</span>         autoDetectNamespaces = op.getBoolean(XML_autoDetectNamespaces, ctx.autoDetectNamespaces);<a name="line.76"></a>
-<span class="sourceLineNo">077</span>         addNamespaceUrlsToRoot = op.getBoolean(XML_addNamespaceUrisToRoot, ctx.addNamespaceUrlsToRoot);<a name="line.77"></a>
-<span class="sourceLineNo">078</span>         namespaces = (op.containsKey(XML_namespaces) ? parseNamespaces(op.get(XML_namespaces)) : ctx.namespaces);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>         defaultNamespace = findDefaultNamespace(op.containsKey(XML_defaultNamespace) ? op.getString(XML_defaultNamespace) : ctx.defaultNamespace);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>         xsNamespace = (op.containsKey(XML_xsNamespace) ? parseNamespace(op.get(XML_xsNamespace)) : ctx.xsNamespace);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>         addBeanTypeProperties = op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<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><a name="line.84"></a>
-<span class="sourceLineNo">085</span>   private static Namespace findDefaultNamespace(String s) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      if (s == null)<a name="line.86"></a>
-<span class="sourceLineNo">087</span>         return null;<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      if (StringUtils.startsWith(s, '{'))<a name="line.88"></a>
-<span class="sourceLineNo">089</span>         return parseNamespace(s);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      if (! s.startsWith("http://"))<a name="line.90"></a>
-<span class="sourceLineNo">091</span>         return get(s, "http://unknown");<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      return get(null, s);<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>   private void addNamespaces(Namespace...namespaces) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      for (Namespace ns : namespaces)<a name="line.96"></a>
-<span class="sourceLineNo">097</span>         addNamespace(ns);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   }<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>    * Add a namespace to this session.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    *<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    * @param ns The namespace being added.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    */<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   public void addNamespace(Namespace ns) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      if (ns == defaultNamespace)<a name="line.106"></a>
-<span class="sourceLineNo">107</span>         return;<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>      for (Namespace n : namespaces)<a name="line.109"></a>
-<span class="sourceLineNo">110</span>         if (n == ns)<a name="line.110"></a>
-<span class="sourceLineNo">111</span>            return;<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>      if (defaultNamespace != null &amp;&amp; (ns.uri.equals(defaultNamespace.uri) || ns.name.equals(defaultNamespace.name)))<a name="line.113"></a>
-<span class="sourceLineNo">114</span>         defaultNamespace = ns;<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      else<a name="line.115"></a>
-<span class="sourceLineNo">116</span>         namespaces = ArrayUtils.append(namespaces, ns);<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>   /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    * Returns the list of namespaces being used in the current XML serialization.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    *<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    * @return The list of namespaces being used in the current XML serialization.<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    */<a name="line.123"></a>
-<span class="sourceLineNo">124</span>   public Namespace[] getNamespaces() {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      return namespaces;<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>    * Returns the {@link XmlSerializerContext#XML_autoDetectNamespaces} setting value in this context.<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    *<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    * @return The {@link XmlSerializerContext#XML_autoDetectNamespaces} setting value in this context.<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    */<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   public final boolean isAutoDetectNamespaces() {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      return enableNamespaces &amp;&amp; autoDetectNamespaces;<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>   /**<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    * Returns the {@link XmlSerializerContext#XML_enableNamespaces} setting value in this context.<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    *<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    * @return The {@link XmlSerializerContext#XML_enableNamespaces} setting value in this context.<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    */<a name="line.141"></a>
-<span class="sourceLineNo">142</span>   public final boolean isEnableNamespaces() {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      return enableNamespaces;<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>    * Returns the {@link XmlSerializerContext#XML_addNamespaceUrisToRoot} setting value in this context.<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    *<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    * @return The {@link XmlSerializerContext#XML_addNamespaceUrisToRoot} setting value in this context.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    */<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   public final boolean isAddNamespaceUrlsToRoot() {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      return addNamespaceUrlsToRoot;<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>   /**<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    * Returns the {@link XmlSerializerContext#XML_addBeanTypeProperties} setting value for this session.<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    *<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    * @return The {@link XmlSerializerContext#XML_addBeanTypeProperties} setting value for this session.<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    */<a name="line.159"></a>
-<span class="sourceLineNo">160</span>   @Override /* SerializerSession */<a name="line.160"></a>
-<span class="sourceLineNo">161</span>   public boolean isAddBeanTypeProperties() {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      return addBeanTypeProperties;<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 the {@link XmlSerializerContext#XML_defaultNamespace} setting value in this context.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    *<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    * @return The {@link XmlSerializerContext#XML_defaultNamespace} setting value in this context.<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    */<a name="line.169"></a>
-<span class="sourceLineNo">170</span>   public final Namespace getDefaultNamespace() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      return defaultNamespace;<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   }<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>    * Returns the {@link XmlSerializerContext#XML_xsNamespace} setting value in this context.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    *<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    * @return The {@link XmlSerializerContext#XML_xsNamespace} setting value in this context.<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    */<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   public final Namespace getXsNamespace() {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      return xsNamespace;<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>   /**<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if we're serializing HTML.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    * &lt;p&gt;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    * The difference in behavior is how empty non-void elements are handled.<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    * The XML serializer will produce a collapsed tag, whereas the HTML serializer<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    * will produce a start and end tag.<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    *<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if we're generating HTML.<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    */<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   public boolean isHtmlMode() {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      return false;<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>   @Override /* SerializerSession */<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   public XmlWriter getWriter() throws Exception {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      Object output = getOutput();<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      if (output instanceof XmlWriter)<a name="line.199"></a>
-<span class="sourceLineNo">200</span>         return (XmlWriter)output;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      return new XmlWriter(super.getWriter(), isUseWhitespace(), isTrimStrings(), getQuoteChar(), getRelativeUriBase(), getAbsolutePathUriBase(), isEnableNamespaces(), getDefaultNamespace());<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">063</span>    * @param uriContext The URI context.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    */<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   public XmlSerializerSession(XmlSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      if (op == null || op.isEmpty()) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>         enableNamespaces = ctx.enableNamespaces;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>         autoDetectNamespaces = ctx.autoDetectNamespaces;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>         addNamespaceUrlsToRoot = ctx.addNamespaceUrlsToRoot;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>         addNamespaces(ctx.namespaces);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>         defaultNamespace = findDefaultNamespace(ctx.defaultNamespace);<a name="line.73"></a>
+<span class="sourceLineNo">074</span>         xsNamespace = ctx.xsNamespace;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      } else {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>         enableNamespaces = op.getBoolean(XML_enableNamespaces, ctx.enableNamespaces);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>         autoDetectNamespaces = op.getBoolean(XML_autoDetectNamespaces, ctx.autoDetectNamespaces);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>         addNamespaceUrlsToRoot = op.getBoolean(XML_addNamespaceUrisToRoot, ctx.addNamespaceUrlsToRoot);<a name="line.79"></a>
+<span class="sourceLineNo">080</span>         namespaces = (op.containsKey(XML_namespaces) ? parseNamespaces(op.get(XML_namespaces)) : ctx.namespaces);<a name="line.80"></a>
+<span class="sourceLineNo">081</span>         defaultNamespace = findDefaultNamespace(op.containsKey(XML_defaultNamespace) ? op.getString(XML_defaultNamespace) : ctx.defaultNamespace);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>         xsNamespace = (op.containsKey(XML_xsNamespace) ? parseNamespace(op.get(XML_xsNamespace)) : ctx.xsNamespace);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>         addBeanTypeProperties = op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<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>   private static Namespace findDefaultNamespace(String s) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      if (s == null)<a name="line.88"></a>
+<span class="sourceLineNo">089</span>         return null;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      if (StringUtils.startsWith(s, '{'))<a name="line.90"></a>
+<span class="sourceLineNo">091</span>         return parseNamespace(s);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      if (! s.startsWith("http://"))<a name="line.92"></a>
+<span class="sourceLineNo">093</span>         return get(s, "http://unknown");<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      return get(null, s);<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>   private void addNamespaces(Namespace...namespaces) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      for (Namespace ns : namespaces)<a name="line.98"></a>
+<span class="sourceLineNo">099</span>         addNamespace(ns);<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>   /**<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    * Add a namespace to this session.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    *<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    * @param ns The namespace being added.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    */<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   public void addNamespace(Namespace ns) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      if (ns == defaultNamespace)<a name="line.108"></a>
+<span class="sourceLineNo">109</span>         return;<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>      for (Namespace n : namespaces)<a name="line.111"></a>
+<span class="sourceLineNo">112</span>         if (n == ns)<a name="line.112"></a>
+<span class="sourceLineNo">113</span>            return;<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>      if (defaultNamespace != null &amp;&amp; (ns.uri.equals(defaultNamespace.uri) || ns.name.equals(defaultNamespace.name)))<a name="line.115"></a>
+<span class="sourceLineNo">116</span>         defaultNamespace = ns;<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      else<a name="line.117"></a>
+<span class="sourceLineNo">118</span>         namespaces = ArrayUtils.append(namespaces, ns);<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>    * Returns the list of namespaces being used in the current XML serialization.<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    *<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    * @return The list of namespaces being used in the current XML serialization.<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    */<a name="line.125"></a>
+<span class="sourceLineNo">126</span>   public Namespace[] getNamespaces() {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      return namespaces;<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>   /**<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    * Returns the {@link XmlSerializerContext#XML_autoDetectNamespaces} setting value in this context.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    *<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    * @return The {@link XmlSerializerContext#XML_autoDetectNamespaces} setting value in this context.<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    */<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   public final boolean isAutoDetectNamespaces() {<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      return enableNamespaces &amp;&amp; autoDetectNamespaces;<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>    * Returns the {@link XmlSerializerContext#XML_enableNamespaces} setting value in this context.<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    *<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    * @return The {@link XmlSerializerContext#XML_enableNamespaces} setting value in this context.<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    */<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   public final boolean isEnableNamespaces() {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      return enableNamespaces;<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>   /**<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    * Returns the {@link XmlSerializerContext#XML_addNamespaceUrisToRoot} setting value in this context.<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    *<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    * @return The {@link XmlSerializerContext#XML_addNamespaceUrisToRoot} setting value in this context.<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    */<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   public final boolean isAddNamespaceUrlsToRoot() {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      return addNamespaceUrlsToRoot;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>   /**<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    * Returns the {@link XmlSerializerContext#XML_addBeanTypeProperties} setting value for this session.<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    *<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    * @return The {@link XmlSerializerContext#XML_addBeanTypeProperties} setting value for this session.<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    */<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   @Override /* SerializerSession */<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   public boolean isAddBeanTypeProperties() {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      return addBeanTypeProperties;<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>    * Returns the {@link XmlSerializerContext#XML_defaultNamespace} setting value in this context.<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    *<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    * @return The {@link XmlSerializerContext#XML_defaultNamespace} setting value in this context.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    */<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   public final Namespace getDefaultNamespace() {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      return defaultNamespace;<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>    * Returns the {@link XmlSerializerContext#XML_xsNamespace} setting value in this context.<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    *<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    * @return The {@link XmlSerializerContext#XML_xsNamespace} setting value in this context.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    */<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   public final Namespace getXsNamespace() {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      return xsNamespace;<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if we're serializing HTML.<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    * &lt;p&gt;<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    * The difference in behavior is how empty non-void elements are handled.<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    * The XML serializer will produce a collapsed tag, whereas the HTML serializer<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    * will produce a start and end tag.<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    *<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if we're generating HTML.<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    */<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   public boolean isHtmlMode() {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      return false;<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>   @Override /* SerializerSession */<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   public XmlWriter getWriter() throws Exception {<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      Object output = getOutput();<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      if (output instanceof XmlWriter)<a name="line.201"></a>
+<span class="sourceLineNo">202</span>         return (XmlWriter)output;<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      return new XmlWriter(super.getWriter(), isUseWhitespace(), isTrimStrings(), getQuoteChar(), getRelativeUriBase(), getAbsolutePathUriBase(), getUriContext(), isEnableNamespaces(), getDefaultNamespace());<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   }<a name="line.204"></a>
+<span class="sourceLineNo">205</span>}<a name="line.205"></a>
 
 
 


[38/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/index-all.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/index-all.html b/content/site/apidocs/index-all.html
index 7dd074f..08a2416 100644
--- a/content/site/apidocs/index-all.html
+++ b/content/site/apidocs/index-all.html
@@ -1141,6 +1141,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlWriter.html#append-char-">append(char)</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>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#appendAbsolute-java.lang.Appendable-java.lang.String-">appendAbsolute(Appendable, String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Same as <a href="org/apache/juneau/UriContext.html#resolveAbsolute-java.lang.String-"><code>UriContext.resolveAbsolute(String)</code></a> except appends result to the specified appendable.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/ObjectMap.html#appendAll-java.util.Map-">appendAll(Map&lt;String, Object&gt;)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a></dt>
 <dd>
 <div class="block">Convenience method for adding a contents of another map to this map.</div>
@@ -1216,6 +1220,10 @@
 <dd>
 <div class="block">Serializes the specified simple object as a UON string value.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#appendRootRelative-java.lang.Appendable-java.lang.String-">appendRootRelative(Appendable, String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Same as <a href="org/apache/juneau/UriContext.html#resolveRootRelative-java.lang.String-"><code>UriContext.resolveRootRelative(String)</code></a> except appends result to the specified appendable.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerWriter.html#appendUri-java.lang.Object-">appendUri(Object)</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></dt>
 <dd>
 <div class="block">Appends the specified object as a URI.</div>
@@ -4896,27 +4904,27 @@
 <dd>
 <div class="block">Create a new bean session based on the properties defined on this context.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlDocSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html">HtmlDocSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlDocSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html">HtmlDocSerializer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlParser.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.http.MediaType-">createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</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>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlSchemaDocSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html">HtmlSchemaDocSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlSchemaDocSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html">HtmlSchemaDocSerializer</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><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.http.MediaType-">createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</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>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena">RdfSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena">RdfSerializer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><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.http.MediaType-">createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</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>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/json/JsonSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.json.<a href="org/apache/juneau/json/JsonSchemaSerializer.html" title="class in org.apache.juneau.json">JsonSchemaSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/json/JsonSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.json.<a href="org/apache/juneau/json/JsonSchemaSerializer.html" title="class in org.apache.juneau.json">JsonSchemaSerializer</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.json.<a href="org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/json/JsonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.json.<a href="org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/msgpack/MsgPackParser.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.http.MediaType-">createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</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>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/msgpack/MsgPackSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.msgpack.<a href="org/apache/juneau/msgpack/MsgPackSerializer.html" title="class in org.apache.juneau.msgpack">MsgPackSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/msgpack/MsgPackSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.msgpack.<a href="org/apache/juneau/msgpack/MsgPackSerializer.html" title="class in org.apache.juneau.msgpack">MsgPackSerializer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><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.http.MediaType-">createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</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>
@@ -4926,7 +4934,7 @@
 <dd>
 <div class="block">Create a basic session object without overriding properties or specifying <code>javaMethod</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></dt>
 <dd>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </dd>
@@ -4944,17 +4952,17 @@
 </dd>
 <dt><span class="memberNameLink"><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.http.MediaType-">createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</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>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingParser.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.http.MediaType-">createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</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>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlParser.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.http.MediaType-">createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)</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>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlSchemaSerializer.html" title="class in org.apache.juneau.xml">XmlSchemaSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlSchemaSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlSchemaSerializer.html" title="class in org.apache.juneau.xml">XmlSchemaSerializer</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/FileUtils.html#createTempFile-java.lang.String-">createTempFile(String)</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>
@@ -5057,7 +5065,7 @@
 <dd>
 <div class="block">Session object that lives for the duration of a single use of <a href="org/apache/juneau/csv/CsvSerializer.html" title="class in org.apache.juneau.csv"><code>CsvSerializer</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/csv/CsvSerializerSession.html#CsvSerializerSession-org.apache.juneau.csv.CsvSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">CsvSerializerSession(CsvSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType)</a></span> - Constructor for class org.apache.juneau.csv.<a href="org/apache/juneau/csv/CsvSerializerSession.html" title="class in org.apache.juneau.csv">CsvSerializerSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/csv/CsvSerializerSession.html#CsvSerializerSession-org.apache.juneau.csv.CsvSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">CsvSerializerSession(CsvSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Constructor for class org.apache.juneau.csv.<a href="org/apache/juneau/csv/CsvSerializerSession.html" title="class in org.apache.juneau.csv">CsvSerializerSession</a></dt>
 <dd>
 <div class="block">Create a new session using properties specified in the context.</div>
 </dd>
@@ -7704,10 +7712,34 @@
 <div class="block">Get the <a href="org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml"><code>Namespace</code></a> with the specified name and URI, and create a new one
    if this is the first time it's been encountered.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#getAbsoluteAuthority--">getAbsoluteAuthority()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Returns the absolute URI of just the authority portion of this URI context.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#getAbsoluteContextRoot--">getAbsoluteContextRoot()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Returns the absolute URI of the context-root portion of this URI context.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#getAbsolutePathInfo--">getAbsolutePathInfo()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Returns the absolute URI of the path portion of this URI context.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#getAbsolutePathInfoParent--">getAbsolutePathInfoParent()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Returns the parent of the URL returned by <a href="org/apache/juneau/UriContext.html#getAbsolutePathInfo--"><code>UriContext.getAbsolutePathInfo()</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></dt>
 <dd>
 <div class="block">Returns the <a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_absolutePathUriBase"><code>SerializerContext.SERIALIZER_absolutePathUriBase</code></a> setting value for this session.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#getAbsoluteServletPath--">getAbsoluteServletPath()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Returns the absolute URI of the resource portion of this URI context.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#getAbsoluteServletPathParent--">getAbsoluteServletPathParent()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Returns the parent of the URL returned by <a href="org/apache/juneau/UriContext.html#getAbsoluteServletPath--"><code>UriContext.getAbsoluteServletPath()</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestHeaders.html#getAccept--">getAccept()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></dt>
 <dd>
 <div class="block">Returns the <code>Accept</code> header on the request.</div>
@@ -7900,6 +7932,10 @@
 <dd>
 <div class="block">The name of the property that returns a map of XML attributes as key/value pairs.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#getAuthorityUri-java.lang.String-">getAuthorityUri(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">Given an absolute URI, returns just the authority portion (e.g.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestHeaders.html#getAuthorization--">getAuthorization()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></dt>
 <dd>
 <div class="block">Returns the <code>Authorization</code> header on the request.</div>
@@ -8417,6 +8453,10 @@
 <dd>
 <div class="block">Returns the content of this entry.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlRender.html#getContent-org.apache.juneau.serializer.SerializerSession-T-">getContent(SerializerSession, T)</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html">HtmlRender</a></dt>
+<dd>
+<div class="block">Returns the delegate value for the specified bean property value.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestRequestEntity.html#getContent--">getContent()</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestRequestEntity.html" title="class in org.apache.juneau.rest.client">RestRequestEntity</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlBeanMeta.html#getContentFormat--">getContentFormat()</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlBeanMeta.html" title="class in org.apache.juneau.xml">XmlBeanMeta</a></dt>
@@ -9270,6 +9310,10 @@
 <dd>
 <div class="block">Returns the current line number position in this reader.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlBeanPropertyMeta.html#getLink--">getLink()</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlBeanPropertyMeta.html" title="class in org.apache.juneau.html">HtmlBeanPropertyMeta</a></dt>
+<dd>
+<div class="block">Adds a hyperlink to this value in HTML.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/atom/CommonEntry.html#getLinks--">getLinks()</a></span> - Method in class org.apache.juneau.dto.atom.<a href="org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom">CommonEntry</a></dt>
 <dd>
 <div class="block">Returns the list of links of this object.</div>
@@ -10137,6 +10181,10 @@
 <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>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/remoteable/RemoteableMethodMeta.html#getPathArgs--">getPathArgs()</a></span> - Method in class org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/RemoteableMethodMeta.html" title="class in org.apache.juneau.remoteable">RemoteableMethodMeta</a></dt>
+<dd>
+<div class="block">Returns the <a href="org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable"><code>@Path</code></a> annotated arguments on this Java method.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getPathInfoParts--">getPathInfoParts()</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 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>
@@ -10520,6 +10568,10 @@
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/rest/client/RestClient.html#getRemoteableProxy-java.lang.Class-java.lang.Object-"><code>RestClient.getRemoteableProxy(Class, Object)</code></a> but allows you to override the serializer and parser used.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlBeanPropertyMeta.html#getRender--">getRender()</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlBeanPropertyMeta.html" title="class in org.apache.juneau.html">HtmlBeanPropertyMeta</a></dt>
+<dd>
+<div class="block">Returns the render class for rendering the style and contents of this property value in HTML.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#getRequest--">getRequest()</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">Returns access to the <code>HttpUriRequest</code> passed to <code>HttpClient.execute(HttpUriRequest)</code>.</div>
@@ -10704,6 +10756,26 @@
 <dd>
 <div class="block">Returns the root property.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#getRootRelativeContextRoot--">getRootRelativeContextRoot()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Returns the root-relative URI of the context portion of this URI context.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#getRootRelativePathInfo--">getRootRelativePathInfo()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Returns the root-relative URI of the path portion of this URI context.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#getRootRelativePathInfoParent--">getRootRelativePathInfoParent()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Returns the parent of the URL returned by <a href="org/apache/juneau/UriContext.html#getRootRelativePathInfo--"><code>UriContext.getRootRelativePathInfo()</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#getRootRelativeServletPath--">getRootRelativeServletPath()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Returns the root-relative URI of the resource portion of this URI context.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#getRootRelativeServletPathParent--">getRootRelativeServletPathParent()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Returns the parent of the URL returned by <a href="org/apache/juneau/UriContext.html#getRootRelativeServletPath--"><code>UriContext.getRootRelativeServletPath()</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/utils/ProcBuilder.html#getScanner--">getScanner()</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">Returns the output from this process as a <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Scanner.html?is-external=true" title="class or interface in java.util"><code>Scanner</code></a>.</div>
@@ -10980,6 +11052,10 @@
 <dd>
 <div class="block">Creates a reusable <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang"><code>StringBuilder</code></a> object from an internal pool.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlRender.html#getStyle-org.apache.juneau.serializer.SerializerSession-T-">getStyle(SerializerSession, T)</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html">HtmlRender</a></dt>
+<dd>
+<div class="block">Returns the CSS style of the element containing the bean property value.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestContext.html#getStyleSheet--">getStyleSheet()</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 stylesheet for use in the HTML views of the resource.</div>
@@ -11321,6 +11397,14 @@
 <dd>
 <div class="block">Returns the namespace URI.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getUriContext--">getUriContext()</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 URI context of the request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerSession.html#getUriContext--">getUriContext()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></dt>
+<dd>
+<div class="block">Returns the URI context passed in to this constructor.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Contact.html#getUrl--">getUrl()</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Contact.html" title="class in org.apache.juneau.dto.swagger">Contact</a></dt>
 <dd>
 <div class="block">Bean property getter:  <property>url</property>.</div>
@@ -12155,7 +12239,7 @@
 <dd>
 <div class="block">Context object that lives for the duration of a single serialization of <a href="org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html"><code>HtmlSerializer</code></a> and its subclasses.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlDocSerializerSession.html#HtmlDocSerializerSession-org.apache.juneau.html.HtmlDocSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">HtmlDocSerializerSession(HtmlDocSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType)</a></span> - Constructor for class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlDocSerializerSession.html" title="class in org.apache.juneau.html">HtmlDocSerializerSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlDocSerializerSession.html#HtmlDocSerializerSession-org.apache.juneau.html.HtmlDocSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">HtmlDocSerializerSession(HtmlDocSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Constructor for 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">Create a new session using properties specified in the context.</div>
 </dd>
@@ -12235,6 +12319,12 @@
 <dd>
 <div class="block">Create a new session using properties specified in the context.</div>
 </dd>
+<dt><a href="org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html"><span class="typeNameLink">HtmlRender</span></a>&lt;<a href="org/apache/juneau/html/HtmlRender.html" title="type parameter in HtmlRender">T</a>&gt; - Class in <a href="org/apache/juneau/html/package-summary.html">org.apache.juneau.html</a></dt>
+<dd>
+<div class="block">Allows custom rendering of bean property values when serialized as HTML.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlRender.html#HtmlRender--">HtmlRender()</a></span> - Constructor for class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html">HtmlRender</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html"><span class="typeNameLink">HtmlSchemaDocSerializer</span></a> - Class in <a href="org/apache/juneau/html/package-summary.html">org.apache.juneau.html</a></dt>
 <dd>
 <div class="block">Serializes POJO metamodels to HTML.</div>
@@ -12287,7 +12377,7 @@
 <dd>
 <div class="block">Session object that lives for the duration of a single use of <a href="org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html"><code>HtmlSerializer</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlSerializerSession.html#HtmlSerializerSession-org.apache.juneau.html.HtmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">HtmlSerializerSession(HtmlSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType)</a></span> - Constructor for class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlSerializerSession.html" title="class in org.apache.juneau.html">HtmlSerializerSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlSerializerSession.html#HtmlSerializerSession-org.apache.juneau.html.HtmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">HtmlSerializerSession(HtmlSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Constructor for class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlSerializerSession.html" title="class in org.apache.juneau.html">HtmlSerializerSession</a></dt>
 <dd>
 <div class="block">Create a new session using properties specified in the context.</div>
 </dd>
@@ -12303,7 +12393,7 @@
 <dd>
 <div class="block">Specialized writer for serializing HTML.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlWriter.html#HtmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-">HtmlWriter(Writer, boolean, boolean, char, String, String)</a></span> - Constructor for class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlWriter.html#HtmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">HtmlWriter(Writer, boolean, boolean, char, String, String, UriContext)</a></span> - Constructor for class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a></dt>
 <dd>
 <div class="block">Constructor.</div>
 </dd>
@@ -13552,6 +13642,10 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/IOUtils.html#IOUtils--">IOUtils()</a></span> - Constructor for class org.apache.juneau.internal.<a href="org/apache/juneau/internal/IOUtils.html" title="class in org.apache.juneau.internal">IOUtils</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#isAbsoluteUri-java.lang.String-">isAbsoluteUri(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">Efficiently determines whether a URL is of the pattern "xxx://xxx"</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/ClassMeta.html#isAbstract--">isAbstract()</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 abstract.</div>
@@ -13656,6 +13750,10 @@
 <dd>
 <div class="block">Returns the <a href="org/apache/juneau/xml/XmlSerializerContext.html#XML_autoDetectNamespaces"><code>XmlSerializerContext.XML_autoDetectNamespaces</code></a> setting value in this context.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean(Object)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></dt>
+<dd>
+<div class="block">Returns <jk>true</jk> if the specified object is a bean.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/BeanSession.html#isBean-java.lang.Object-">isBean(Object)</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">Determines whether the specified object matches the requirements on this context of being a bean.</div>
@@ -14410,7 +14508,7 @@
 <dd>
 <div class="block">Session object that lives for the duration of a single use of <a href="org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json"><code>JsonSerializer</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/json/JsonSerializerSession.html#JsonSerializerSession-org.apache.juneau.json.JsonSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">JsonSerializerSession(JsonSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType)</a></span> - Constructor for class org.apache.juneau.json.<a href="org/apache/juneau/json/JsonSerializerSession.html" title="class in org.apache.juneau.json">JsonSerializerSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/json/JsonSerializerSession.html#JsonSerializerSession-org.apache.juneau.json.JsonSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">JsonSerializerSession(JsonSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Constructor for class org.apache.juneau.json.<a href="org/apache/juneau/json/JsonSerializerSession.html" title="class in org.apache.juneau.json">JsonSerializerSession</a></dt>
 <dd>
 <div class="block">Create a new session using properties specified in the context.</div>
 </dd>
@@ -14436,7 +14534,7 @@
 <dd>
 <div class="block">Specialized writer for serializing JSON.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/json/JsonWriter.html#JsonWriter-java.io.Writer-boolean-boolean-char-boolean-boolean-java.lang.String-java.lang.String-">JsonWriter(Writer, boolean, boolean, char, boolean, boolean, String, String)</a></span> - Constructor for class org.apache.juneau.json.<a href="org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/json/JsonWriter.html#JsonWriter-java.io.Writer-boolean-boolean-char-boolean-boolean-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">JsonWriter(Writer, boolean, boolean, char, boolean, boolean, String, String, UriContext)</a></span> - Constructor for class org.apache.juneau.json.<a href="org/apache/juneau/json/JsonWriter.html" title="class in org.apache.juneau.json">JsonWriter</a></dt>
 <dd>
 <div class="block">Constructor.</div>
 </dd>
@@ -15777,7 +15875,7 @@
 <dd>
 <div class="block">Session object that lives for the duration of a single use of <a href="org/apache/juneau/msgpack/MsgPackSerializer.html" title="class in org.apache.juneau.msgpack"><code>MsgPackSerializer</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/msgpack/MsgPackSerializerSession.html#MsgPackSerializerSession-org.apache.juneau.msgpack.MsgPackSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">MsgPackSerializerSession(MsgPackSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType)</a></span> - Constructor for class org.apache.juneau.msgpack.<a href="org/apache/juneau/msgpack/MsgPackSerializerSession.html" title="class in org.apache.juneau.msgpack">MsgPackSerializerSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/msgpack/MsgPackSerializerSession.html#MsgPackSerializerSession-org.apache.juneau.msgpack.MsgPackSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">MsgPackSerializerSession(MsgPackSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Constructor for class org.apache.juneau.msgpack.<a href="org/apache/juneau/msgpack/MsgPackSerializerSession.html" title="class in org.apache.juneau.msgpack">MsgPackSerializerSession</a></dt>
 <dd>
 <div class="block">Create a new session using properties specified in the context.</div>
 </dd>
@@ -17680,11 +17778,19 @@
 <dd>
 <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>Swagger.path(String,String,Operation)</code></a>.</div>
 </dd>
+<dt><a href="org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Path</span></a> - Annotation Type in <a href="org/apache/juneau/remoteable/package-summary.html">org.apache.juneau.remoteable</a></dt>
+<dd>
+<div class="block">Annotation applied to Java method arguments of interface proxies to denote that they are path variables on the request.</div>
+</dd>
 <dt><a href="org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Path</span></a> - Annotation Type in <a href="org/apache/juneau/rest/annotation/package-summary.html">org.apache.juneau.rest.annotation</a></dt>
 <dd>
 <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.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#path-java.lang.String-java.lang.Object-">path(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">Replaces a variable of the form <js>"{name}"</js> in the URL path with the specified value.</div>
+</dd>
 <dt><a href="org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">PathRemainder</span></a> - Annotation Type in <a href="org/apache/juneau/rest/annotation/package-summary.html">org.apache.juneau.rest.annotation</a></dt>
 <dd>
 <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
@@ -19128,7 +19234,7 @@
 <dd>
 <div class="block">Session object that lives for the duration of a single use of <a href="org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena"><code>RdfSerializer</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/jena/RdfSerializerSession.html#RdfSerializerSession-org.apache.juneau.jena.RdfSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">RdfSerializerSession(RdfSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType)</a></span> - Constructor for class org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfSerializerSession.html" title="class in org.apache.juneau.jena">RdfSerializerSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/jena/RdfSerializerSession.html#RdfSerializerSession-org.apache.juneau.jena.RdfSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">RdfSerializerSession(RdfSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Constructor for class org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfSerializerSession.html" title="class in org.apache.juneau.jena">RdfSerializerSession</a></dt>
 <dd>
 <div class="block">Create a new session using properties specified in the context.</div>
 </dd>
@@ -20361,6 +20467,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/SwitchVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String:A-">resolve(VarResolverSession, String[])</a></span> - Method in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars">SwitchVar</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#resolveAbsolute-java.lang.String-">resolveAbsolute(String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Converts the specified URI to absolute form based on values in this context.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta(BeanProperty, Type, Map&lt;Class&lt;?&gt;, Class&lt;?&gt;[]&gt;)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></dt>
 <dd>
 <div class="block">Used for determining the class type on a method or field where a <code>@BeanProperty</code> annotation
@@ -20376,6 +20486,10 @@
 <dd>
 <div class="block"><b>Configuration property:</b>  XML resolver.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#resolveRootRelative-java.lang.String-">resolveRootRelative(String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Converts the specified URI to root-relative form based on values in this context.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestContext.html#resolveStaticFile-java.lang.String-">resolveStaticFile(String)</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">Resolve a static resource file.</div>
@@ -20401,6 +20515,11 @@
 <div class="block">Converts a String to an absolute URI based on the <a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_absolutePathUriBase"><code>SerializerContext.SERIALIZER_absolutePathUriBase</code></a> and
    <a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_relativeUriBase"><code>SerializerContext.SERIALIZER_relativeUriBase</code></a> settings on this context.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/BeanMap.html#resolveVars-java.lang.String-">resolveVars(String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanMap.html" title="class in org.apache.juneau">BeanMap</a></dt>
+<dd>
+<div class="block">Given a string containing variables of the form <code>"{property}"</code>, replaces those variables with
+ property values in this bean.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#resolveVars-java.lang.String-">resolveVars(String)</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">Shortcut for calling <code>getVarResolverSession().resolve(input)</code>.</div>
@@ -21511,7 +21630,7 @@
 <dd>
 <div class="block">Context object that lives for the duration of a single use of <a href="org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer"><code>Serializer</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerSession.html#SerializerSession-org.apache.juneau.serializer.SerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">SerializerSession(SerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType)</a></span> - Constructor for class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerSession.html#SerializerSession-org.apache.juneau.serializer.SerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">SerializerSession(SerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Constructor for class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></dt>
 <dd>
 <div class="block">Create a new session using properties specified in the context.</div>
 </dd>
@@ -21519,7 +21638,7 @@
 <dd>
 <div class="block">Simple wrapper around a standard <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a> with additional methods.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerWriter.html#SerializerWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-">SerializerWriter(Writer, boolean, boolean, char, String, String)</a></span> - Constructor for class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerWriter.html#SerializerWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">SerializerWriter(Writer, boolean, boolean, char, String, String, UriContext)</a></span> - Constructor for class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFile.html#serializeTo-java.io.Writer-">serializeTo(Writer)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></dt>
 <dd>
@@ -23884,6 +24003,10 @@
 <dd>
 <div class="block">Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerGroupBuilder.html#sq--">sq()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></dt>
+<dd>
+<div class="block">Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/soap/SoapXmlSerializerBuilder.html#sq--">sq()</a></span> - Method in class org.apache.juneau.soap.<a href="org/apache/juneau/soap/SoapXmlSerializerBuilder.html" title="class in org.apache.juneau.soap">SoapXmlSerializerBuilder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializerBuilder.html#sq--">sq()</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializerBuilder.html" title="class in org.apache.juneau.uon">UonSerializerBuilder</a></dt>
@@ -25618,6 +25741,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/plaintext/PlainTextSerializerBuilder.html#trimStrings-boolean-">trimStrings(boolean)</a></span> - Method in class org.apache.juneau.plaintext.<a href="org/apache/juneau/plaintext/PlainTextSerializerBuilder.html" title="class in org.apache.juneau.plaintext">PlainTextSerializerBuilder</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#trimStrings-boolean-">trimStrings(boolean)</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>
+<div class="block">Sets the <a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings"><code>SerializerContext.SERIALIZER_trimStrings</code></a> property on all serializers in this group.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerBuilder.html#trimStrings-boolean-">trimStrings(boolean)</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerBuilder.html" title="class in org.apache.juneau.serializer">SerializerBuilder</a></dt>
 <dd>
 <div class="block"><b>Configuration property:</b>  Trim strings.</div>
@@ -25650,10 +25777,6 @@
 <dd>
 <div class="block">Sets the <a href="org/apache/juneau/parser/ParserContext.html#PARSER_trimStrings"><code>ParserContext.PARSER_trimStrings</code></a> property on all parsers in this group.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#trimStringsS-boolean-">trimStringsS(boolean)</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>
-<div class="block">Sets the <a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings"><code>SerializerContext.SERIALIZER_trimStrings</code></a> property on all serializers in this group.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#trimTrailingSlashes-java.lang.String-">trimTrailingSlashes(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">Trims <js>'/'</js> characters from the end of the specified string.</div>
@@ -26022,7 +26145,7 @@
 <dd>
 <div class="block">Session object that lives for the duration of a single use of <a href="org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon"><code>UonSerializer</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializerSession.html#UonSerializerSession-org.apache.juneau.uon.UonSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">UonSerializerSession(UonSerializerContext, Boolean, ObjectMap, Object, Method, Locale, TimeZone, MediaType)</a></span> - Constructor for class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializerSession.html#UonSerializerSession-org.apache.juneau.uon.UonSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">UonSerializerSession(UonSerializerContext, Boolean, ObjectMap, Object, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Constructor for class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a></dt>
 <dd>
 <div class="block">Create a new session using properties specified in the context.</div>
 </dd>
@@ -26036,7 +26159,7 @@
 <dd>
 <div class="block">Specialized writer for serializing UON-encoded text.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonWriter.html#UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-java.lang.String-java.lang.String-">UonWriter(UonSerializerSession, Writer, boolean, boolean, boolean, String, String)</a></span> - Constructor for class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonWriter.html#UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">UonWriter(UonSerializerSession, Writer, boolean, boolean, boolean, String, String, UriContext)</a></span> - Constructor for class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a></dt>
 <dd>
 <div class="block">Constructor.</div>
 </dd>
@@ -26128,6 +26251,26 @@
 <dd>
 <div class="block"><b>Configuration property:</b>  The <code>SOAPAction</code> HTTP header value to set on responses.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerWriter.html#uriContext">uriContext</a></span> - Variable in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></dt>
+<dd>
+<div class="block">The URI context of the request.</div>
+</dd>
+<dt><a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau"><span class="typeNameLink">UriContext</span></a> - Class in <a href="org/apache/juneau/package-summary.html">org.apache.juneau</a></dt>
+<dd>
+<div class="block">Represents a URL broken into authority/context-root/servlet-path/path-info parts.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#UriContext-java.lang.String-java.lang.String-java.lang.String-java.lang.String-">UriContext(String, String, String, String)</a></span> - Constructor for class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
+<dt><a href="org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau"><span class="typeNameLink">UriRelativity</span></a> - Enum in <a href="org/apache/juneau/package-summary.html">org.apache.juneau</a></dt>
+<dd>
+<div class="block">Identifies how relative URIs should resolve against.</div>
+</dd>
+<dt><a href="org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau"><span class="typeNameLink">UriResolution</span></a> - Enum in <a href="org/apache/juneau/package-summary.html">org.apache.juneau</a></dt>
+<dd>
+<div class="block">Identifies the possible types of URL resolution.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Contact.html#url-java.lang.String-">url(String)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Contact.html" title="class in org.apache.juneau.dto.swagger">Contact</a></dt>
 <dd>
 <div class="block">Synonym for <a href="org/apache/juneau/dto/swagger/Contact.html#setUrl-java.lang.String-"><code>Contact.setUrl(String)</code></a>.</div>
@@ -26269,7 +26412,7 @@
 <dd>
 <div class="block">Session object that lives for the duration of a single use of <a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#UrlEncodingSerializerSession-org.apache.juneau.urlencoding.UrlEncodingSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">UrlEncodingSerializerSession(UrlEncodingSerializerContext, Boolean, ObjectMap, Object, Method, Locale, TimeZone, MediaType)</a></span> - Constructor for class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#UrlEncodingSerializerSession-org.apache.juneau.urlencoding.UrlEncodingSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">UrlEncodingSerializerSession(UrlEncodingSerializerContext, Boolean, ObjectMap, Object, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Constructor for class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerSession</a></dt>
 <dd>
 <div class="block">Create a new session using properties specified in the context.</div>
 </dd>
@@ -26579,6 +26722,14 @@
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriRelativity.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.juneau.<a href="org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriResolution.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.juneau.<a href="org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/Visibility.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.juneau.<a href="org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
@@ -26645,6 +26796,16 @@ the order they are declared.</div>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriRelativity.html#values--">values()</a></span> - Static method in enum org.apache.juneau.<a href="org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/UriResolution.html#values--">values()</a></span> - Static method in enum org.apache.juneau.<a href="org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/Visibility.html#values--">values()</a></span> - Static method in enum org.apache.juneau.<a href="org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
@@ -26982,6 +27143,10 @@ the order they are declared.</div>
 <dd>
 <div class="block">Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerGroupBuilder.html#ws--">ws()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></dt>
+<dd>
+<div class="block">Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/soap/SoapXmlSerializerBuilder.html#ws--">ws()</a></span> - Method in class org.apache.juneau.soap.<a href="org/apache/juneau/soap/SoapXmlSerializerBuilder.html" title="class in org.apache.juneau.soap">SoapXmlSerializerBuilder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializerBuilder.html#ws--">ws()</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializerBuilder.html" title="class in org.apache.juneau.uon">UonSerializerBuilder</a></dt>
@@ -27280,7 +27445,7 @@ the order they are declared.</div>
 <dd>
 <div class="block">Session object that lives for the duration of a single use of <a href="org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml"><code>XmlSerializer</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlSerializerSession.html#XmlSerializerSession-org.apache.juneau.xml.XmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">XmlSerializerSession(XmlSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType)</a></span> - Constructor for class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlSerializerSession.html" title="class in org.apache.juneau.xml">XmlSerializerSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlSerializerSession.html#XmlSerializerSession-org.apache.juneau.xml.XmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">XmlSerializerSession(XmlSerializerContext, ObjectMap, Object, Method, Locale, TimeZone, MediaType, UriContext)</a></span> - Constructor for class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlSerializerSession.html" title="class in org.apache.juneau.xml">XmlSerializerSession</a></dt>
 <dd>
 <div class="block">Create a new session using properties specified in the context.</div>
 </dd>
@@ -27298,7 +27463,7 @@ the order they are declared.</div>
 <dd>
 <div class="block">Specialized writer for serializing XML.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlWriter.html#XmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-boolean-org.apache.juneau.xml.Namespace-">XmlWriter(Writer, boolean, boolean, char, String, String, boolean, Namespace)</a></span> - Constructor for class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlWriter.html#XmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-org.apache.juneau.UriContext-boolean-org.apache.juneau.xml.Namespace-">XmlWriter(Writer, boolean, boolean, char, String, String, UriContext, boolean, Namespace)</a></span> - Constructor for class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a></dt>
 <dd>
 <div class="block">Constructor.</div>
 </dd>


[10/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html
index 5bb6b3f..db3e497 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html
@@ -37,7 +37,7 @@
 <span class="sourceLineNo">029</span><a name="line.29"></a>
 <span class="sourceLineNo">030</span>   private final String httpMethod;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>   private final String url;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>   private final RemoteMethodArg[] queryArgs, headerArgs, formDataArgs;<a name="line.32"></a>
+<span class="sourceLineNo">032</span>   private final RemoteMethodArg[] pathArgs, queryArgs, headerArgs, formDataArgs;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>   private final Integer[] otherArgs;<a name="line.33"></a>
 <span class="sourceLineNo">034</span>   private final Integer bodyArg;<a name="line.34"></a>
 <span class="sourceLineNo">035</span><a name="line.35"></a>
@@ -51,138 +51,151 @@
 <span class="sourceLineNo">043</span>      Builder b = new Builder(restUrl, m);<a name="line.43"></a>
 <span class="sourceLineNo">044</span>      this.httpMethod = b.httpMethod;<a name="line.44"></a>
 <span class="sourceLineNo">045</span>      this.url = b.url;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>      this.queryArgs = b.queryArgs.toArray(new RemoteMethodArg[b.queryArgs.size()]);<a name="line.46"></a>
-<span class="sourceLineNo">047</span>      this.formDataArgs = b.formDataArgs.toArray(new RemoteMethodArg[b.formDataArgs.size()]);<a name="line.47"></a>
-<span class="sourceLineNo">048</span>      this.headerArgs = b.headerArgs.toArray(new RemoteMethodArg[b.headerArgs.size()]);<a name="line.48"></a>
-<span class="sourceLineNo">049</span>      this.otherArgs = b.otherArgs.toArray(new Integer[b.otherArgs.size()]);<a name="line.49"></a>
-<span class="sourceLineNo">050</span>      this.bodyArg = b.bodyArg;<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>   private static class Builder {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>      private String httpMethod, url;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      private List&lt;RemoteMethodArg&gt;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>         queryArgs = new LinkedList&lt;RemoteMethodArg&gt;(),<a name="line.56"></a>
-<span class="sourceLineNo">057</span>         headerArgs = new LinkedList&lt;RemoteMethodArg&gt;(),<a name="line.57"></a>
-<span class="sourceLineNo">058</span>         formDataArgs = new LinkedList&lt;RemoteMethodArg&gt;();<a name="line.58"></a>
-<span class="sourceLineNo">059</span>      private List&lt;Integer&gt; otherArgs = new LinkedList&lt;Integer&gt;();<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      private Integer bodyArg;<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>      private Builder(String restUrl, Method m) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>         Remoteable r = m.getDeclaringClass().getAnnotation(Remoteable.class);<a name="line.63"></a>
-<span class="sourceLineNo">064</span>         RemoteMethod rm = m.getAnnotation(RemoteMethod.class);<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>         httpMethod = rm == null ? "POST" : rm.httpMethod();<a name="line.66"></a>
-<span class="sourceLineNo">067</span>         if (! isOneOf(httpMethod, "GET", "POST"))<a name="line.67"></a>
-<span class="sourceLineNo">068</span>            throw new RemoteableMetadataException(m, "Invalid value specified for @RemoteMethod.httpMethod() annotation.  Valid values are [GET,POST].");<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>         String path = rm == null || rm.path().isEmpty() ? null : rm.path();<a name="line.70"></a>
-<span class="sourceLineNo">071</span>         String methodPaths = r == null ? "NAME" : r.methodPaths();<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>         if (! isOneOf(methodPaths, "NAME", "SIGNATURE"))<a name="line.73"></a>
-<span class="sourceLineNo">074</span>            throw new RemoteableMetadataException(m, "Invalid value specified for @Remoteable.methodPaths() annotation.  Valid values are [NAME,SIGNATURE].");<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>         url =<a name="line.76"></a>
-<span class="sourceLineNo">077</span>            trimSlashes(restUrl)<a name="line.77"></a>
-<span class="sourceLineNo">078</span>            + '/'<a name="line.78"></a>
-<span class="sourceLineNo">079</span>            + (path != null ? trimSlashes(path) : urlEncode("NAME".equals(methodPaths) ? m.getName() : ClassUtils.getMethodSignature(m)));<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>         int index = 0;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>         for (Annotation[] aa : m.getParameterAnnotations()) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>            boolean annotated = false;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>            for (Annotation a : aa) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>               Class&lt;?&gt; ca = a.annotationType();<a name="line.85"></a>
-<span class="sourceLineNo">086</span>               if (ca == Query.class) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>                  Query q = (Query)a;<a name="line.87"></a>
-<span class="sourceLineNo">088</span>                  annotated = queryArgs.add(new RemoteMethodArg(q.value(), index, false));<a name="line.88"></a>
-<span class="sourceLineNo">089</span>               } else if (ca == QueryIfNE.class) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>                  Query q = (Query)a;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>                  annotated = queryArgs.add(new RemoteMethodArg(q.value(), index, true));<a name="line.91"></a>
-<span class="sourceLineNo">092</span>               } else if (ca == FormData.class) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>                  FormData f = (FormData)a;<a name="line.93"></a>
-<span class="sourceLineNo">094</span>                  annotated = formDataArgs.add(new RemoteMethodArg(f.value(), index, false));<a name="line.94"></a>
-<span class="sourceLineNo">095</span>               } else if (ca == FormDataIfNE.class) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>                  FormData f = (FormData)a;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>                  annotated = formDataArgs.add(new RemoteMethodArg(f.value(), index, true));<a name="line.97"></a>
-<span class="sourceLineNo">098</span>               } else if (ca == Header.class) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>                  Header h = (Header)a;<a name="line.99"></a>
-<span class="sourceLineNo">100</span>                  annotated = headerArgs.add(new RemoteMethodArg(h.value(), index, false));<a name="line.100"></a>
-<span class="sourceLineNo">101</span>               } else if (ca == HeaderIfNE.class) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>                  Header h = (Header)a;<a name="line.102"></a>
-<span class="sourceLineNo">103</span>                  annotated = headerArgs.add(new RemoteMethodArg(h.value(), index, true));<a name="line.103"></a>
-<span class="sourceLineNo">104</span>               } else if (ca == Body.class) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>                  annotated = true;<a name="line.105"></a>
-<span class="sourceLineNo">106</span>                  if (bodyArg == null)<a name="line.106"></a>
-<span class="sourceLineNo">107</span>                     bodyArg = index;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>                  else<a name="line.108"></a>
-<span class="sourceLineNo">109</span>                     throw new RemoteableMetadataException(m, "Multiple @Body parameters found.  Only one can be specified per Java method.");<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>            if (! annotated)<a name="line.112"></a>
-<span class="sourceLineNo">113</span>               otherArgs.add(index);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>            index++;<a name="line.114"></a>
-<span class="sourceLineNo">115</span>         }<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>         if (bodyArg != null &amp;&amp; otherArgs.size() &gt; 0)<a name="line.117"></a>
-<span class="sourceLineNo">118</span>            throw new RemoteableMetadataException(m, "@Body and non-annotated parameters found together.  Non-annotated parameters cannot be used when @Body is used.");<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">046</span>      this.pathArgs = b.pathArgs.toArray(new RemoteMethodArg[b.pathArgs.size()]);<a name="line.46"></a>
+<span class="sourceLineNo">047</span>      this.queryArgs = b.queryArgs.toArray(new RemoteMethodArg[b.queryArgs.size()]);<a name="line.47"></a>
+<span class="sourceLineNo">048</span>      this.formDataArgs = b.formDataArgs.toArray(new RemoteMethodArg[b.formDataArgs.size()]);<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      this.headerArgs = b.headerArgs.toArray(new RemoteMethodArg[b.headerArgs.size()]);<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      this.otherArgs = b.otherArgs.toArray(new Integer[b.otherArgs.size()]);<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      this.bodyArg = b.bodyArg;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   }<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>   private static class Builder {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>      private String httpMethod, url;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      private List&lt;RemoteMethodArg&gt;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>         pathArgs = new LinkedList&lt;RemoteMethodArg&gt;(),<a name="line.57"></a>
+<span class="sourceLineNo">058</span>         queryArgs = new LinkedList&lt;RemoteMethodArg&gt;(),<a name="line.58"></a>
+<span class="sourceLineNo">059</span>         headerArgs = new LinkedList&lt;RemoteMethodArg&gt;(),<a name="line.59"></a>
+<span class="sourceLineNo">060</span>         formDataArgs = new LinkedList&lt;RemoteMethodArg&gt;();<a name="line.60"></a>
+<span class="sourceLineNo">061</span>      private List&lt;Integer&gt; otherArgs = new LinkedList&lt;Integer&gt;();<a name="line.61"></a>
+<span class="sourceLineNo">062</span>      private Integer bodyArg;<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>      private Builder(String restUrl, Method m) {<a name="line.64"></a>
+<span class="sourceLineNo">065</span>         Remoteable r = m.getDeclaringClass().getAnnotation(Remoteable.class);<a name="line.65"></a>
+<span class="sourceLineNo">066</span>         RemoteMethod rm = m.getAnnotation(RemoteMethod.class);<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>         httpMethod = rm == null ? "POST" : rm.httpMethod();<a name="line.68"></a>
+<span class="sourceLineNo">069</span>         if (! isOneOf(httpMethod, "GET", "POST"))<a name="line.69"></a>
+<span class="sourceLineNo">070</span>            throw new RemoteableMetadataException(m, "Invalid value specified for @RemoteMethod.httpMethod() annotation.  Valid values are [GET,POST].");<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>         String path = rm == null || rm.path().isEmpty() ? null : rm.path();<a name="line.72"></a>
+<span class="sourceLineNo">073</span>         String methodPaths = r == null ? "NAME" : r.methodPaths();<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>         if (! isOneOf(methodPaths, "NAME", "SIGNATURE"))<a name="line.75"></a>
+<span class="sourceLineNo">076</span>            throw new RemoteableMetadataException(m, "Invalid value specified for @Remoteable.methodPaths() annotation.  Valid values are [NAME,SIGNATURE].");<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>         url =<a name="line.78"></a>
+<span class="sourceLineNo">079</span>            trimSlashes(restUrl)<a name="line.79"></a>
+<span class="sourceLineNo">080</span>            + '/'<a name="line.80"></a>
+<span class="sourceLineNo">081</span>            + (path != null ? trimSlashes(path) : urlEncode("NAME".equals(methodPaths) ? m.getName() : ClassUtils.getMethodSignature(m)));<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>         int index = 0;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>         for (Annotation[] aa : m.getParameterAnnotations()) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>            boolean annotated = false;<a name="line.85"></a>
+<span class="sourceLineNo">086</span>            for (Annotation a : aa) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>               Class&lt;?&gt; ca = a.annotationType();<a name="line.87"></a>
+<span class="sourceLineNo">088</span>               if (ca == Path.class) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>                  Path p = (Path)a;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>                  annotated = pathArgs.add(new RemoteMethodArg(p.value(), index, false));<a name="line.90"></a>
+<span class="sourceLineNo">091</span>               } else if (ca == Query.class) {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>                  Query q = (Query)a;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>                  annotated = queryArgs.add(new RemoteMethodArg(q.value(), index, false));<a name="line.93"></a>
+<span class="sourceLineNo">094</span>               } else if (ca == QueryIfNE.class) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>                  Query q = (Query)a;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>                  annotated = queryArgs.add(new RemoteMethodArg(q.value(), index, true));<a name="line.96"></a>
+<span class="sourceLineNo">097</span>               } else if (ca == FormData.class) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>                  FormData f = (FormData)a;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>                  annotated = formDataArgs.add(new RemoteMethodArg(f.value(), index, false));<a name="line.99"></a>
+<span class="sourceLineNo">100</span>               } else if (ca == FormDataIfNE.class) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>                  FormData f = (FormData)a;<a name="line.101"></a>
+<span class="sourceLineNo">102</span>                  annotated = formDataArgs.add(new RemoteMethodArg(f.value(), index, true));<a name="line.102"></a>
+<span class="sourceLineNo">103</span>               } else if (ca == Header.class) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>                  Header h = (Header)a;<a name="line.104"></a>
+<span class="sourceLineNo">105</span>                  annotated = headerArgs.add(new RemoteMethodArg(h.value(), index, false));<a name="line.105"></a>
+<span class="sourceLineNo">106</span>               } else if (ca == HeaderIfNE.class) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>                  Header h = (Header)a;<a name="line.107"></a>
+<span class="sourceLineNo">108</span>                  annotated = headerArgs.add(new RemoteMethodArg(h.value(), index, true));<a name="line.108"></a>
+<span class="sourceLineNo">109</span>               } else if (ca == Body.class) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>                  annotated = true;<a name="line.110"></a>
+<span class="sourceLineNo">111</span>                  if (bodyArg == null)<a name="line.111"></a>
+<span class="sourceLineNo">112</span>                     bodyArg = index;<a name="line.112"></a>
+<span class="sourceLineNo">113</span>                  else<a name="line.113"></a>
+<span class="sourceLineNo">114</span>                     throw new RemoteableMetadataException(m, "Multiple @Body parameters found.  Only one can be specified per Java method.");<a name="line.114"></a>
+<span class="sourceLineNo">115</span>               }<a name="line.115"></a>
+<span class="sourceLineNo">116</span>            }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>            if (! annotated)<a name="line.117"></a>
+<span class="sourceLineNo">118</span>               otherArgs.add(index);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>            index++;<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>   /**<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    * Returns the value of the {@link RemoteMethod#httpMethod()} annotation on this Java method.<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    * @return The value of the {@link RemoteMethod#httpMethod()} annotation, never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    */<a name="line.125"></a>
-<span class="sourceLineNo">126</span>   public String getHttpMethod() {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      return httpMethod;<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>   /**<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    * Returns the absolute URL of the REST interface invoked by this Java method.<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    * @return The absolute URL of the REST interface, never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    */<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   public String getUrl() {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      return url;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   }<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>    * Returns the {@link Query @Query} annotated arguments on this Java method.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    * @return A map of {@link Query#value() @Query.value()} names to zero-indexed argument indices.<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    */<a name="line.141"></a>
-<span class="sourceLineNo">142</span>   public RemoteMethodArg[] getQueryArgs() {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      return queryArgs;<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>    * Returns the {@link FormData @FormData} annotated arguments on this Java method.<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    * @return A map of {@link FormData#value() @FormData.value()} names to zero-indexed argument indices.<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    */<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   public RemoteMethodArg[] getFormDataArgs() {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      return formDataArgs;<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>    * Returns the {@link Header @Header} annotated arguments on this Java method.<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    * @return A map of {@link Header#value() @Header.value()} names to zero-indexed argument indices.<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>   public RemoteMethodArg[] getHeaderArgs() {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      return headerArgs;<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>   /**<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    * Returns the remaining non-annotated arguments on this Java method.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    * @return A list of zero-indexed argument indices.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   public Integer[] getOtherArgs() {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      return otherArgs;<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>   /**<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    * Returns the argument annotated with {@link Body @Body}.<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    * @return A index of the argument with the {@link Body @Body} annotation, or &lt;jk&gt;null&lt;/jk&gt; if no argument exists.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   public Integer getBodyArg() {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      return bodyArg;<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">122</span>         if (bodyArg != null &amp;&amp; otherArgs.size() &gt; 0)<a name="line.122"></a>
+<span class="sourceLineNo">123</span>            throw new RemoteableMetadataException(m, "@Body and non-annotated parameters found together.  Non-annotated parameters cannot be used when @Body is used.");<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><a name="line.126"></a>
+<span class="sourceLineNo">127</span>   /**<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    * Returns the value of the {@link RemoteMethod#httpMethod()} annotation on this Java method.<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    * @return The value of the {@link RemoteMethod#httpMethod()} annotation, never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    */<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   public String getHttpMethod() {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      return httpMethod;<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>   /**<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    * Returns the absolute URL of the REST interface invoked by this Java method.<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    * @return The absolute URL of the REST interface, never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    */<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   public String getUrl() {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      return url;<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>    * Returns the {@link Path @Path} annotated arguments on this Java method.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    * @return A map of {@link Path#value() @Path.value()} names to zero-indexed argument indices.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    */<a name="line.146"></a>
+<span class="sourceLineNo">147</span>   public RemoteMethodArg[] getPathArgs() {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      return pathArgs;<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>    * Returns the {@link Query @Query} annotated arguments on this Java method.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    * @return A map of {@link Query#value() @Query.value()} names to zero-indexed argument indices.<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    */<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   public RemoteMethodArg[] getQueryArgs() {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      return queryArgs;<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>   /**<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    * Returns the {@link FormData @FormData} annotated arguments on this Java method.<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    * @return A map of {@link FormData#value() @FormData.value()} names to zero-indexed argument indices.<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    */<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   public RemoteMethodArg[] getFormDataArgs() {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      return formDataArgs;<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>    * Returns the {@link Header @Header} annotated arguments on this Java method.<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    * @return A map of {@link Header#value() @Header.value()} names to zero-indexed argument indices.<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    */<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   public RemoteMethodArg[] getHeaderArgs() {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      return headerArgs;<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>    * Returns the remaining non-annotated arguments on this Java method.<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    * @return A list of zero-indexed argument indices.<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    */<a name="line.178"></a>
+<span class="sourceLineNo">179</span>   public Integer[] getOtherArgs() {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      return otherArgs;<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>   /**<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    * Returns the argument annotated with {@link Body @Body}.<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    * @return A index of the argument with the {@link Body @Body} annotation, or &lt;jk&gt;null&lt;/jk&gt; if no argument exists.<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    */<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   public Integer getBodyArg() {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      return bodyArg;<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>
 
 
 


[21/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/xml/XmlWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlWriter.html b/content/site/apidocs/org/apache/juneau/xml/XmlWriter.html
index 595d9e0..092e7dd 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlWriter.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlWriter.html
@@ -126,7 +126,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.28">XmlWriter</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.29">XmlWriter</a>
 extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></pre>
 <div class="block">Specialized writer for serializing XML.
  <p>
@@ -151,7 +151,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#absolutePathUriBase">absolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#out">out</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#quoteChar">quoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#relativeUriBase">relativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#trimStrings">trimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#useWhitespace">useWhitespace</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#absolutePathUriBase">absolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#out">out</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#quoteChar">quoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#relativeUriBase">relativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#trimStrings">trimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#uriContext">uriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#useWhitespace">useWhitespace</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="fields.inherited.from.class.java.io.Writer">
@@ -174,12 +174,13 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlWriter.html#XmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-boolean-org.apache.juneau.xml.Namespace-">XmlWriter</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>&nbsp;out,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/xml/XmlWriter.html#XmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-org.apache.juneau.UriContext-boolean-org.apache.juneau.xml.Namespace-">XmlWriter</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>&nbsp;out,
          boolean&nbsp;useWhitespace,
          boolean&nbsp;trimStrings,
          char&nbsp;quoteChar,
          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;relativeUriBase,
          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase,
+         <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext,
          boolean&nbsp;enableNs,
          <a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;defaultNamespace)</code>
 <div class="block">Constructor.</div>
@@ -595,18 +596,19 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="XmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-boolean-org.apache.juneau.xml.Namespace-">
+<a name="XmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-org.apache.juneau.UriContext-boolean-org.apache.juneau.xml.Namespace-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>XmlWriter</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.45">XmlWriter</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>&nbsp;out,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.48">XmlWriter</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>&nbsp;out,
                  boolean&nbsp;useWhitespace,
                  boolean&nbsp;trimStrings,
                  char&nbsp;quoteChar,
                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;relativeUriBase,
                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase,
+                 <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext,
                  boolean&nbsp;enableNs,
                  <a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;defaultNamespace)</pre>
 <div class="block">Constructor.</div>
@@ -618,6 +620,8 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <dd><code>quoteChar</code> - The quote character to use for attributes.  Should be <js>'\''</js> or <js>'"'</js>.</dd>
 <dd><code>relativeUriBase</code> - The base (e.g. <js>https://localhost:9443/contextPath"</js>) for relative URIs (e.g. <js>"my/path"</js>).</dd>
 <dd><code>absolutePathUriBase</code> - The base (e.g. <js>https://localhost:9443"</js>) for relative URIs with absolute paths (e.g. <js>"/contextPath/my/path"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dd><code>enableNs</code> - Flag to indicate if XML namespaces are enabled.</dd>
 <dd><code>defaultNamespace</code> - The default namespace if XML namespaces are enabled.</dd>
 </dl>
@@ -637,7 +641,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.60">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.63">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                       boolean&nbsp;needsEncoding)
                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>
@@ -660,7 +664,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.79">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.82">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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">Shortcut for <code>oTag(ns, name, <jk>false</jk>);</code></div>
@@ -681,7 +685,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.90">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.93">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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">Shortcut for <code>oTag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
 <dl>
@@ -700,7 +704,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.104">oTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.107">oTag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                       boolean&nbsp;needsEncoding)
@@ -725,7 +729,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.117">oTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.120">oTag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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>
@@ -748,7 +752,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.129">oTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.132">oTag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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">Shortcut for <code>i(indent).oTag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
@@ -769,7 +773,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>cTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.140">cTag</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.143">cTag</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">Closes a tag.
  Shortcut for <code>append(<js>'>'</js>);</code></div>
@@ -787,7 +791,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>ceTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.152">ceTag</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.155">ceTag</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">Closes an empty tag.
  Shortcut for <code>append(<js>'/'</js>).append(<js>'>'</js>);</code></div>
@@ -805,7 +809,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.166">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.169">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                      boolean&nbsp;needsEncoding)
               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>
@@ -828,7 +832,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.185">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.188">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
               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">Shortcut for <code>tag(ns, name, <jk>false</jk>);</code></div>
@@ -849,7 +853,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.196">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.199">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
               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">Shortcut for <code>tag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
 <dl>
@@ -868,7 +872,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.208">tag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.211">tag</a>(int&nbsp;indent,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
               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">Shortcut for <code>i(indent).tag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
@@ -889,7 +893,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.222">tag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.225">tag</a>(int&nbsp;indent,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                      boolean&nbsp;needsEncoding)
@@ -914,7 +918,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.235">tag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.238">tag</a>(int&nbsp;indent,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
               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>
@@ -937,7 +941,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.249">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.252">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                       boolean&nbsp;needsEncoding)
                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>
@@ -960,7 +964,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.261">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.264">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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">Shortcut for <code>sTag(ns, name, <jk>false</jk>);</code></div>
@@ -981,7 +985,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.272">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.275">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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">Shortcut for <code>sTag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
 <dl>
@@ -1000,7 +1004,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.286">sTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.289">sTag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                       boolean&nbsp;needsEncoding)
@@ -1025,7 +1029,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.299">sTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.302">sTag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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>
@@ -1048,7 +1052,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.311">sTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.314">sTag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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">Shortcut for <code>i(indent).sTag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
@@ -1069,7 +1073,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.325">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.328">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                       boolean&nbsp;needsEncoding)
                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>
@@ -1092,7 +1096,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.344">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.347">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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">Shortcut for <code>eTag(ns, name, <jk>false</jk>);</code></div>
@@ -1113,7 +1117,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.355">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.358">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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">Shortcut for <code>eTag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
 <dl>
@@ -1132,7 +1136,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.369">eTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.372">eTag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                       boolean&nbsp;needsEncoding)
@@ -1157,7 +1161,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.382">eTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.385">eTag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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>
@@ -1180,7 +1184,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.394">eTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.397">eTag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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">Shortcut for <code>i(indent).eTag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
@@ -1201,7 +1205,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>attr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.408">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.411">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value,
                       boolean&nbsp;needsEncoding)
@@ -1226,7 +1230,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>attr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.426">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.429">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value,
                       boolean&nbsp;needsEncoding)
                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>
@@ -1249,7 +1253,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>attr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.439">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.442">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value)
                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>
@@ -1272,7 +1276,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>attr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.452">attr</a>(<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.455">attr</a>(<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value)
                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>
@@ -1295,7 +1299,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>attr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.464">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.467">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value)
                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">Shortcut for <code>attr(<jk>null</jk>, name, value, <jk>false</jk>);</code></div>
@@ -1316,7 +1320,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>oAttr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.477">oAttr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.480">oAttr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 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">Writes an open-ended attribute to the output:  <code><xa>ns:name</xa>=</code></div>
@@ -1337,7 +1341,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>oAttr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.493">oAttr</a>(<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.496">oAttr</a>(<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 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">Writes an open-ended attribute to the output:  <code><xa>ns:name</xa>=</code></div>
@@ -1358,7 +1362,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>attrUri</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.506">attrUri</a>(<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.509">attrUri</a>(<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;ns,
                          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value)
                   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>
@@ -1381,7 +1385,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>attrUri</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.520">attrUri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.523">attrUri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value)
                   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>
@@ -1404,7 +1408,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>text</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.532">text</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>&nbsp;o)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.535">text</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>&nbsp;o)
                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">Shortcut for calling <code>text(o, <jk>false</jk>);</code></div>
 <dl>
@@ -1423,7 +1427,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>text</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.545">text</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>&nbsp;o,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.548">text</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>&nbsp;o,
                       boolean&nbsp;preserveWhitespace)
                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">Serializes and encodes the specified object as valid XML text.</div>
@@ -1444,7 +1448,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>encodeAttr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.557">encodeAttr</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>&nbsp;o)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.560">encodeAttr</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>&nbsp;o)
                      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">Serializes and encodes the specified object as valid XML attribute name.</div>
 <dl>
@@ -1463,7 +1467,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>cr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.563">cr</a>(int&nbsp;depth)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.566">cr</a>(int&nbsp;depth)
              throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#cr-int-">SerializerWriter</a></code></span></div>
 <div class="block">Performs a carriage return.
@@ -1487,7 +1491,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.569">appendln</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.572">appendln</a>(int&nbsp;indent,
                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendln-int-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -1512,7 +1516,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.575">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.578">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendln-java.lang.String-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text followed by a newline (if the <code>useWhitespace</code> setting is enabled).</div>
@@ -1534,7 +1538,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.581">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.584">append</a>(int&nbsp;indent,
                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-int-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -1558,7 +1562,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.587">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.590">append</a>(int&nbsp;indent,
                         char&nbsp;c)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-int-char-">SerializerWriter</a></code></span></div>
@@ -1582,7 +1586,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>s</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.593">s</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.596">s</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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#s--">SerializerWriter</a></code></span></div>
 <div class="block">Adds a whitespace character to the output if the <code>useWhitespace</code> setting is enabled.</div>
@@ -1602,7 +1606,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>q</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.599">q</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.602">q</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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#q--">SerializerWriter</a></code></span></div>
 <div class="block">Adds the quote character specified by the <code>quoteChar</code> setting to the output.</div>
@@ -1622,7 +1626,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>i</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.605">i</a>(int&nbsp;indent)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.608">i</a>(int&nbsp;indent)
             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#i-int-">SerializerWriter</a></code></span></div>
 <div class="block">Writes an indent to the writer if the <code>useWhitespace</code> setting is enabled.</div>
@@ -1644,7 +1648,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>nl</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.611">nl</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.614">nl</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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#nl--">SerializerWriter</a></code></span></div>
 <div class="block">Writes a newline to the writer if the <code>useWhitespace</code> setting is enabled.</div>
@@ -1664,7 +1668,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.617">append</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>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.620">append</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>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-java.lang.Object-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text to the writer.</div>
@@ -1686,7 +1690,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.623">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.626">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-java.lang.String-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text to the writer.</div>
@@ -1708,7 +1712,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.629">append</a>(char&nbsp;c)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.632">append</a>(char&nbsp;c)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -1726,7 +1730,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
 <ul class="blockListLast">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.635">toString</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/xml/XmlWriter.html#line.638">toString</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#toString--" title="class or interface in java.lang">toString</a></code>&nbsp;in class&nbsp;<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>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index bf32050..29de933 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -6475,6 +6475,9 @@
                <li><a href="org/apache/juneau/ini/ConfigFile.html#getObjectWithDefault-java.lang.String-T-java.lang.Class-"><code>getObjectWithDefault(String,Object,Class)</code></a> 
             </ul>
          <li>New ability to interact with config file sections with proxy interfaces with new method <a href="org/apache/juneau/ini/ConfigFile.html#getSectionAsInterface-java.lang.String-java.lang.Class-"><code>ConfigFile.getSectionAsInterface(String,Class)</code></a>.
+         <li>New <a href="org/apache/juneau/html/annotation/Html.html#render--"><code>@Html.render()</code></a> annotation and <a href="org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html"><code>HtmlRender</code></a> class that allows you
+            to customize the HTML output and CSS style on bean properties:<br>
+            <img class='bordered' src='doc-files/HtmlRender_1.png'>
       </ul>
 
       <h6 class='topic'>org.apache.juneau.rest</h6>
@@ -6602,6 +6605,12 @@
 
       <h6 class='topic'>org.apache.juneau.rest.client</h6>
       <ul class='spaced-list'>
+         <li>New <a href="org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable"><code>@Path</code></a> annotation for specifying path variables on remoteable interfaces.
+         <li>The following annotations (and related methods on RestCall) can now take <code>NameValuePairs</code> and beans as input 
+            when using <js>"*"</js> as the name.
+            <br><a href="org/apache/juneau/remoteable/FormData.html" title="annotation in org.apache.juneau.remoteable"><code>@FormData</code></a>,<a href="org/apache/juneau/remoteable/FormDataIfNE.html" title="annotation in org.apache.juneau.remoteable"><code>@FormDataIfNE</code></a>,
+            <a href="org/apache/juneau/remoteable/Query.html" title="annotation in org.apache.juneau.remoteable"><code>@Query</code></a>,<a href="org/apache/juneau/remoteable/QueryIfNE.html" title="annotation in org.apache.juneau.remoteable"><code>@QueryIfNE</code></a>,
+            <a href="org/apache/juneau/remoteable/Header.html" title="annotation in org.apache.juneau.remoteable"><code>@Header</code></a>,<a href="org/apache/juneau/remoteable/HeaderIfNE.html" title="annotation in org.apache.juneau.remoteable"><code>@HeaderIfNE</code></a>, 
       </ul>
 
       <h6 class='topic'>org.apache.juneau.microservice</h6>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index 5b84ab9..e251bb4 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -838,6 +838,7 @@
 </li>
 </ul>
 </li>
+<li type="circle">org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html"><span class="typeNameLink">HtmlRender</span></a>&lt;T&gt;</li>
 <li type="circle">java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io"><span class="typeNameLink">InputStream</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Closeable.html?is-external=true" title="class or interface in java.io">Closeable</a>)
 <ul>
 <li type="circle">org.apache.juneau.msgpack.<a href="org/apache/juneau/msgpack/MsgPackInputStream.html" title="class in org.apache.juneau.msgpack"><span class="typeNameLink">MsgPackInputStream</span></a></li>
@@ -1222,6 +1223,7 @@
 <li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/ThrowableUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">ThrowableUtils</span></a></li>
 <li type="circle">org.apache.juneau.rest.converters.<a href="org/apache/juneau/rest/converters/Traversable.html" title="class in org.apache.juneau.rest.converters"><span class="typeNameLink">Traversable</span></a> (implements org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>)</li>
 <li type="circle">org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonUtils.html" title="class in org.apache.juneau.uon"><span class="typeNameLink">UonUtils</span></a></li>
+<li type="circle">org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau"><span class="typeNameLink">UriContext</span></a></li>
 <li type="circle">org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingContext.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingContext</span></a> (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>)</li>
 <li type="circle">org.apache.juneau.rest.<a href="org/apache/juneau/rest/UrlPathPattern.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">UrlPathPattern</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;)</li>
 <li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/Utils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Utils</span></a></li>
@@ -1332,6 +1334,7 @@
 <li type="circle">org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/Remoteable.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Remoteable</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/QueryIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">QueryIfNE</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/Query.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Query</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Path</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/HeaderIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">HeaderIfNE</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/Header.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Header</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/FormDataIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">FormDataIfNE</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
@@ -1369,6 +1372,8 @@
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, 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.<a href="org/apache/juneau/Visibility.html" title="enum in org.apache.juneau"><span class="typeNameLink">Visibility</span></a></li>
+<li type="circle">org.apache.juneau.<a href="org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau"><span class="typeNameLink">UriResolution</span></a></li>
+<li type="circle">org.apache.juneau.<a href="org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau"><span class="typeNameLink">UriRelativity</span></a></li>
 <li type="circle">org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonType.html" title="enum in org.apache.juneau.dto.jsonschema"><span class="typeNameLink">JsonType</span></a></li>
 <li type="circle">org.apache.juneau.http.<a href="org/apache/juneau/http/HttpMethod.html" title="enum in org.apache.juneau.http"><span class="typeNameLink">HttpMethod</span></a></li>
 <li type="circle">org.apache.juneau.http.<a href="org/apache/juneau/http/ContentEncodingEnum.html" title="enum in org.apache.juneau.http"><span class="typeNameLink">ContentEncodingEnum</span></a></li>


[07/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
index b6e3b37..9cfb398 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
@@ -545,94 +545,99 @@
 <span class="sourceLineNo">537</span>                     RestCall rc = (httpMethod.equals("POST") ? doPost(url) : doGet(url));<a name="line.537"></a>
 <span class="sourceLineNo">538</span>                     rc.serializer(serializer).parser(parser);<a name="line.538"></a>
 <span class="sourceLineNo">539</span><a name="line.539"></a>
-<span class="sourceLineNo">540</span>                     for (RemoteMethodArg a : rmm.getQueryArgs())<a name="line.540"></a>
-<span class="sourceLineNo">541</span>                        rc.query(a.name, args[a.index], a.skipIfNE);<a name="line.541"></a>
+<span class="sourceLineNo">540</span>                     for (RemoteMethodArg a : rmm.getPathArgs())<a name="line.540"></a>
+<span class="sourceLineNo">541</span>                        rc.path(a.name, args[a.index]);<a name="line.541"></a>
 <span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span>                     for (RemoteMethodArg a : rmm.getFormDataArgs())<a name="line.543"></a>
-<span class="sourceLineNo">544</span>                        rc.formData(a.name, args[a.index], a.skipIfNE);<a name="line.544"></a>
+<span class="sourceLineNo">543</span>                     for (RemoteMethodArg a : rmm.getQueryArgs())<a name="line.543"></a>
+<span class="sourceLineNo">544</span>                        rc.query(a.name, args[a.index], a.skipIfNE);<a name="line.544"></a>
 <span class="sourceLineNo">545</span><a name="line.545"></a>
-<span class="sourceLineNo">546</span>                     for (RemoteMethodArg a : rmm.getHeaderArgs())<a name="line.546"></a>
-<span class="sourceLineNo">547</span>                        rc.header(a.name, args[a.index], a.skipIfNE);<a name="line.547"></a>
+<span class="sourceLineNo">546</span>                     for (RemoteMethodArg a : rmm.getFormDataArgs())<a name="line.546"></a>
+<span class="sourceLineNo">547</span>                        rc.formData(a.name, args[a.index], a.skipIfNE);<a name="line.547"></a>
 <span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span>                     if (rmm.getBodyArg() != null)<a name="line.549"></a>
-<span class="sourceLineNo">550</span>                        rc.input(args[rmm.getBodyArg()]);<a name="line.550"></a>
+<span class="sourceLineNo">549</span>                     for (RemoteMethodArg a : rmm.getHeaderArgs())<a name="line.549"></a>
+<span class="sourceLineNo">550</span>                        rc.header(a.name, args[a.index], a.skipIfNE);<a name="line.550"></a>
 <span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span>                     if (rmm.getOtherArgs().length &gt; 0) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span>                        Object[] otherArgs = new Object[rmm.getOtherArgs().length];<a name="line.553"></a>
-<span class="sourceLineNo">554</span>                        int i = 0;<a name="line.554"></a>
-<span class="sourceLineNo">555</span>                        for (Integer otherArg : rmm.getOtherArgs())<a name="line.555"></a>
-<span class="sourceLineNo">556</span>                           otherArgs[i++] = args[otherArg];<a name="line.556"></a>
-<span class="sourceLineNo">557</span>                        rc.input(otherArgs);<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>                     return rc.getResponse(method.getGenericReturnType());<a name="line.560"></a>
-<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span>                  } catch (RestCallException e) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>                     // Try to throw original exception if possible.<a name="line.563"></a>
-<span class="sourceLineNo">564</span>                     e.throwServerException(interfaceClass.getClassLoader());<a name="line.564"></a>
-<span class="sourceLineNo">565</span>                     throw new RuntimeException(e);<a name="line.565"></a>
-<span class="sourceLineNo">566</span>                  } catch (Exception e) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>                     throw new RuntimeException(e);<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>         });<a name="line.570"></a>
-<span class="sourceLineNo">571</span>      } catch (Exception e) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>         throw new RuntimeException(e);<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><a name="line.575"></a>
-<span class="sourceLineNo">576</span>   private Pattern absUrlPattern = Pattern.compile("^\\w+\\:\\/\\/.*");<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span>   UrlEncodingSerializer getUrlEncodingSerializer() {<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      return urlEncodingSerializer;<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>   URI toURI(Object url) throws URISyntaxException {<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      if (url instanceof URI)<a name="line.583"></a>
-<span class="sourceLineNo">584</span>         return (URI)url;<a name="line.584"></a>
-<span class="sourceLineNo">585</span>      if (url instanceof URL)<a name="line.585"></a>
-<span class="sourceLineNo">586</span>         ((URL)url).toURI();<a name="line.586"></a>
-<span class="sourceLineNo">587</span>      if (url instanceof URIBuilder)<a name="line.587"></a>
-<span class="sourceLineNo">588</span>         return ((URIBuilder)url).build();<a name="line.588"></a>
-<span class="sourceLineNo">589</span>      String s = url == null ? "" : url.toString();<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      if (rootUrl != null &amp;&amp; ! absUrlPattern.matcher(s).matches()) {<a name="line.590"></a>
-<span class="sourceLineNo">591</span>         if (s.isEmpty())<a name="line.591"></a>
-<span class="sourceLineNo">592</span>            s = rootUrl;<a name="line.592"></a>
-<span class="sourceLineNo">593</span>         else {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>            StringBuilder sb = new StringBuilder(rootUrl);<a name="line.594"></a>
-<span class="sourceLineNo">595</span>            if (! s.startsWith("/"))<a name="line.595"></a>
-<span class="sourceLineNo">596</span>               sb.append('/');<a name="line.596"></a>
-<span class="sourceLineNo">597</span>            sb.append(s);<a name="line.597"></a>
-<span class="sourceLineNo">598</span>            s = sb.toString();<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>      return new URI(s);<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   }<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>   ExecutorService getExecutorService(boolean create) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span>      if (executorService != null || ! create)<a name="line.605"></a>
-<span class="sourceLineNo">606</span>         return executorService;<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      synchronized(this) {<a name="line.607"></a>
-<span class="sourceLineNo">608</span>         if (executorService == null)<a name="line.608"></a>
-<span class="sourceLineNo">609</span>            executorService = new ThreadPoolExecutor(1, 1, 30, TimeUnit.SECONDS, new ArrayBlockingQueue&lt;Runnable&gt;(10));<a name="line.609"></a>
-<span class="sourceLineNo">610</span>         return executorService;<a name="line.610"></a>
-<span class="sourceLineNo">611</span>      }<a name="line.611"></a>
-<span class="sourceLineNo">612</span>   }<a name="line.612"></a>
-<span class="sourceLineNo">613</span><a name="line.613"></a>
-<span class="sourceLineNo">614</span>   @Override<a name="line.614"></a>
-<span class="sourceLineNo">615</span>   protected void finalize() throws Throwable {<a name="line.615"></a>
-<span class="sourceLineNo">616</span>      if (! isClosed &amp;&amp; ! keepHttpClientOpen) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>         System.err.println("WARNING:  RestClient garbage collected before it was finalized.");<a name="line.617"></a>
-<span class="sourceLineNo">618</span>         if (creationStack != null) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>            System.err.println("Creation Stack:");<a name="line.619"></a>
-<span class="sourceLineNo">620</span>            for (StackTraceElement e : creationStack)<a name="line.620"></a>
-<span class="sourceLineNo">621</span>               System.err.println(e);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>         } else {<a name="line.622"></a>
-<span class="sourceLineNo">623</span>            System.err.println("Creation stack traces can be displayed by setting the system property 'org.apache.juneau.rest.client.RestClient.trackLifecycle' to true.");<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>   }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>}<a name="line.627"></a>
+<span class="sourceLineNo">552</span>                     if (rmm.getBodyArg() != null)<a name="line.552"></a>
+<span class="sourceLineNo">553</span>                        rc.input(args[rmm.getBodyArg()]);<a name="line.553"></a>
+<span class="sourceLineNo">554</span><a name="line.554"></a>
+<span class="sourceLineNo">555</span>                     if (rmm.getOtherArgs().length &gt; 0) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span>                        Object[] otherArgs = new Object[rmm.getOtherArgs().length];<a name="line.556"></a>
+<span class="sourceLineNo">557</span>                        int i = 0;<a name="line.557"></a>
+<span class="sourceLineNo">558</span>                        for (Integer otherArg : rmm.getOtherArgs())<a name="line.558"></a>
+<span class="sourceLineNo">559</span>                           otherArgs[i++] = args[otherArg];<a name="line.559"></a>
+<span class="sourceLineNo">560</span>                        rc.input(otherArgs);<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>                     return rc.getResponse(method.getGenericReturnType());<a name="line.563"></a>
+<span class="sourceLineNo">564</span><a name="line.564"></a>
+<span class="sourceLineNo">565</span>                  } catch (RestCallException e) {<a name="line.565"></a>
+<span class="sourceLineNo">566</span>                     // Try to throw original exception if possible.<a name="line.566"></a>
+<span class="sourceLineNo">567</span>                     e.throwServerException(interfaceClass.getClassLoader());<a name="line.567"></a>
+<span class="sourceLineNo">568</span>                     throw new RuntimeException(e);<a name="line.568"></a>
+<span class="sourceLineNo">569</span>                  } catch (Exception e) {<a name="line.569"></a>
+<span class="sourceLineNo">570</span>                     throw new RuntimeException(e);<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>      } catch (Exception e) {<a name="line.574"></a>
+<span class="sourceLineNo">575</span>         throw new RuntimeException(e);<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>   private Pattern absUrlPattern = Pattern.compile("^\\w+\\:\\/\\/.*");<a name="line.579"></a>
+<span class="sourceLineNo">580</span><a name="line.580"></a>
+<span class="sourceLineNo">581</span>   UrlEncodingSerializer getUrlEncodingSerializer() {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      return urlEncodingSerializer;<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>   URI toURI(Object url) throws URISyntaxException {<a name="line.585"></a>
+<span class="sourceLineNo">586</span>      if (url instanceof URI)<a name="line.586"></a>
+<span class="sourceLineNo">587</span>         return (URI)url;<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      if (url instanceof URL)<a name="line.588"></a>
+<span class="sourceLineNo">589</span>         ((URL)url).toURI();<a name="line.589"></a>
+<span class="sourceLineNo">590</span>      if (url instanceof URIBuilder)<a name="line.590"></a>
+<span class="sourceLineNo">591</span>         return ((URIBuilder)url).build();<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      String s = url == null ? "" : url.toString();<a name="line.592"></a>
+<span class="sourceLineNo">593</span>      if (rootUrl != null &amp;&amp; ! absUrlPattern.matcher(s).matches()) {<a name="line.593"></a>
+<span class="sourceLineNo">594</span>         if (s.isEmpty())<a name="line.594"></a>
+<span class="sourceLineNo">595</span>            s = rootUrl;<a name="line.595"></a>
+<span class="sourceLineNo">596</span>         else {<a name="line.596"></a>
+<span class="sourceLineNo">597</span>            StringBuilder sb = new StringBuilder(rootUrl);<a name="line.597"></a>
+<span class="sourceLineNo">598</span>            if (! s.startsWith("/"))<a name="line.598"></a>
+<span class="sourceLineNo">599</span>               sb.append('/');<a name="line.599"></a>
+<span class="sourceLineNo">600</span>            sb.append(s);<a name="line.600"></a>
+<span class="sourceLineNo">601</span>            s = sb.toString();<a name="line.601"></a>
+<span class="sourceLineNo">602</span>         }<a name="line.602"></a>
+<span class="sourceLineNo">603</span>      }<a name="line.603"></a>
+<span class="sourceLineNo">604</span>      if (s.indexOf('{') != -1)<a name="line.604"></a>
+<span class="sourceLineNo">605</span>         s = s.replace("{", "%7B").replace("}", "%7D");<a name="line.605"></a>
+<span class="sourceLineNo">606</span>      return new URI(s);<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>   ExecutorService getExecutorService(boolean create) {<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      if (executorService != null || ! create)<a name="line.610"></a>
+<span class="sourceLineNo">611</span>         return executorService;<a name="line.611"></a>
+<span class="sourceLineNo">612</span>      synchronized(this) {<a name="line.612"></a>
+<span class="sourceLineNo">613</span>         if (executorService == null)<a name="line.613"></a>
+<span class="sourceLineNo">614</span>            executorService = new ThreadPoolExecutor(1, 1, 30, TimeUnit.SECONDS, new ArrayBlockingQueue&lt;Runnable&gt;(10));<a name="line.614"></a>
+<span class="sourceLineNo">615</span>         return executorService;<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>   @Override<a name="line.619"></a>
+<span class="sourceLineNo">620</span>   protected void finalize() throws Throwable {<a name="line.620"></a>
+<span class="sourceLineNo">621</span>      if (! isClosed &amp;&amp; ! keepHttpClientOpen) {<a name="line.621"></a>
+<span class="sourceLineNo">622</span>         System.err.println("WARNING:  RestClient garbage collected before it was finalized.");<a name="line.622"></a>
+<span class="sourceLineNo">623</span>         if (creationStack != null) {<a name="line.623"></a>
+<span class="sourceLineNo">624</span>            System.err.println("Creation Stack:");<a name="line.624"></a>
+<span class="sourceLineNo">625</span>            for (StackTraceElement e : creationStack)<a name="line.625"></a>
+<span class="sourceLineNo">626</span>               System.err.println(e);<a name="line.626"></a>
+<span class="sourceLineNo">627</span>         } else {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>            System.err.println("Creation stack traces can be displayed by setting the system property 'org.apache.juneau.rest.client.RestClient.trackLifecycle' to true.");<a name="line.628"></a>
+<span class="sourceLineNo">629</span>         }<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClientBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClientBuilder.html b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClientBuilder.html
index 63d799d..5c4a48d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClientBuilder.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClientBuilder.html
@@ -944,7 +944,7 @@
 <span class="sourceLineNo">936</span>    * @return This object (for method chaining).<a name="line.936"></a>
 <span class="sourceLineNo">937</span>    * @see SerializerContext#SERIALIZER_trimStrings<a name="line.937"></a>
 <span class="sourceLineNo">938</span>    */<a name="line.938"></a>
-<span class="sourceLineNo">939</span>   public RestClientBuilder trimStringsS(boolean value) {<a name="line.939"></a>
+<span class="sourceLineNo">939</span>   public RestClientBuilder trimStrings(boolean value) {<a name="line.939"></a>
 <span class="sourceLineNo">940</span>      return property(SERIALIZER_trimStrings, value);<a name="line.940"></a>
 <span class="sourceLineNo">941</span>   }<a name="line.941"></a>
 <span class="sourceLineNo">942</span><a name="line.942"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/rest/jaxrs/BaseProvider.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/jaxrs/BaseProvider.html b/content/site/apidocs/src-html/org/apache/juneau/rest/jaxrs/BaseProvider.html
index 3129499..0773406 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/jaxrs/BaseProvider.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/jaxrs/BaseProvider.html
@@ -122,13 +122,13 @@
 <span class="sourceLineNo">114</span>         if (s.isWriterSerializer()) {<a name="line.114"></a>
 <span class="sourceLineNo">115</span>            WriterSerializer s2 = (WriterSerializer)s;<a name="line.115"></a>
 <span class="sourceLineNo">116</span>            OutputStreamWriter w = new OutputStreamWriter(out, IOUtils.UTF8);<a name="line.116"></a>
-<span class="sourceLineNo">117</span>            SerializerSession session = s.createSession(w, mp, null, locale, timeZone, sm.getMediaType());<a name="line.117"></a>
+<span class="sourceLineNo">117</span>            SerializerSession session = s.createSession(w, mp, null, locale, timeZone, sm.getMediaType(), null);<a name="line.117"></a>
 <span class="sourceLineNo">118</span>            s2.serialize(session, o);<a name="line.118"></a>
 <span class="sourceLineNo">119</span>            w.flush();<a name="line.119"></a>
 <span class="sourceLineNo">120</span>            w.close();<a name="line.120"></a>
 <span class="sourceLineNo">121</span>         } else {<a name="line.121"></a>
 <span class="sourceLineNo">122</span>            OutputStreamSerializer s2 = (OutputStreamSerializer)s;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>            SerializerSession session = s.createSession(s2, mp, null, locale, timeZone, sm.getMediaType());<a name="line.123"></a>
+<span class="sourceLineNo">123</span>            SerializerSession session = s.createSession(s2, mp, null, locale, timeZone, sm.getMediaType(), null);<a name="line.123"></a>
 <span class="sourceLineNo">124</span>            s2.serialize(session, o);<a name="line.124"></a>
 <span class="sourceLineNo">125</span>            out.flush();<a name="line.125"></a>
 <span class="sourceLineNo">126</span>            out.close();<a name="line.126"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/rest/response/DefaultHandler.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/response/DefaultHandler.html b/content/site/apidocs/src-html/org/apache/juneau/rest/response/DefaultHandler.html
index 4fa8f4c..437f4eb 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/response/DefaultHandler.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/response/DefaultHandler.html
@@ -68,13 +68,13 @@
 <span class="sourceLineNo">060</span>            if (! s.isWriterSerializer()) {<a name="line.60"></a>
 <span class="sourceLineNo">061</span>               OutputStreamSerializer s2 = (OutputStreamSerializer)s;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>               OutputStream os = res.getNegotiatedOutputStream();<a name="line.62"></a>
-<span class="sourceLineNo">063</span>               SerializerSession session = s.createSession(os, p, req.getJavaMethod(), req.getLocale(), req.getHeaders().getTimeZone(), mediaType);<a name="line.63"></a>
+<span class="sourceLineNo">063</span>               SerializerSession session = s.createSession(os, p, req.getJavaMethod(), req.getLocale(), req.getHeaders().getTimeZone(), mediaType, req.getUriContext());<a name="line.63"></a>
 <span class="sourceLineNo">064</span>               s2.serialize(session, output);<a name="line.64"></a>
 <span class="sourceLineNo">065</span>               os.close();<a name="line.65"></a>
 <span class="sourceLineNo">066</span>            } else {<a name="line.66"></a>
 <span class="sourceLineNo">067</span>               WriterSerializer s2 = (WriterSerializer)s;<a name="line.67"></a>
 <span class="sourceLineNo">068</span>               Writer w = res.getNegotiatedWriter();<a name="line.68"></a>
-<span class="sourceLineNo">069</span>               SerializerSession session = s.createSession(w, p, req.getJavaMethod(), req.getLocale(), req.getHeaders().getTimeZone(), mediaType);<a name="line.69"></a>
+<span class="sourceLineNo">069</span>               SerializerSession session = s.createSession(w, p, req.getJavaMethod(), req.getLocale(), req.getHeaders().getTimeZone(), mediaType, req.getUriContext());<a name="line.69"></a>
 <span class="sourceLineNo">070</span>               s2.serialize(session, output);<a name="line.70"></a>
 <span class="sourceLineNo">071</span>               w.close();<a name="line.71"></a>
 <span class="sourceLineNo">072</span>            }<a name="line.72"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/serializer/Serializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/serializer/Serializer.html b/content/site/apidocs/src-html/org/apache/juneau/serializer/Serializer.html
index 85ffc5c..a79f5e4 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/serializer/Serializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/serializer/Serializer.html
@@ -92,7 +92,7 @@
 <span class="sourceLineNo">084</span>    * Serializes a POJO to the specified output stream or writer.<a name="line.84"></a>
 <span class="sourceLineNo">085</span>    * &lt;p&gt;<a name="line.85"></a>
 <span class="sourceLineNo">086</span>    * This method should NOT close the context object.<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    * @param session The serializer session object return by {@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)}.&lt;br&gt;<a name="line.87"></a>
+<span class="sourceLineNo">087</span>    * @param session The serializer session object return by {@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)}.&lt;br&gt;<a name="line.87"></a>
 <span class="sourceLineNo">088</span>    * If &lt;jk&gt;null&lt;/jk&gt;, session is created using {@link #createSession(Object)}.<a name="line.88"></a>
 <span class="sourceLineNo">089</span>    * @param o The object to serialize.<a name="line.89"></a>
 <span class="sourceLineNo">090</span>    *<a name="line.90"></a>
@@ -120,7 +120,7 @@
 <span class="sourceLineNo">112</span>   /**<a name="line.112"></a>
 <span class="sourceLineNo">113</span>    * Serialize the specified object using the specified session.<a name="line.113"></a>
 <span class="sourceLineNo">114</span>    *<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    * @param session The serializer session object return by {@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)}.&lt;br&gt;<a name="line.115"></a>
+<span class="sourceLineNo">115</span>    * @param session The serializer session object return by {@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)}.&lt;br&gt;<a name="line.115"></a>
 <span class="sourceLineNo">116</span>    * If &lt;jk&gt;null&lt;/jk&gt;, session is created using {@link #createSession(Object)}.<a name="line.116"></a>
 <span class="sourceLineNo">117</span>    * @param o The object to serialize.<a name="line.117"></a>
 <span class="sourceLineNo">118</span>    * @throws SerializeException If a problem occurred trying to convert the output.<a name="line.118"></a>
@@ -191,112 +191,114 @@
 <span class="sourceLineNo">183</span>    * @param timeZone The session timezone.<a name="line.183"></a>
 <span class="sourceLineNo">184</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    * @return The new session.<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    */<a name="line.187"></a>
-<span class="sourceLineNo">188</span>   public SerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      return new SerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<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>    * Create a basic session object without overriding properties or specifying &lt;code&gt;javaMethod&lt;/code&gt;.<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    * &lt;p&gt;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    * Equivalent to calling &lt;code&gt;createSession(&lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;)&lt;/code&gt;.<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    *<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    * @param output The output object.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    *    &lt;br&gt;Character-based serializers can handle the following output class types:<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    *    &lt;ul&gt;<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    *       &lt;li&gt;{@link Writer}<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    *       &lt;li&gt;{@link OutputStream} - Output will be written as UTF-8 encoded stream.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    *       &lt;li&gt;{@link File} - Output will be written as system-default encoded stream.<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    *    &lt;/ul&gt;<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    *    &lt;br&gt;Stream-based serializers can handle the following output class types:<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    *    &lt;ul&gt;<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    *       &lt;li&gt;{@link OutputStream}<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    *       &lt;li&gt;{@link File}<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    *    &lt;/ul&gt;<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    * @return The new session.<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    */<a name="line.210"></a>
-<span class="sourceLineNo">211</span>   protected SerializerSession createSession(Object output) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      return createSession(output, null, null, null, null, getPrimaryMediaType());<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>    * Converts the contents of the specified object array to a list.<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    * &lt;p&gt;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    * Works on both object and primitive arrays.<a name="line.218"></a>
+<span class="sourceLineNo">186</span>    * @param uriContext The URI context.<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    * @return The new session.<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    */<a name="line.189"></a>
+<span class="sourceLineNo">190</span>   public SerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      return new SerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   /**<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    * Create a basic session object without overriding properties or specifying &lt;code&gt;javaMethod&lt;/code&gt;.<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    * &lt;p&gt;<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    * Equivalent to calling &lt;code&gt;createSession(&lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;)&lt;/code&gt;.<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    *<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    * @param output The output object.<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    *    &lt;br&gt;Character-based serializers can handle the following output class types:<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    *    &lt;ul&gt;<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    *       &lt;li&gt;{@link Writer}<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    *       &lt;li&gt;{@link OutputStream} - Output will be written as UTF-8 encoded stream.<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    *       &lt;li&gt;{@link File} - Output will be written as system-default encoded stream.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    *    &lt;/ul&gt;<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    *    &lt;br&gt;Stream-based serializers can handle the following output class types:<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    *    &lt;ul&gt;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    *       &lt;li&gt;{@link OutputStream}<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    *       &lt;li&gt;{@link File}<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    *    &lt;/ul&gt;<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    * @return The new session.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    */<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   protected SerializerSession createSession(Object output) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      return createSession(output, null, null, null, null, getPrimaryMediaType(), null);<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>    * Converts the contents of the specified object array to a list.<a name="line.218"></a>
 <span class="sourceLineNo">219</span>    * &lt;p&gt;<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    * In the case of multi-dimensional arrays, the outgoing list will<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    *    contain elements of type n-1 dimension.  i.e. if {@code type} is &lt;code&gt;&lt;jk&gt;int&lt;/jk&gt;[][]&lt;/code&gt;<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    *    then {@code list} will have entries of type &lt;code&gt;&lt;jk&gt;int&lt;/jk&gt;[]&lt;/code&gt;.<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    *<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    * @param type The type of array.<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    * @param array The array being converted.<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    * @return The array as a list.<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>   protected static final List&lt;Object&gt; toList(Class&lt;?&gt; type, Object array) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      Class&lt;?&gt; componentType = type.getComponentType();<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      if (componentType.isPrimitive()) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>         int l = Array.getLength(array);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>         List&lt;Object&gt; list = new ArrayList&lt;Object&gt;(l);<a name="line.232"></a>
-<span class="sourceLineNo">233</span>         for (int i = 0; i &lt; l; i++)<a name="line.233"></a>
-<span class="sourceLineNo">234</span>            list.add(Array.get(array, i));<a name="line.234"></a>
-<span class="sourceLineNo">235</span>         return list;<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      return Arrays.asList((Object[])array);<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>   /**<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    * Returns the media types handled based on the value of the {@link Produces} annotation on the serializer class.<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    * &lt;p&gt;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    * This method can be overridden by subclasses to determine the media types programatically.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    *<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    * @return The list of media types.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    */<a name="line.246"></a>
-<span class="sourceLineNo">247</span>   public MediaType[] getMediaTypes() {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      return mediaTypes;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   }<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>    * Returns the first media type specified on this serializer via the {@link Produces} annotation.<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    *<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    * @return The media type.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>   public MediaType getPrimaryMediaType() {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      return mediaTypes == null || mediaTypes.length == 0 ? null : mediaTypes[0];<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>    * Optional method that specifies HTTP request headers for this serializer.<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    * &lt;p&gt;<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    * For example, {@link SoapXmlSerializer} needs to set a &lt;code&gt;SOAPAction&lt;/code&gt; header.<a name="line.263"></a>
+<span class="sourceLineNo">220</span>    * Works on both object and primitive arrays.<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    * &lt;p&gt;<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    * In the case of multi-dimensional arrays, the outgoing list will<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    *    contain elements of type n-1 dimension.  i.e. if {@code type} is &lt;code&gt;&lt;jk&gt;int&lt;/jk&gt;[][]&lt;/code&gt;<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    *    then {@code list} will have entries of type &lt;code&gt;&lt;jk&gt;int&lt;/jk&gt;[]&lt;/code&gt;.<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    *<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    * @param type The type of array.<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    * @param array The array being converted.<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    * @return The array as a list.<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    */<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   protected static final List&lt;Object&gt; toList(Class&lt;?&gt; type, Object array) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      Class&lt;?&gt; componentType = type.getComponentType();<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      if (componentType.isPrimitive()) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>         int l = Array.getLength(array);<a name="line.233"></a>
+<span class="sourceLineNo">234</span>         List&lt;Object&gt; list = new ArrayList&lt;Object&gt;(l);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>         for (int i = 0; i &lt; l; i++)<a name="line.235"></a>
+<span class="sourceLineNo">236</span>            list.add(Array.get(array, i));<a name="line.236"></a>
+<span class="sourceLineNo">237</span>         return list;<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      }<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      return Arrays.asList((Object[])array);<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>   /**<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    * Returns the media types handled based on the value of the {@link Produces} annotation on the serializer class.<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    * &lt;p&gt;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    * This method can be overridden by subclasses to determine the media types programatically.<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    *<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    * @return The list of media types.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    */<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   public MediaType[] getMediaTypes() {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      return mediaTypes;<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>   /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    * Returns the first media type specified on this serializer via the {@link Produces} annotation.<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    *<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    * @return The media type.<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    */<a name="line.257"></a>
+<span class="sourceLineNo">258</span>   public MediaType getPrimaryMediaType() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      return mediaTypes == null || mediaTypes.length == 0 ? null : mediaTypes[0];<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>    * Optional method that specifies HTTP request headers for this serializer.<a name="line.263"></a>
 <span class="sourceLineNo">264</span>    * &lt;p&gt;<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    * This method is typically meaningless if the serializer is being used standalone (i.e. outside of a REST server or client).<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    *<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    * @param properties Optional run-time properties (the same that are passed to {@link WriterSerializer#doSerialize(SerializerSession, Object)}.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    * Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    * @return The HTTP headers to set on HTTP requests.<a name="line.269"></a>
+<span class="sourceLineNo">265</span>    * For example, {@link SoapXmlSerializer} needs to set a &lt;code&gt;SOAPAction&lt;/code&gt; header.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    * &lt;p&gt;<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    * This method is typically meaningless if the serializer is being used standalone (i.e. outside of a REST server or client).<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    *<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    * @param properties Optional run-time properties (the same that are passed to {@link WriterSerializer#doSerialize(SerializerSession, Object)}.<a name="line.269"></a>
 <span class="sourceLineNo">270</span>    * Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    */<a name="line.271"></a>
-<span class="sourceLineNo">272</span>   public ObjectMap getResponseHeaders(ObjectMap properties) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      return ObjectMap.EMPTY_MAP;<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>    * Optional method that returns the response &lt;code&gt;Content-Type&lt;/code&gt; for this serializer if it is different from the matched media type.<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    * &lt;p&gt;<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    * This method is specified to override the content type for this serializer.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    * For example, the {@link org.apache.juneau.json.JsonSerializer.Simple} class returns that it handles media type &lt;js&gt;"text/json+simple"&lt;/js&gt;, but returns<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    *    &lt;js&gt;"text/json"&lt;/js&gt; as the actual content type.<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    * This allows clients to request specific 'flavors' of content using specialized &lt;code&gt;Accept&lt;/code&gt; header values.<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    * &lt;p&gt;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    * This method is typically meaningless if the serializer is being used standalone (i.e. outside of a REST server or client).<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    *<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    * @return The response content type.  If &lt;jk&gt;null&lt;/jk&gt;, then the matched media type is used.<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    */<a name="line.287"></a>
-<span class="sourceLineNo">288</span>   public MediaType getResponseContentType() {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      return contentType;<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">271</span>    * @return The HTTP headers to set on HTTP requests.<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    * Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    */<a name="line.273"></a>
+<span class="sourceLineNo">274</span>   public ObjectMap getResponseHeaders(ObjectMap properties) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      return ObjectMap.EMPTY_MAP;<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>   /**<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    * Optional method that returns the response &lt;code&gt;Content-Type&lt;/code&gt; for this serializer if it is different from the matched media type.<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    * &lt;p&gt;<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    * This method is specified to override the content type for this serializer.<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    * For example, the {@link org.apache.juneau.json.JsonSerializer.Simple} class returns that it handles media type &lt;js&gt;"text/json+simple"&lt;/js&gt;, but returns<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    *    &lt;js&gt;"text/json"&lt;/js&gt; as the actual content type.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    * This allows clients to request specific 'flavors' of content using specialized &lt;code&gt;Accept&lt;/code&gt; header values.<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    * &lt;p&gt;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    * This method is typically meaningless if the serializer is being used standalone (i.e. outside of a REST server or client).<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    *<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    * @return The response content type.  If &lt;jk&gt;null&lt;/jk&gt;, then the matched media type is used.<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    */<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   public MediaType getResponseContentType() {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      return contentType;<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>
 
 
 


[14/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
index 8bde8d8..4764b4c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
@@ -60,142 +60,144 @@
 <span class="sourceLineNo">052</span>    * Create a new session using properties specified in the context.<a name="line.52"></a>
 <span class="sourceLineNo">053</span>    *<a name="line.53"></a>
 <span class="sourceLineNo">054</span>    * @param ctx The context creating this session object.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    * The context contains all the configuration settings for this object.<a name="line.55"></a>
+<span class="sourceLineNo">055</span>    *    The context contains all the configuration settings for this object.<a name="line.55"></a>
 <span class="sourceLineNo">056</span>    * @param output The output object.  See {@link JsonSerializerSession#getWriter()} for valid class types.<a name="line.56"></a>
 <span class="sourceLineNo">057</span>    * @param op The override properties.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    * These override any context properties defined in the context.<a name="line.58"></a>
+<span class="sourceLineNo">058</span>    *    These override any context properties defined in the context.<a name="line.58"></a>
 <span class="sourceLineNo">059</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.59"></a>
 <span class="sourceLineNo">060</span>    * @param locale The session locale.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.61"></a>
+<span class="sourceLineNo">061</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.61"></a>
 <span class="sourceLineNo">062</span>    * @param timeZone The session timezone.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.63"></a>
+<span class="sourceLineNo">063</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.63"></a>
 <span class="sourceLineNo">064</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   protected HtmlSerializerSession(HtmlSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      String labelParameter;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>      if (op == null || op.isEmpty()) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>         anchorText = Enum.valueOf(AnchorText.class, ctx.uriAnchorText);<a name="line.70"></a>
-<span class="sourceLineNo">071</span>         detectLinksInStrings = ctx.detectLinksInStrings;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>         lookForLabelParameters = ctx.lookForLabelParameters;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>         labelParameter = ctx.labelParameter;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>         addKeyValueTableHeaders = ctx.addKeyValueTableHeaders;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      } else {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>         anchorText = Enum.valueOf(AnchorText.class, op.getString(HTML_uriAnchorText, ctx.uriAnchorText));<a name="line.77"></a>
-<span class="sourceLineNo">078</span>         detectLinksInStrings = op.getBoolean(HTML_detectLinksInStrings, ctx.detectLinksInStrings);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>         lookForLabelParameters = op.getBoolean(HTML_lookForLabelParameters, ctx.lookForLabelParameters);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>         labelParameter = op.getString(HTML_labelParameter, ctx.labelParameter);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>         addKeyValueTableHeaders = op.getBoolean(HTML_addKeyValueTableHeaders, ctx.addKeyValueTableHeaders);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>         addBeanTypeProperties = op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      }<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      labelPattern = Pattern.compile("[\\?\\&amp;]" + Pattern.quote(labelParameter) + "=([^\\&amp;]*)");<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      this.absolutePathUriBase = getAbsolutePathUriBase();<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      this.relativeUriBase = getRelativeUriBase();<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>   @Override /* XmlSerializerSession */<a name="line.89"></a>
-<span class="sourceLineNo">090</span>   public HtmlWriter getWriter() throws Exception {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      Object output = getOutput();<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      if (output instanceof HtmlWriter)<a name="line.92"></a>
-<span class="sourceLineNo">093</span>         return (HtmlWriter)output;<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      return new HtmlWriter(super.getWriter(), isUseWhitespace(), isTrimStrings(), getQuoteChar(), getRelativeUriBase(), getAbsolutePathUriBase());<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified object is a URL.<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    *<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    * @param cm The ClassMeta of the object being serialized.<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    * @param pMeta The property metadata of the bean property of the object.  Can be &lt;jk&gt;null&lt;/jk&gt; if the object isn't from a bean property.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    * @param o The object.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified object is a URL.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    */<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   public boolean isUri(ClassMeta&lt;?&gt; cm, BeanPropertyMeta pMeta, Object o) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      if (cm.isUri())<a name="line.106"></a>
-<span class="sourceLineNo">107</span>         return true;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      if (pMeta != null &amp;&amp; pMeta.isUri())<a name="line.108"></a>
+<span class="sourceLineNo">065</span>    * @param uriContext The URI context.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   protected HtmlSerializerSession(HtmlSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      String labelParameter;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      if (op == null || op.isEmpty()) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>         anchorText = Enum.valueOf(AnchorText.class, ctx.uriAnchorText);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>         detectLinksInStrings = ctx.detectLinksInStrings;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>         lookForLabelParameters = ctx.lookForLabelParameters;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>         labelParameter = ctx.labelParameter;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>         addKeyValueTableHeaders = ctx.addKeyValueTableHeaders;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      } else {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>         anchorText = Enum.valueOf(AnchorText.class, op.getString(HTML_uriAnchorText, ctx.uriAnchorText));<a name="line.79"></a>
+<span class="sourceLineNo">080</span>         detectLinksInStrings = op.getBoolean(HTML_detectLinksInStrings, ctx.detectLinksInStrings);<a name="line.80"></a>
+<span class="sourceLineNo">081</span>         lookForLabelParameters = op.getBoolean(HTML_lookForLabelParameters, ctx.lookForLabelParameters);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>         labelParameter = op.getString(HTML_labelParameter, ctx.labelParameter);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>         addKeyValueTableHeaders = op.getBoolean(HTML_addKeyValueTableHeaders, ctx.addKeyValueTableHeaders);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>         addBeanTypeProperties = op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      }<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      labelPattern = Pattern.compile("[\\?\\&amp;]" + Pattern.quote(labelParameter) + "=([^\\&amp;]*)");<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      this.absolutePathUriBase = getAbsolutePathUriBase();<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      this.relativeUriBase = getRelativeUriBase();<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   }<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>   @Override /* XmlSerializerSession */<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   public HtmlWriter getWriter() throws Exception {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      Object output = getOutput();<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      if (output instanceof HtmlWriter)<a name="line.94"></a>
+<span class="sourceLineNo">095</span>         return (HtmlWriter)output;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      return new HtmlWriter(super.getWriter(), isUseWhitespace(), isTrimStrings(), getQuoteChar(), getRelativeUriBase(), getAbsolutePathUriBase(), getUriContext());<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>   /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified object is a URL.<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    *<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    * @param cm The ClassMeta of the object being serialized.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    * @param pMeta The property metadata of the bean property of the object.  Can be &lt;jk&gt;null&lt;/jk&gt; if the object isn't from a bean property.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    * @param o The object.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified object is a URL.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    */<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   public boolean isUri(ClassMeta&lt;?&gt; cm, BeanPropertyMeta pMeta, Object o) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      if (cm.isUri())<a name="line.108"></a>
 <span class="sourceLineNo">109</span>         return true;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      if (detectLinksInStrings &amp;&amp; o instanceof CharSequence &amp;&amp; urlPattern.matcher(o.toString()).matches())<a name="line.110"></a>
+<span class="sourceLineNo">110</span>      if (pMeta != null &amp;&amp; pMeta.isUri())<a name="line.110"></a>
 <span class="sourceLineNo">111</span>         return true;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      return false;<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>    * Returns the anchor text to use for the specified URL object.<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    *<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    * @param pMeta The property metadata of the bean property of the object.  Can be &lt;jk&gt;null&lt;/jk&gt; if the object isn't from a bean property.<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    * @param o The URL object.<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    * @return The anchor text to use for the specified URL object.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    */<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   public String getAnchorText(BeanPropertyMeta pMeta, Object o) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      String s;<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      if (lookForLabelParameters) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>         s = o.toString();<a name="line.125"></a>
-<span class="sourceLineNo">126</span>         Matcher m = labelPattern.matcher(s);<a name="line.126"></a>
-<span class="sourceLineNo">127</span>         if (m.find())<a name="line.127"></a>
-<span class="sourceLineNo">128</span>            return m.group(1);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      }<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      switch (anchorText) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>         case LAST_TOKEN:<a name="line.131"></a>
-<span class="sourceLineNo">132</span>            s = o.toString();<a name="line.132"></a>
-<span class="sourceLineNo">133</span>            if (s.indexOf('/') != -1)<a name="line.133"></a>
-<span class="sourceLineNo">134</span>               s = s.substring(s.lastIndexOf('/')+1);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>            if (s.indexOf('?') != -1)<a name="line.135"></a>
-<span class="sourceLineNo">136</span>               s = s.substring(0, s.indexOf('?'));<a name="line.136"></a>
-<span class="sourceLineNo">137</span>            if (s.indexOf('#') != -1)<a name="line.137"></a>
-<span class="sourceLineNo">138</span>               s = s.substring(0, s.indexOf('#'));<a name="line.138"></a>
-<span class="sourceLineNo">139</span>            return s;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>         case URI_ANCHOR:<a name="line.140"></a>
-<span class="sourceLineNo">141</span>            s = o.toString();<a name="line.141"></a>
-<span class="sourceLineNo">142</span>            if (s.indexOf('#') != -1)<a name="line.142"></a>
-<span class="sourceLineNo">143</span>               s = s.substring(s.lastIndexOf('#')+1);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>            return s;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>         case PROPERTY_NAME:<a name="line.145"></a>
-<span class="sourceLineNo">146</span>            return pMeta == null ? o.toString() : pMeta.getName();<a name="line.146"></a>
-<span class="sourceLineNo">147</span>         case URI:<a name="line.147"></a>
-<span class="sourceLineNo">148</span>            s = o.toString();<a name="line.148"></a>
-<span class="sourceLineNo">149</span>            if (s.indexOf("://") == -1) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>               if (StringUtils.startsWith(s, '/')) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>                  s = absolutePathUriBase + s;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>               } else {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>                  if (relativeUriBase != null) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>                     if (! relativeUriBase.equals("/"))<a name="line.154"></a>
-<span class="sourceLineNo">155</span>                        s = relativeUriBase + "/" + s;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>                     else<a name="line.156"></a>
-<span class="sourceLineNo">157</span>                        s = "/" + s;<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>            }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>            return s;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>         default:<a name="line.162"></a>
-<span class="sourceLineNo">163</span>            return o.toString();<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>   /**<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    * Returns the {@link HtmlSerializerContext#HTML_addKeyValueTableHeaders} setting value for this session.<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    *<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    * @return The {@link HtmlSerializerContext#HTML_addKeyValueTableHeaders} setting value for this session.<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    */<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   public final boolean isAddKeyValueTableHeaders() {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      return addKeyValueTableHeaders;<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>    * Returns the {@link HtmlSerializerContext#HTML_addBeanTypeProperties} setting value for this session.<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    *<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    * @return The {@link HtmlSerializerContext#HTML_addBeanTypeProperties} setting value for this session.<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    */<a name="line.180"></a>
-<span class="sourceLineNo">181</span>   @Override /* SerializerSession */<a name="line.181"></a>
-<span class="sourceLineNo">182</span>   public final boolean isAddBeanTypeProperties() {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      return addBeanTypeProperties;<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>   @Override /* XmlSerializer */<a name="line.186"></a>
-<span class="sourceLineNo">187</span>   public boolean isHtmlMode() {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      return true;<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">112</span>      if (detectLinksInStrings &amp;&amp; o instanceof CharSequence &amp;&amp; urlPattern.matcher(o.toString()).matches())<a name="line.112"></a>
+<span class="sourceLineNo">113</span>         return true;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      return false;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   }<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>    * Returns the anchor text to use for the specified URL object.<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    *<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    * @param pMeta The property metadata of the bean property of the object.  Can be &lt;jk&gt;null&lt;/jk&gt; if the object isn't from a bean property.<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    * @param o The URL object.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    * @return The anchor text to use for the specified URL object.<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    */<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   public String getAnchorText(BeanPropertyMeta pMeta, Object o) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      String s;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      if (lookForLabelParameters) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>         s = o.toString();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>         Matcher m = labelPattern.matcher(s);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>         if (m.find())<a name="line.129"></a>
+<span class="sourceLineNo">130</span>            return m.group(1);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      }<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      switch (anchorText) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>         case LAST_TOKEN:<a name="line.133"></a>
+<span class="sourceLineNo">134</span>            s = o.toString();<a name="line.134"></a>
+<span class="sourceLineNo">135</span>            if (s.indexOf('/') != -1)<a name="line.135"></a>
+<span class="sourceLineNo">136</span>               s = s.substring(s.lastIndexOf('/')+1);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>            if (s.indexOf('?') != -1)<a name="line.137"></a>
+<span class="sourceLineNo">138</span>               s = s.substring(0, s.indexOf('?'));<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            if (s.indexOf('#') != -1)<a name="line.139"></a>
+<span class="sourceLineNo">140</span>               s = s.substring(0, s.indexOf('#'));<a name="line.140"></a>
+<span class="sourceLineNo">141</span>            return s;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>         case URI_ANCHOR:<a name="line.142"></a>
+<span class="sourceLineNo">143</span>            s = o.toString();<a name="line.143"></a>
+<span class="sourceLineNo">144</span>            if (s.indexOf('#') != -1)<a name="line.144"></a>
+<span class="sourceLineNo">145</span>               s = s.substring(s.lastIndexOf('#')+1);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>            return s;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>         case PROPERTY_NAME:<a name="line.147"></a>
+<span class="sourceLineNo">148</span>            return pMeta == null ? o.toString() : pMeta.getName();<a name="line.148"></a>
+<span class="sourceLineNo">149</span>         case URI:<a name="line.149"></a>
+<span class="sourceLineNo">150</span>            s = o.toString();<a name="line.150"></a>
+<span class="sourceLineNo">151</span>            if (s.indexOf("://") == -1) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>               if (StringUtils.startsWith(s, '/')) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>                  s = absolutePathUriBase + s;<a name="line.153"></a>
+<span class="sourceLineNo">154</span>               } else {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>                  if (relativeUriBase != null) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>                     if (! relativeUriBase.equals("/"))<a name="line.156"></a>
+<span class="sourceLineNo">157</span>                        s = relativeUriBase + "/" + s;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>                     else<a name="line.158"></a>
+<span class="sourceLineNo">159</span>                        s = "/" + s;<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>            }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>            return s;<a name="line.163"></a>
+<span class="sourceLineNo">164</span>         default:<a name="line.164"></a>
+<span class="sourceLineNo">165</span>            return o.toString();<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 the {@link HtmlSerializerContext#HTML_addKeyValueTableHeaders} setting value for this session.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    *<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    * @return The {@link HtmlSerializerContext#HTML_addKeyValueTableHeaders} setting value for this session.<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    */<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   public final boolean isAddKeyValueTableHeaders() {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      return addKeyValueTableHeaders;<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>    * Returns the {@link HtmlSerializerContext#HTML_addBeanTypeProperties} setting value for this session.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    *<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    * @return The {@link HtmlSerializerContext#HTML_addBeanTypeProperties} setting value for this session.<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    */<a name="line.182"></a>
+<span class="sourceLineNo">183</span>   @Override /* SerializerSession */<a name="line.183"></a>
+<span class="sourceLineNo">184</span>   public final boolean isAddBeanTypeProperties() {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      return addBeanTypeProperties;<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>   @Override /* XmlSerializer */<a name="line.188"></a>
+<span class="sourceLineNo">189</span>   public boolean isHtmlMode() {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      return true;<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>
 
 
 


[18/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html
index 37b531e..fda7c03 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html
@@ -26,74 +26,118 @@
 <span class="sourceLineNo">018</span>/**<a name="line.18"></a>
 <span class="sourceLineNo">019</span> * Metadata on bean properties specific to the HTML serializers and parsers pulled from the {@link Html @Html} annotation on the bean property.<a name="line.19"></a>
 <span class="sourceLineNo">020</span> */<a name="line.20"></a>
-<span class="sourceLineNo">021</span>public class HtmlBeanPropertyMeta extends BeanPropertyMetaExtended {<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>   private boolean asXml, noTables, noTableHeaders, asPlainText;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>   /**<a name="line.25"></a>
-<span class="sourceLineNo">026</span>    * Constructor.<a name="line.26"></a>
-<span class="sourceLineNo">027</span>    *<a name="line.27"></a>
-<span class="sourceLineNo">028</span>    * @param bpm The metadata of the bean property of this additional metadata.<a name="line.28"></a>
-<span class="sourceLineNo">029</span>    */<a name="line.29"></a>
-<span class="sourceLineNo">030</span>   public HtmlBeanPropertyMeta(BeanPropertyMeta bpm) {<a name="line.30"></a>
-<span class="sourceLineNo">031</span>      super(bpm);<a name="line.31"></a>
-<span class="sourceLineNo">032</span>      if (bpm.getField() != null)<a name="line.32"></a>
-<span class="sourceLineNo">033</span>         findHtmlInfo(bpm.getField().getAnnotation(Html.class));<a name="line.33"></a>
-<span class="sourceLineNo">034</span>      if (bpm.getGetter() != null)<a name="line.34"></a>
-<span class="sourceLineNo">035</span>         findHtmlInfo(bpm.getGetter().getAnnotation(Html.class));<a name="line.35"></a>
-<span class="sourceLineNo">036</span>      if (bpm.getSetter() != null)<a name="line.36"></a>
-<span class="sourceLineNo">037</span>         findHtmlInfo(bpm.getSetter().getAnnotation(Html.class));<a name="line.37"></a>
-<span class="sourceLineNo">038</span>   }<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>   private void findHtmlInfo(Html html) {<a name="line.40"></a>
-<span class="sourceLineNo">041</span>      if (html == null)<a name="line.41"></a>
-<span class="sourceLineNo">042</span>         return;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>      if (html.asXml())<a name="line.43"></a>
-<span class="sourceLineNo">044</span>         asXml = html.asXml();<a name="line.44"></a>
-<span class="sourceLineNo">045</span>      if (html.noTables())<a name="line.45"></a>
-<span class="sourceLineNo">046</span>         noTables = html.noTables();<a name="line.46"></a>
-<span class="sourceLineNo">047</span>      if (html.noTableHeaders())<a name="line.47"></a>
-<span class="sourceLineNo">048</span>         noTableHeaders = html.noTableHeaders();<a name="line.48"></a>
-<span class="sourceLineNo">049</span>      if (html.asPlainText())<a name="line.49"></a>
-<span class="sourceLineNo">050</span>         asPlainText = html.asPlainText();<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>   /**<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    * Returns whether this bean property should be serialized as XML instead of HTML.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    *<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the the {@link Html} annotation is specified, and {@link Html#asXml()} is &lt;jk&gt;true&lt;/jk&gt;.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    */<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   protected boolean isAsXml() {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>      return asXml;<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>   /**<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * Returns whether this bean property should be serialized as plain text instead of HTML.<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    *<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the the {@link Html} annotation is specified, and {@link Html#asPlainText()} is &lt;jk&gt;true&lt;/jk&gt;.<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   protected boolean isAsPlainText() {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      return asPlainText;<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>    * Returns whether this bean property should not be serialized as an HTML table.<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    *<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the the {@link Html} annotation is specified, and {@link Html#noTables()} is &lt;jk&gt;true&lt;/jk&gt;.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    */<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   protected boolean isNoTables() {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      return noTables;<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>    * Returns whether this bean property should not include table headers when serialized as an HTML table.<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    *<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the the {@link Html} annotation is specified, and {@link Html#noTableHeaders()} is &lt;jk&gt;true&lt;/jk&gt;.<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    */<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   public boolean isNoTableHeaders() {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      return noTableHeaders;<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">021</span>@SuppressWarnings("rawtypes")<a name="line.21"></a>
+<span class="sourceLineNo">022</span>public final class HtmlBeanPropertyMeta extends BeanPropertyMetaExtended {<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>   private final boolean asXml, noTables, noTableHeaders, asPlainText;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>   private final HtmlRender render;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>   private final String link;<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>    * Constructor.<a name="line.29"></a>
+<span class="sourceLineNo">030</span>    *<a name="line.30"></a>
+<span class="sourceLineNo">031</span>    * @param bpm The metadata of the bean property of this additional metadata.<a name="line.31"></a>
+<span class="sourceLineNo">032</span>    * @throws Exception If render class could not be instantiated.<a name="line.32"></a>
+<span class="sourceLineNo">033</span>    */<a name="line.33"></a>
+<span class="sourceLineNo">034</span>   public HtmlBeanPropertyMeta(BeanPropertyMeta bpm) throws Exception {<a name="line.34"></a>
+<span class="sourceLineNo">035</span>      super(bpm);<a name="line.35"></a>
+<span class="sourceLineNo">036</span>      Builder b = new Builder();<a name="line.36"></a>
+<span class="sourceLineNo">037</span>      if (bpm.getField() != null)<a name="line.37"></a>
+<span class="sourceLineNo">038</span>         b.findHtmlInfo(bpm.getField().getAnnotation(Html.class));<a name="line.38"></a>
+<span class="sourceLineNo">039</span>      if (bpm.getGetter() != null)<a name="line.39"></a>
+<span class="sourceLineNo">040</span>         b.findHtmlInfo(bpm.getGetter().getAnnotation(Html.class));<a name="line.40"></a>
+<span class="sourceLineNo">041</span>      if (bpm.getSetter() != null)<a name="line.41"></a>
+<span class="sourceLineNo">042</span>         b.findHtmlInfo(bpm.getSetter().getAnnotation(Html.class));<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>      this.asXml = b.asXml;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>      this.noTables = b.noTables;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>      this.noTableHeaders = b.noTableHeaders;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>      this.asPlainText = b.asPlainText;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>      this.render = b.render.newInstance();<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      this.link = b.link;<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>   private static class Builder {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>      boolean asXml, noTables, noTableHeaders, asPlainText;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      Class&lt;? extends HtmlRender&gt; render = HtmlRender.class;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>      String link;<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>      void findHtmlInfo(Html html) {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>         if (html == null)<a name="line.58"></a>
+<span class="sourceLineNo">059</span>            return;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>         if (html.asXml())<a name="line.60"></a>
+<span class="sourceLineNo">061</span>            asXml = html.asXml();<a name="line.61"></a>
+<span class="sourceLineNo">062</span>         if (html.noTables())<a name="line.62"></a>
+<span class="sourceLineNo">063</span>            noTables = html.noTables();<a name="line.63"></a>
+<span class="sourceLineNo">064</span>         if (html.noTableHeaders())<a name="line.64"></a>
+<span class="sourceLineNo">065</span>            noTableHeaders = html.noTableHeaders();<a name="line.65"></a>
+<span class="sourceLineNo">066</span>         if (html.asPlainText())<a name="line.66"></a>
+<span class="sourceLineNo">067</span>            asPlainText = html.asPlainText();<a name="line.67"></a>
+<span class="sourceLineNo">068</span>         if (html.render() != HtmlRender.class)<a name="line.68"></a>
+<span class="sourceLineNo">069</span>            render = html.render();<a name="line.69"></a>
+<span class="sourceLineNo">070</span>         if (! html.link().isEmpty())<a name="line.70"></a>
+<span class="sourceLineNo">071</span>            link = html.link();<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>    * Returns whether this bean property should be serialized as XML instead of HTML.<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    *<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the the {@link Html} annotation is specified, and {@link Html#asXml()} is &lt;jk&gt;true&lt;/jk&gt;.<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    */<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   protected boolean isAsXml() {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      return asXml;<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>   /**<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    * Returns whether this bean property should be serialized as plain text instead of HTML.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    *<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the the {@link Html} annotation is specified, and {@link Html#asPlainText()} is &lt;jk&gt;true&lt;/jk&gt;.<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    */<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   protected boolean isAsPlainText() {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      return asPlainText;<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>   /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    * Returns whether this bean property should not be serialized as an HTML table.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    *<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the the {@link Html} annotation is specified, and {@link Html#noTables()} is &lt;jk&gt;true&lt;/jk&gt;.<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    */<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   protected boolean isNoTables() {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      return noTables;<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>   /**<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    * Returns whether this bean property should not include table headers when serialized as an HTML table.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    *<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the the {@link Html} annotation is specified, and {@link Html#noTableHeaders()} is &lt;jk&gt;true&lt;/jk&gt;.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    */<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   public boolean isNoTableHeaders() {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      return noTableHeaders;<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>    * Returns the render class for rendering the style and contents of this property value in HTML.<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    * &lt;p&gt;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    * This value is specified via the {@link Html#render()} annotation.<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    *<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    * @return The render class, never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    */<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   public HtmlRender getRender() {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      return render;<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>   /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    * Adds a hyperlink to this value in HTML.<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    * &lt;p&gt;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    * This value is specified via the {@link Html#link()} annotation.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    *<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    * @return The link string, or &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    */<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   public String getLink() {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      return link;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 602b2de..5700173 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
@@ -83,8 +83,8 @@
 <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>   @Override /* Serializer */<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   public HtmlDocSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      return new HtmlDocSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.79"></a>
+<span class="sourceLineNo">078</span>   public HtmlDocSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      return new HtmlDocSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* Serializer */<a name="line.82"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 e92c566..54aef5e 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
@@ -49,99 +49,101 @@
 <span class="sourceLineNo">041</span>    * Create a new session using properties specified in the context.<a name="line.41"></a>
 <span class="sourceLineNo">042</span>    *<a name="line.42"></a>
 <span class="sourceLineNo">043</span>    * @param ctx The context creating this session object.<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    * The context contains all the configuration settings for this object.<a name="line.44"></a>
+<span class="sourceLineNo">044</span>    *    The context contains all the configuration settings for this object.<a name="line.44"></a>
 <span class="sourceLineNo">045</span>    * @param output The output object.  See {@link JsonSerializerSession#getWriter()} for valid class types.<a name="line.45"></a>
 <span class="sourceLineNo">046</span>    * @param op The override properties.<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    * These override any context properties defined in the context.<a name="line.47"></a>
+<span class="sourceLineNo">047</span>    *    These override any context properties defined in the context.<a name="line.47"></a>
 <span class="sourceLineNo">048</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.48"></a>
 <span class="sourceLineNo">049</span>    * @param locale The session locale.<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.50"></a>
+<span class="sourceLineNo">050</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.50"></a>
 <span class="sourceLineNo">051</span>    * @param timeZone The session timezone.<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.52"></a>
+<span class="sourceLineNo">052</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.52"></a>
 <span class="sourceLineNo">053</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   protected HtmlDocSerializerSession(HtmlDocSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      if (op == null || op.isEmpty()) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>         title = ctx.title;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>         text = ctx.text;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>         links = ctx.links;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>         cssUrl = ctx.cssUrl;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>         cssImports = ctx.cssImports;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>         nowrap = ctx.nowrap;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>      } else {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>         title = op.getString(HTMLDOC_title, ctx.title);<a name="line.66"></a>
-<span class="sourceLineNo">067</span>         text = op.getString(HTMLDOC_text, ctx.text);<a name="line.67"></a>
-<span class="sourceLineNo">068</span>         links = new LinkedHashMap(op.getMap(HTMLDOC_links, ctx.links));<a name="line.68"></a>
-<span class="sourceLineNo">069</span>         cssUrl = op.getString(HTMLDOC_cssUrl, ctx.cssUrl);<a name="line.69"></a>
-<span class="sourceLineNo">070</span>         cssImports = StringUtils.split(op.getString(HTMLDOC_cssImports, null), ',');<a name="line.70"></a>
-<span class="sourceLineNo">071</span>         nowrap = op.getBoolean(HTMLDOC_cssUrl, ctx.nowrap);<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>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_title} setting value in this context.<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    *<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_title} setting value in this context.<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    */<a name="line.79"></a>
-<span class="sourceLineNo">080</span>   public final String getTitle() {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      return title;<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>   /**<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_text} setting value in this context.<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    *<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_text} setting value in this context.<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    */<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   public final String getText() {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      return text;<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>   /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_links} setting value in this context.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    *<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_links} setting value in this context.<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    */<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   public final Map&lt;String,String&gt; getLinks() {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      return links;<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>   /**<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_cssUrl} setting value in this context.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    *<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_cssUrl} setting value in this context.<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    */<a name="line.106"></a>
-<span class="sourceLineNo">107</span>   public final String getCssUrl() {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      return cssUrl;<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>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_cssImports} setting value in this context.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    *<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_cssImports} setting value in this context.<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    */<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   public final String[] getCssImports() {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      return cssImports;<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>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_nowrap} setting value in this context.<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    *<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_nowrap} setting value in this context.<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    */<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   public final boolean isNoWrap() {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      return nowrap;<a name="line.126"></a>
-<span class="sourceLineNo">127</span>   }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>   @Override /* XmlSerializerSession */<a name="line.129"></a>
-<span class="sourceLineNo">130</span>   public HtmlWriter getWriter() throws Exception {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      Object output = getOutput();<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      if (output instanceof HtmlWriter)<a name="line.132"></a>
-<span class="sourceLineNo">133</span>         return (HtmlWriter)output;<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      return new HtmlWriter(super.getWriter(), isUseWhitespace(), isTrimStrings(), getQuoteChar(), getRelativeUriBase(), getAbsolutePathUriBase());<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">054</span>    * @param uriContext The URI context.<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   protected HtmlDocSerializerSession(HtmlDocSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.59"></a>
+<span class="sourceLineNo">060</span>      if (op == null || op.isEmpty()) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>         title = ctx.title;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>         text = ctx.text;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>         links = ctx.links;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>         cssUrl = ctx.cssUrl;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>         cssImports = ctx.cssImports;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>         nowrap = ctx.nowrap;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>      } else {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>         title = op.getString(HTMLDOC_title, ctx.title);<a name="line.68"></a>
+<span class="sourceLineNo">069</span>         text = op.getString(HTMLDOC_text, ctx.text);<a name="line.69"></a>
+<span class="sourceLineNo">070</span>         links = new LinkedHashMap(op.getMap(HTMLDOC_links, ctx.links));<a name="line.70"></a>
+<span class="sourceLineNo">071</span>         cssUrl = op.getString(HTMLDOC_cssUrl, ctx.cssUrl);<a name="line.71"></a>
+<span class="sourceLineNo">072</span>         cssImports = StringUtils.split(op.getString(HTMLDOC_cssImports, null), ',');<a name="line.72"></a>
+<span class="sourceLineNo">073</span>         nowrap = op.getBoolean(HTMLDOC_cssUrl, ctx.nowrap);<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>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_title} setting value in this context.<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    *<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_title} setting value in this context.<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    */<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   public final String getTitle() {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      return title;<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>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_text} setting value in this context.<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    *<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_text} setting value in this context.<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    */<a name="line.90"></a>
+<span class="sourceLineNo">091</span>   public final String getText() {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      return text;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>   /**<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_links} setting value in this context.<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    *<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_links} setting value in this context.<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    */<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   public final Map&lt;String,String&gt; getLinks() {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      return links;<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>   /**<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_cssUrl} setting value in this context.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    *<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_cssUrl} setting value in this context.<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    */<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   public final String getCssUrl() {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      return cssUrl;<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>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_cssImports} setting value in this context.<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    *<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_cssImports} setting value in this context.<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    */<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   public final String[] getCssImports() {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      return cssImports;<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>   /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_nowrap} setting value in this context.<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    *<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_nowrap} setting value in this context.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    */<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   public final boolean isNoWrap() {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      return nowrap;<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>   @Override /* XmlSerializerSession */<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   public HtmlWriter getWriter() throws Exception {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      Object output = getOutput();<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      if (output instanceof HtmlWriter)<a name="line.134"></a>
+<span class="sourceLineNo">135</span>         return (HtmlWriter)output;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      return new HtmlWriter(super.getWriter(), isUseWhitespace(), isTrimStrings(), getQuoteChar(), getRelativeUriBase(), getAbsolutePathUriBase(), getUriContext());<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/html/HtmlRender.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlRender.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlRender.html
new file mode 100644
index 0000000..53ba969
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlRender.html
@@ -0,0 +1,221 @@
+<!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.html;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import org.apache.juneau.html.annotation.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import org.apache.juneau.serializer.*;<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> * Allows custom rendering of bean property values when serialized as HTML.<a name="line.19"></a>
+<span class="sourceLineNo">020</span> * &lt;p&gt;<a name="line.20"></a>
+<span class="sourceLineNo">021</span> * Associated with bean properties using the {@link Html#render() @Html.render()} annotation.<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * &lt;p&gt;<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * Using this class, you can alter the CSS style and HTML content of the bean property.<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * &lt;p&gt;<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * The following example shows two render classes that customize the appearance of the &lt;code&gt;pctFull&lt;/code&gt; and<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *    &lt;code&gt;status&lt;/code&gt; columns shown below:<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * &lt;p&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * &lt;img class='bordered' src='doc-files/HtmlRender_1.png'&gt;<a name="line.28"></a>
+<span class="sourceLineNo">029</span> *<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * &lt;p class='bcode'&gt;<a name="line.30"></a>
+<span class="sourceLineNo">031</span> *<a name="line.31"></a>
+<span class="sourceLineNo">032</span> *    &lt;jc&gt;// Our bean class&lt;/jc&gt;<a name="line.32"></a>
+<span class="sourceLineNo">033</span> *    &lt;jk&gt;public class&lt;/jk&gt; FileSpace {<a name="line.33"></a>
+<span class="sourceLineNo">034</span> *<a name="line.34"></a>
+<span class="sourceLineNo">035</span> *       &lt;jk&gt;private final&lt;/jk&gt; String &lt;jf&gt;drive&lt;/jf&gt;;<a name="line.35"></a>
+<span class="sourceLineNo">036</span> *       &lt;jk&gt;private final long&lt;/jk&gt; &lt;jf&gt;total&lt;/jf&gt;, &lt;jf&gt;available&lt;/jf&gt;;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> *<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *       &lt;jk&gt;public&lt;/jk&gt; FileSpace(String drive, &lt;jk&gt;long&lt;/jk&gt; total, &lt;jk&gt;long&lt;/jk&gt; available) {<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *          &lt;jk&gt;this&lt;/jk&gt;.&lt;jf&gt;drive&lt;/jf&gt; = drive;<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *          &lt;jk&gt;this&lt;/jk&gt;.&lt;jf&gt;total&lt;/jf&gt; = total;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *          &lt;jk&gt;this&lt;/jk&gt;.&lt;jf&gt;available&lt;/jf&gt; = available;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> *       }<a name="line.42"></a>
+<span class="sourceLineNo">043</span> *<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *       &lt;ja&gt;@Html&lt;/ja&gt;(link=&lt;js&gt;"drive/{drive}"&lt;/js&gt;)<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *       &lt;jk&gt;public&lt;/jk&gt; String getDrive() {<a name="line.45"></a>
+<span class="sourceLineNo">046</span> *          &lt;jk&gt;return&lt;/jk&gt; &lt;jf&gt;drive&lt;/jf&gt;;<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> *       &lt;jk&gt;public long&lt;/jk&gt; getTotal() {<a name="line.49"></a>
+<span class="sourceLineNo">050</span> *          &lt;jk&gt;return&lt;/jk&gt; &lt;jf&gt;total&lt;/jf&gt;;<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> *       &lt;jk&gt;public long&lt;/jk&gt; getAvailable() {<a name="line.53"></a>
+<span class="sourceLineNo">054</span> *          &lt;jk&gt;return&lt;/jk&gt; &lt;jf&gt;available&lt;/jf&gt;;<a name="line.54"></a>
+<span class="sourceLineNo">055</span> *       }<a name="line.55"></a>
+<span class="sourceLineNo">056</span> *<a name="line.56"></a>
+<span class="sourceLineNo">057</span> *       &lt;ja&gt;@Html&lt;/ja&gt;(render=FileSpacePctRender.&lt;jk&gt;class&lt;/jk&gt;)<a name="line.57"></a>
+<span class="sourceLineNo">058</span> *       &lt;jk&gt;public float&lt;/jk&gt; getPctFull() {<a name="line.58"></a>
+<span class="sourceLineNo">059</span> *          &lt;jk&gt;return&lt;/jk&gt; ((100 * &lt;jf&gt;available&lt;/jf&gt;) / &lt;jf&gt;total&lt;/jf&gt;);<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> *       &lt;ja&gt;@Html&lt;/ja&gt;(render=FileSpaceStatusRender.&lt;jk&gt;class&lt;/jk&gt;)<a name="line.62"></a>
+<span class="sourceLineNo">063</span> *       &lt;jk&gt;public&lt;/jk&gt; FileSpaceStatus getStatus() {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> *          &lt;jk&gt;float&lt;/jk&gt; pf = getPctFull();<a name="line.64"></a>
+<span class="sourceLineNo">065</span> *          &lt;jk&gt;if&lt;/jk&gt; (pf &lt; 80)<a name="line.65"></a>
+<span class="sourceLineNo">066</span> *             &lt;jk&gt;return&lt;/jk&gt; FileSpaceStatus.&lt;jsf&gt;OK&lt;/jsf&gt;;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> *          &lt;jk&gt;if&lt;/jk&gt; (pf &lt; 90)<a name="line.67"></a>
+<span class="sourceLineNo">068</span> *             &lt;jk&gt;return&lt;/jk&gt; FileSpaceStatus.&lt;jsf&gt;WARNING&lt;/jsf&gt;;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> *          &lt;jk&gt;return&lt;/jk&gt; FileSpaceStatus.&lt;jsf&gt;SEVERE&lt;/jsf&gt;;<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> *    &lt;jc&gt;// Possible values for the getStatus() method&lt;/jc&gt;<a name="line.73"></a>
+<span class="sourceLineNo">074</span> *    &lt;jk&gt;public static enum&lt;/jk&gt; FileSpaceStatus {<a name="line.74"></a>
+<span class="sourceLineNo">075</span> *       &lt;jsf&gt;OK&lt;/jsf&gt;, &lt;jsf&gt;WARNING&lt;/jsf&gt;, &lt;jsf&gt;SEVERE&lt;/jsf&gt;;<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> *    &lt;jc&gt;// Custom render for getPctFull() method&lt;/jc&gt;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> *    &lt;jk&gt;public static class&lt;/jk&gt; FileSpacePctRender &lt;jk&gt;extends&lt;/jk&gt; HtmlRender&amp;lt;Float&amp;gt; {<a name="line.79"></a>
+<span class="sourceLineNo">080</span> *<a name="line.80"></a>
+<span class="sourceLineNo">081</span> *       &lt;ja&gt;@Override&lt;/ja&gt;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> *       &lt;jk&gt;public&lt;/jk&gt; String getStyle(SerializerSession session, Float value) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> *          &lt;jk&gt;if&lt;/jk&gt; (value &lt; 80)<a name="line.83"></a>
+<span class="sourceLineNo">084</span> *             &lt;jk&gt;return&lt;/jk&gt; &lt;js&gt;"background-color:lightgreen;text-align:center"&lt;/js&gt;;<a name="line.84"></a>
+<span class="sourceLineNo">085</span> *          &lt;jk&gt;if&lt;/jk&gt; (value &lt; 90)<a name="line.85"></a>
+<span class="sourceLineNo">086</span> *             &lt;jk&gt;return&lt;/jk&gt; &lt;js&gt;"background-color:yellow;text-align:center"&lt;/js&gt;;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> *          &lt;jk&gt;return&lt;/jk&gt; &lt;js&gt;"background-color:red;text-align:center;border:;animation:color_change 0.5s infinite alternate"&lt;/js&gt;;<a name="line.87"></a>
+<span class="sourceLineNo">088</span> *       }<a name="line.88"></a>
+<span class="sourceLineNo">089</span> *<a name="line.89"></a>
+<span class="sourceLineNo">090</span> *       &lt;ja&gt;@Override&lt;/ja&gt;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> *       &lt;jk&gt;public&lt;/jk&gt; Object getContent(SerializerSession session, Float value) {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> *          &lt;jk&gt;if&lt;/jk&gt; (value &gt;= 90)<a name="line.92"></a>
+<span class="sourceLineNo">093</span> *             &lt;jk&gt;return&lt;/jk&gt; &lt;jsm&gt;div&lt;/jsm&gt;(<a name="line.93"></a>
+<span class="sourceLineNo">094</span> *                String.&lt;jsm&gt;format&lt;/jsm&gt;(&lt;js&gt;"%.0f%%"&lt;/js&gt;, value),<a name="line.94"></a>
+<span class="sourceLineNo">095</span> *                &lt;jsm&gt;style&lt;/jsm&gt;(&lt;js&gt;"@keyframes color_change { from { background-color: red; } to { background-color: yellow; }"&lt;/js&gt;)<a name="line.95"></a>
+<span class="sourceLineNo">096</span> *             );<a name="line.96"></a>
+<span class="sourceLineNo">097</span> *          &lt;jk&gt;return&lt;/jk&gt; String.&lt;jsm&gt;format&lt;/jsm&gt;(&lt;js&gt;"%.0f%%"&lt;/js&gt;, value);<a name="line.97"></a>
+<span class="sourceLineNo">098</span> *       }<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> *    &lt;jc&gt;// Custom render for getStatus() method&lt;/jc&gt;<a name="line.101"></a>
+<span class="sourceLineNo">102</span> *    &lt;jk&gt;public static class&lt;/jk&gt; FileSpaceStatusRender &lt;jk&gt;extends&lt;/jk&gt; HtmlRender&amp;lt;FileSpaceStatus&amp;gt; {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> *<a name="line.103"></a>
+<span class="sourceLineNo">104</span> *       &lt;ja&gt;@Override&lt;/ja&gt;<a name="line.104"></a>
+<span class="sourceLineNo">105</span> *       &lt;jk&gt;public&lt;/jk&gt; String getStyle(SerializerSession session, FileSpaceStatus value) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> *          &lt;jk&gt;return&lt;/jk&gt; &lt;js&gt;"text-align:center"&lt;/js&gt;;<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> *       &lt;ja&gt;@Override&lt;/ja&gt;<a name="line.109"></a>
+<span class="sourceLineNo">110</span> *       &lt;jk&gt;public&lt;/jk&gt; Object getContent(SerializerSession session, FileSpaceStatus value) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span> *          &lt;jk&gt;switch&lt;/jk&gt; (value) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> *             &lt;jk&gt;case&lt;/jk&gt; &lt;jsf&gt;OK&lt;/jsf&gt;:  &lt;jk&gt;return&lt;/jk&gt; &lt;jsm&gt;img&lt;/jsm&gt;().src(URI.&lt;jsm&gt;create&lt;/jsm&gt;(&lt;js&gt;"servlet:/htdocs/ok.png"&lt;/js&gt;));<a name="line.112"></a>
+<span class="sourceLineNo">113</span> *             &lt;jk&gt;case&lt;/jk&gt; &lt;jsf&gt;WARNING&lt;/jsf&gt;:  &lt;jk&gt;return&lt;/jk&gt; &lt;jsm&gt;img&lt;/jsm&gt;().src(URI.&lt;jsm&gt;create&lt;/jsm&gt;(&lt;js&gt;"servlet:/htdocs/warning.png"&lt;/js&gt;));<a name="line.113"></a>
+<span class="sourceLineNo">114</span> *             &lt;jk&gt;default&lt;/jk&gt;: &lt;jk&gt;return&lt;/jk&gt; &lt;jsm&gt;img&lt;/jsm&gt;().src(URI.&lt;jsm&gt;create&lt;/jsm&gt;(&lt;js&gt;"servlet:/htdocs/severe.png"&lt;/js&gt;));<a name="line.114"></a>
+<span class="sourceLineNo">115</span> *          }<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> * &lt;/p&gt;<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * @param &lt;T&gt; The bean property type.<a name="line.119"></a>
+<span class="sourceLineNo">120</span> */<a name="line.120"></a>
+<span class="sourceLineNo">121</span>public class HtmlRender&lt;T&gt; {<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>    * Returns the CSS style of the element containing the bean property value.<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    *<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    * @param session The current serializer session.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    *    Can be used to retrieve properties and session-level information.<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    * @param value The bean property value.<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    * @return The CSS style string, or &lt;jk&gt;null&lt;/jk&gt; if no style should be added.<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    */<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   public String getStyle(SerializerSession session, T value) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      return null;<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>   /**<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    * Returns the delegate value for the specified bean property value.<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    * &lt;p&gt;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    * The default implementation simply returns the same value.<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    * A typical use is to return an HTML element using one of the HTML5 DOM beans.<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    *<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    * @param session The current serializer session.<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    *    Can be used to retrieve properties and session-level information.<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    * @param value The bean property value.<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    * @return The new bean property value.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    */<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   public Object getContent(SerializerSession session, T value) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      return value;<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>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSchemaDocSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSchemaDocSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSchemaDocSerializer.html
index 59b1684..c9d5710 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSchemaDocSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSchemaDocSerializer.html
@@ -82,8 +82,8 @@
 <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>   @Override /* Serializer */<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   public HtmlDocSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      return new HtmlDocSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.78"></a>
+<span class="sourceLineNo">077</span>   public HtmlDocSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      return new HtmlDocSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* ISchemaSerializer */<a name="line.81"></a>


[34/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 cb0a62a..d21a920 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html
@@ -172,13 +172,14 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" ti
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html#HtmlSerializerSession-org.apache.juneau.html.HtmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">HtmlSerializerSession</a></span>(<a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html" title="class in org.apache.juneau.html">HtmlSerializerContext</a>&nbsp;ctx,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html#HtmlSerializerSession-org.apache.juneau.html.HtmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">HtmlSerializerSession</a></span>(<a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html" title="class in org.apache.juneau.html">HtmlSerializerContext</a>&nbsp;ctx,
                      <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                      <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>&nbsp;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>&nbsp;locale,
                      <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>&nbsp;timeZone,
-                     <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+                     <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                     <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create a new session using properties specified in the context.</div>
 </td>
 </tr>
@@ -249,7 +250,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" ti
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#
 isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Co
 llection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getUriContext--">getUriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTr
 imEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCu
 rrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.BeanSession">
@@ -286,33 +287,36 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" ti
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="HtmlSerializerSession-org.apache.juneau.html.HtmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="HtmlSerializerSession-org.apache.juneau.html.HtmlSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HtmlSerializerSession</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.66">HtmlSerializerSession</a>(<a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html" title="class in org.apache.juneau.html">HtmlSerializerContext</a>&nbsp;ctx,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.68">HtmlSerializerSession</a>(<a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html" title="class in org.apache.juneau.html">HtmlSerializerContext</a>&nbsp;ctx,
                                 <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                                 <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>&nbsp;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>&nbsp;locale,
                                 <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>&nbsp;timeZone,
-                                <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
+                                <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>ctx</code> - The context creating this session object.
- The context contains all the configuration settings for this object.</dd>
+   The context contains all the configuration settings for this object.</dd>
 <dd><code>output</code> - The output object.  See <a href="../../../../org/apache/juneau/json/JsonSerializerSession.html#getWriter--"><code>JsonSerializerSession.getWriter()</code></a> for valid class types.</dd>
 <dd><code>op</code> - The override properties.
- These override any context properties defined in the context.</dd>
+   These override any context properties defined in the context.</dd>
 <dd><code>javaMethod</code> - The java method that called this serializer, usually the method in a REST servlet.</dd>
 <dd><code>locale</code> - The session locale.
- If <jk>null</jk>, then the locale defined on the context is used.</dd>
+   If <jk>null</jk>, then the locale defined on the context is used.</dd>
 <dd><code>timeZone</code> - The session timezone.
- If <jk>null</jk>, then the timezone defined on the context is used.</dd>
+   If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -330,7 +334,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>getWriter</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.90">getWriter</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.92">getWriter</a>()
                      throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">SerializerSession</a></code></span></div>
 <div class="block">Wraps the specified output object inside a writer.
@@ -358,7 +362,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>isUri</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.105">isUri</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;cm,
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.107">isUri</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;cm,
                      <a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;pMeta,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
 <div class="block">Returns <jk>true</jk> if the specified object is a URL.</div>
@@ -378,7 +382,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>getAnchorText</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.122">getAnchorText</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;pMeta,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.124">getAnchorText</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&nbsp;pMeta,
                             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
 <div class="block">Returns the anchor text to use for the specified URL object.</div>
 <dl>
@@ -396,7 +400,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddKeyValueTableHeaders</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.172">isAddKeyValueTableHeaders</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.174">isAddKeyValueTableHeaders</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html#HTML_addKeyValueTableHeaders"><code>HtmlSerializerContext.HTML_addKeyValueTableHeaders</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -410,7 +414,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddBeanTypeProperties</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.182">isAddBeanTypeProperties</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.184">isAddBeanTypeProperties</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html#HTML_addBeanTypeProperties"><code>HtmlSerializerContext.HTML_addBeanTypeProperties</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -426,7 +430,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" ti
 <ul class="blockListLast">
 <li class="blockList">
 <h4>isHtmlMode</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.187">isHtmlMode</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializerSession.html#line.189">isHtmlMode</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlSerializerSession.html#isHtmlMode--">XmlSerializerSession</a></code></span></div>
 <div class="block">Returns <jk>true</jk> if we're serializing HTML.
  <p>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/HtmlStrippedDocSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlStrippedDocSerializer.html b/content/site/apidocs/org/apache/juneau/html/HtmlStrippedDocSerializer.html
index 522cab6..d9c6493 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlStrippedDocSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlStrippedDocSerializer.html
@@ -254,7 +254,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.html.<a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#serializeAnything-org.apache.juneau.html.HtmlSerializerSession-org.apache.juneau.html.HtmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-int-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#serializeAnything-org.apache.juneau.html.HtmlSerializerSession-org.apache.juneau.html.HtmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-int-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.xml.XmlSerializer">
@@ -344,7 +344,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/HtmlWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlWriter.html b/content/site/apidocs/org/apache/juneau/html/HtmlWriter.html
index 0663351..e03ec9c 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlWriter.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlWriter.html
@@ -131,7 +131,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.23">HtmlWriter</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.24">HtmlWriter</a>
 extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class in org.apache.juneau.xml">XmlWriter</a></pre>
 <div class="block">Specialized writer for serializing HTML.</div>
 </li>
@@ -151,7 +151,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#absolutePathUriBase">absolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#out">out</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#quoteChar">quoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#relativeUriBase">relativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#trimStrings">trimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#useWhitespace">useWhitespace</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#absolutePathUriBase">absolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#out">out</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#quoteChar">quoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#relativeUriBase">relativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#trimStrings">trimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#uriContext">uriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#useWhitespace">useWhitespace</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="fields.inherited.from.class.java.io.Writer">
@@ -174,12 +174,13 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <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/html/HtmlWriter.html#HtmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-">HtmlWriter</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>&nbsp;out,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlWriter.html#HtmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">HtmlWriter</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>&nbsp;out,
           boolean&nbsp;useWhitespace,
           boolean&nbsp;trimStrings,
           char&nbsp;quoteChar,
           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uriContext,
-          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uriAuthority)</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>&nbsp;uriAuthority,
+          <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext2)</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -548,18 +549,19 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="HtmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-">
+<a name="HtmlWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HtmlWriter</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.35">HtmlWriter</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>&nbsp;out,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.38">HtmlWriter</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>&nbsp;out,
                   boolean&nbsp;useWhitespace,
                   boolean&nbsp;trimStrings,
                   char&nbsp;quoteChar,
                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uriContext,
-                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uriAuthority)</pre>
+                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;uriAuthority,
+                  <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext2)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -569,6 +571,8 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <dd><code>quoteChar</code> - The quote character to use (i.e. <js>'\''</js> or <js>'"'</js>)</dd>
 <dd><code>uriContext</code> - The web application context path (e.g. "/contextRoot").</dd>
 <dd><code>uriAuthority</code> - The web application URI authority (e.g. "http://hostname:9080")</dd>
+<dd><code>uriContext2</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -586,7 +590,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>attrUri</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.47">attrUri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.50">attrUri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value)
                    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">Append an attribute with a URI value.</div>
@@ -607,7 +611,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>text</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.58">text</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>&nbsp;o,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.61">text</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>&nbsp;o,
                        boolean&nbsp;preserveWhitespace)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#text-java.lang.Object-boolean-">XmlWriter</a></code></span></div>
@@ -631,7 +635,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.104">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.107">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                        boolean&nbsp;needsEncoding)
                 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>
@@ -657,7 +661,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.110">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.113">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#oTag-java.lang.String-java.lang.String-">XmlWriter</a></code></span></div>
@@ -681,7 +685,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.116">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.119">oTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#oTag-java.lang.String-">XmlWriter</a></code></span></div>
 <div class="block">Shortcut for <code>oTag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
@@ -703,7 +707,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.122">oTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.125">oTag</a>(int&nbsp;indent,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                        boolean&nbsp;needsEncoding)
@@ -731,7 +735,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.128">oTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.131">oTag</a>(int&nbsp;indent,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 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>
@@ -757,7 +761,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>oTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.134">oTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.137">oTag</a>(int&nbsp;indent,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#oTag-int-java.lang.String-">XmlWriter</a></code></span></div>
@@ -781,7 +785,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.140">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.143">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                       boolean&nbsp;needsEncoding)
                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>
@@ -807,7 +811,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.146">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.149">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#tag-java.lang.String-java.lang.String-">XmlWriter</a></code></span></div>
@@ -831,7 +835,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.152">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.155">tag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#tag-java.lang.String-">XmlWriter</a></code></span></div>
 <div class="block">Shortcut for <code>tag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
@@ -853,7 +857,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.158">tag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.161">tag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#tag-int-java.lang.String-">XmlWriter</a></code></span></div>
@@ -877,7 +881,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.164">tag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.167">tag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                       boolean&nbsp;needsEncoding)
@@ -905,7 +909,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>tag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.170">tag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.173">tag</a>(int&nbsp;indent,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                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>
@@ -931,7 +935,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.176">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.179">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#sTag-java.lang.String-java.lang.String-">XmlWriter</a></code></span></div>
@@ -955,7 +959,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.182">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.185">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                        boolean&nbsp;needsEncoding)
                 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>
@@ -981,7 +985,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.188">sTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.191">sTag</a>(int&nbsp;indent,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 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>
@@ -1007,7 +1011,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.194">sTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.197">sTag</a>(int&nbsp;indent,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#sTag-int-java.lang.String-">XmlWriter</a></code></span></div>
@@ -1031,7 +1035,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.200">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.203">sTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#sTag-java.lang.String-">XmlWriter</a></code></span></div>
 <div class="block">Shortcut for <code>sTag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
@@ -1053,7 +1057,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>sTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.206">sTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.209">sTag</a>(int&nbsp;indent,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                        boolean&nbsp;needsEncoding)
@@ -1081,7 +1085,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.212">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.215">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#eTag-java.lang.String-java.lang.String-">XmlWriter</a></code></span></div>
@@ -1105,7 +1109,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.218">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.221">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                        boolean&nbsp;needsEncoding)
                 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>
@@ -1131,7 +1135,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.224">eTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.227">eTag</a>(int&nbsp;indent,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 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>
@@ -1157,7 +1161,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.230">eTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.233">eTag</a>(int&nbsp;indent,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#eTag-int-java.lang.String-">XmlWriter</a></code></span></div>
@@ -1181,7 +1185,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.236">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.239">eTag</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#eTag-java.lang.String-">XmlWriter</a></code></span></div>
 <div class="block">Shortcut for <code>eTag(<jk>null</jk>, name, <jk>false</jk>);</code></div>
@@ -1203,7 +1207,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>eTag</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.242">eTag</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.245">eTag</a>(int&nbsp;indent,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                        boolean&nbsp;needsEncoding)
@@ -1231,7 +1235,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>attr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.248">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.251">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#attr-java.lang.String-java.lang.Object-">XmlWriter</a></code></span></div>
@@ -1255,7 +1259,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>attr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.254">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.257">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value)
                 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>
@@ -1281,7 +1285,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>attr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.260">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.263">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value,
                        boolean&nbsp;needsEncoding)
@@ -1309,7 +1313,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>attr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.266">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.269">attr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value,
                        boolean&nbsp;needsEncoding)
                 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>
@@ -1335,7 +1339,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>oAttr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.272">oAttr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.275">oAttr</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;ns,
                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlWriter.html#oAttr-java.lang.String-java.lang.String-">XmlWriter</a></code></span></div>
@@ -1359,7 +1363,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>cr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.278">cr</a>(int&nbsp;depth)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.281">cr</a>(int&nbsp;depth)
               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#cr-int-">SerializerWriter</a></code></span></div>
 <div class="block">Performs a carriage return.
@@ -1383,7 +1387,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.285">appendln</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.288">appendln</a>(int&nbsp;indent,
                            <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendln-int-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -1408,7 +1412,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.291">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.294">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendln-java.lang.String-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text followed by a newline (if the <code>useWhitespace</code> setting is enabled).</div>
@@ -1430,7 +1434,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.297">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.300">append</a>(int&nbsp;indent,
                          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-int-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -1454,7 +1458,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.303">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.306">append</a>(int&nbsp;indent,
                          char&nbsp;c)
                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-int-char-">SerializerWriter</a></code></span></div>
@@ -1478,7 +1482,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>s</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.309">s</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.312">s</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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#s--">SerializerWriter</a></code></span></div>
 <div class="block">Adds a whitespace character to the output if the <code>useWhitespace</code> setting is enabled.</div>
@@ -1498,7 +1502,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>q</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.315">q</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.318">q</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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#q--">SerializerWriter</a></code></span></div>
 <div class="block">Adds the quote character specified by the <code>quoteChar</code> setting to the output.</div>
@@ -1518,7 +1522,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>i</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.321">i</a>(int&nbsp;indent)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.324">i</a>(int&nbsp;indent)
              throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#i-int-">SerializerWriter</a></code></span></div>
 <div class="block">Writes an indent to the writer if the <code>useWhitespace</code> setting is enabled.</div>
@@ -1540,7 +1544,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>nl</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.327">nl</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.330">nl</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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#nl--">SerializerWriter</a></code></span></div>
 <div class="block">Writes a newline to the writer if the <code>useWhitespace</code> setting is enabled.</div>
@@ -1560,7 +1564,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.333">append</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>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.336">append</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>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-java.lang.Object-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text to the writer.</div>
@@ -1582,7 +1586,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.339">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.342">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-java.lang.String-">SerializerWriter</a></code></span></div>
 <div class="block">Writes the specified text to the writer.</div>
@@ -1604,7 +1608,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlWriter.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.345">append</a>(char&nbsp;c)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlWriter.html#line.348">append</a>(char&nbsp;c)
                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>



[28/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 33634fe..7342421 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":10,"i18":42,"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,"i91":10,"i92":10,"i93":10,"i94":10,"i95":10,"i96":10,"i97":10,"i98":10,"i99":10,"i100":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":10,"i18":42,"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,"i91":10,"i92":10,"i93":10,"i94":10,"i95":10,"i96":10,"i97":10,"i98":10,"i99":10,"i100":10,"i101":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";
@@ -587,18 +587,25 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </tr>
 <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#path-java.lang.String-java.lang.Object-">path</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>&nbsp;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>&nbsp;value)</code>
+<div class="block">Replaces a variable of the form <js>"{name}"</js> in the URL path with the specified value.</div>
+</td>
+</tr>
+<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#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>&nbsp;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="i68" class="altColor">
+<tr id="i69" 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>&nbsp;os,
       boolean&nbsp;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="i69" class="rowColor">
+<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#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>&nbsp;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>&nbsp;os,
@@ -607,7 +614,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="i70" class="altColor">
+<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#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>&nbsp;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>&nbsp;w,
@@ -616,57 +623,57 @@ 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="i71" 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#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>&nbsp;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="i72" 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#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>&nbsp;w,
       boolean&nbsp;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="i73" 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#port-int-">port</a></span>(int&nbsp;port)</code>
 <div class="block">Sets the URI port.</div>
 </td>
 </tr>
-<tr id="i74" 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#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>&nbsp;value)</code>
 <div class="block">Sets the value for the <code>Pragma</code> request header.</div>
 </td>
 </tr>
-<tr id="i75" 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#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>&nbsp;value)</code>
 <div class="block">Sets the value for the <code>Proxy-Authorization</code> request header.</div>
 </td>
 </tr>
-<tr id="i76" class="altColor">
+<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#query-java.util.Map-">query</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>&lt;<a href="http://docs.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>&gt;&nbsp;params)</code>
 <div class="block">Adds query parameters to the URI query.</div>
 </td>
 </tr>
-<tr id="i77" class="rowColor">
+<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#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>&nbsp;query)</code>
 <div class="block">Sets a custom URI query.</div>
 </td>
 </tr>
-<tr id="i78" class="altColor">
+<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#query-java.lang.String-java.lang.Object-">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>&nbsp;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>&nbsp;value)</code>
 <div class="block">Adds a query parameter to the URI query.</div>
 </td>
 </tr>
-<tr id="i79" class="rowColor">
+<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#query-java.lang.String-java.lang.Object-boolean-">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>&nbsp;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>&nbsp;value,
@@ -674,44 +681,44 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="block">Adds a query parameter to the URI query.</div>
 </td>
 </tr>
-<tr id="i80" class="altColor">
+<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#queryIfNE-java.util.Map-">queryIfNE</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>&lt;<a href="http://docs.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>&gt;&nbsp;params)</code>
 <div class="block">Adds query parameters to the URI for any parameters that aren't null/empty.</div>
 </td>
 </tr>
-<tr id="i81" class="rowColor">
+<tr id="i82" 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#queryIfNE-java.lang.String-java.lang.Object-">queryIfNE</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>&nbsp;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>&nbsp;value)</code>
 <div class="block">Adds a query parameter to the URI query if the parameter value is not <jk>null</jk> or an empty string.</div>
 </td>
 </tr>
-<tr id="i82" class="altColor">
+<tr id="i83" 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#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>&nbsp;value)</code>
 <div class="block">Sets the value for the <code>Range</code> request header.</div>
 </td>
 </tr>
-<tr id="i83" class="rowColor">
+<tr id="i84" 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#redirectMaxAttempts-int-">redirectMaxAttempts</a></span>(int&nbsp;maxAttempts)</code>
 <div class="block">Specify the number of redirects to follow before throwing an exception.</div>
 </td>
 </tr>
-<tr id="i84" class="altColor">
+<tr id="i85" 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#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>&nbsp;value)</code>
 <div class="block">Sets the value for the <code>Referer</code> request header.</div>
 </td>
 </tr>
-<tr id="i85" class="rowColor">
+<tr id="i86" 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#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>&nbsp;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="i86" class="altColor">
+<tr id="i87" 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#retryable-int-long-org.apache.juneau.rest.client.RetryOn-">retryable</a></span>(int&nbsp;retries,
          long&nbsp;interval,
@@ -719,86 +726,86 @@ 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="i87" class="rowColor">
+<tr id="i88" class="altColor">
 <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="i88" class="altColor">
+<tr id="i89" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Future.html?is-external=true" title="class or interface in java.util.concurrent">Future</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestCall.html#runFuture--">runFuture</a></span>()</code>
 <div class="block">Same as <a href="../../../../../org/apache/juneau/rest/client/RestCall.html#run--"><code>run()</code></a> but allows you to run the call asynchronously.</div>
 </td>
 </tr>
-<tr id="i89" class="rowColor">
+<tr id="i90" 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>&nbsp;scheme)</code>
 <div class="block">Sets the URI scheme.</div>
 </td>
 </tr>
-<tr id="i90" class="altColor">
+<tr id="i91" 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>&nbsp;serializer)</code>
 <div class="block">Specifies the serializer to use on this call.</div>
 </td>
 </tr>
-<tr id="i91" class="rowColor">
+<tr id="i92" 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&nbsp;config)</code>
 <div class="block">Set configuration settings on this request.</div>
 </td>
 </tr>
-<tr id="i92" class="altColor">
+<tr id="i93" 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>&nbsp;successPattern)</code>
 <div class="block">Look for the specified regular expression pattern in the response output.</div>
 </td>
 </tr>
-<tr id="i93" class="rowColor">
+<tr id="i94" 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>&nbsp;value)</code>
 <div class="block">Sets the value for the <code>TE</code> request header.</div>
 </td>
 </tr>
-<tr id="i94" class="altColor">
+<tr id="i95" 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>&nbsp;value)</code>
 <div class="block">Sets the value for the <code>Upgrade</code> request header.</div>
 </td>
 </tr>
-<tr id="i95" class="rowColor">
+<tr id="i96" 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>&nbsp;uri)</code>
 <div class="block">Sets the URI for this call.</div>
 </td>
 </tr>
-<tr id="i96" class="altColor">
+<tr id="i97" 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>&nbsp;value)</code>
 <div class="block">Sets the value for the <code>User-Agent</code> request header.</div>
 </td>
 </tr>
-<tr id="i97" class="rowColor">
+<tr id="i98" 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>&nbsp;userInfo)</code>
 <div class="block">Sets the URI user info.</div>
 </td>
 </tr>
-<tr id="i98" class="altColor">
+<tr id="i99" 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>&nbsp;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>&nbsp;password)</code>
 <div class="block">Sets the URI user info.</div>
 </td>
 </tr>
-<tr id="i99" class="rowColor">
+<tr id="i100" 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>&nbsp;value)</code>
 <div class="block">Sets the value for the <code>Via</code> request header.</div>
 </td>
 </tr>
-<tr id="i100" class="altColor">
+<tr id="i101" 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>&nbsp;value)</code>
 <div class="block">Sets the value for the <code>Warning</code> request header.</div>
@@ -938,20 +945,23 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>query</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.183">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>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<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>&nbsp;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>&nbsp;value,
-                      boolean&nbsp;skipIfEmpty)</pre>
+                      boolean&nbsp;skipIfEmpty)
+               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 query parameter to the URI query.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>name</code> - The parameter name.
- Can be null/blank if the value is 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"><code>Map</code></a> or <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>.</dd>
+   Can be null/blank/* if the value is 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"><code>Map</code></a>, <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>, <a href="../../../../../org/apache/juneau/rest/client/NameValuePairs.html" title="class in org.apache.juneau.rest.client"><code>NameValuePairs</code></a>, or bean.</dd>
 <dd><code>value</code> - The parameter value converted to a string using UON notation.
- Can also be 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"><code>Map</code></a> or <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> if the name is null/blank.
- If a <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> and the name is null/blank, then calls <code>URIBuilder.setCustomQuery(String)</code>.</dd>
+   Can also be <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>, <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>, <a href="../../../../../org/apache/juneau/rest/client/NameValuePairs.html" title="class in org.apache.juneau.rest.client"><code>NameValuePairs</code></a>, or bean if the name is null/blank/*.
+   If a <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> and the name is null/blank/*, then calls <code>URIBuilder.setCustomQuery(String)</code>.</dd>
 <dd><code>skipIfEmpty</code> - Don't add the pair if the value is empty.</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>
@@ -961,7 +971,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>query</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.210">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>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.214">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>&nbsp;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>&nbsp;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 query parameter to the URI query.</div>
@@ -982,7 +992,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>query</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.221">query</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>&lt;<a href="http://docs.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>&gt;&nbsp;params)
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.225">query</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>&lt;<a href="http://docs.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>&gt;&nbsp;params)
                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 query parameters to the URI query.</div>
 <dl>
@@ -1001,7 +1011,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>queryIfNE</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.235">queryIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.239">queryIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;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 query parameter to the URI query if the parameter value is not <jk>null</jk> or an empty string.
@@ -1024,7 +1034,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>queryIfNE</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.248">queryIfNE</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>&lt;<a href="http://docs.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>&gt;&nbsp;params)
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.252">queryIfNE</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>&lt;<a href="http://docs.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>&gt;&nbsp;params)
                    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 query parameters to the URI for any parameters that aren't null/empty.
  <p>
@@ -1045,7 +1055,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>query</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.258">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>&nbsp;query)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.262">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>&nbsp;query)</pre>
 <div class="block">Sets a custom URI query.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1061,19 +1071,22 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>formData</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.274">formData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.279">formData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value,
-                         boolean&nbsp;skipIfEmpty)</pre>
+                         boolean&nbsp;skipIfEmpty)
+                  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 form data pair to this request to perform a URL-encoded form post.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>name</code> - The parameter name.
- Can be null/blank if the value is 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"><code>Map</code></a> or <a href="../../../../../org/apache/juneau/rest/client/NameValuePairs.html" title="class in org.apache.juneau.rest.client"><code>NameValuePairs</code></a>.</dd>
+   Can be null/blank/* if the value is 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"><code>Map</code></a>, <a href="../../../../../org/apache/juneau/rest/client/NameValuePairs.html" title="class in org.apache.juneau.rest.client"><code>NameValuePairs</code></a>, or bean.</dd>
 <dd><code>value</code> - The parameter value converted to a string using UON notation.
- Can also be 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"><code>Map</code></a> or <a href="../../../../../org/apache/juneau/rest/client/NameValuePairs.html" title="class in org.apache.juneau.rest.client"><code>NameValuePairs</code></a>.</dd>
+   Can also be <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>, <a href="../../../../../org/apache/juneau/rest/client/NameValuePairs.html" title="class in org.apache.juneau.rest.client"><code>NameValuePairs</code></a>, or bean if the name is null/blank/*.</dd>
 <dd><code>skipIfEmpty</code> - Don't add the pair if the value is empty.</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>
@@ -1083,7 +1096,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>formData</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.303">formData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.308">formData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;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 form data pair to this request to perform a URL-encoded form post.</div>
@@ -1106,7 +1119,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>formData</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.314">formData</a>(<a href="../../../../../org/apache/juneau/rest/client/NameValuePairs.html" title="class in org.apache.juneau.rest.client">NameValuePairs</a>&nbsp;nameValuePairs)
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.319">formData</a>(<a href="../../../../../org/apache/juneau/rest/client/NameValuePairs.html" title="class in org.apache.juneau.rest.client">NameValuePairs</a>&nbsp;nameValuePairs)
                   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 form data pairs to this request to perform a URL-encoded form post.</div>
 <dl>
@@ -1125,7 +1138,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>formData</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.325">formData</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>&lt;<a href="http://docs.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>&gt;&nbsp;params)
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.330">formData</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>&lt;<a href="http://docs.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>&gt;&nbsp;params)
                   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 form data pairs to this request to perform a URL-encoded form post.</div>
 <dl>
@@ -1144,7 +1157,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>formDataIfNE</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.339">formDataIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.344">formDataIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;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 form data pair to the request if the parameter value is not <jk>null</jk> or an empty string.
@@ -1167,7 +1180,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>formDataIfNE</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.352">formDataIfNE</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>&lt;<a href="http://docs.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>&gt;&nbsp;params)
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.357">formDataIfNE</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>&lt;<a href="http://docs.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>&gt;&nbsp;params)
                       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 form data parameters to the request for any parameters that aren't null/empty.
  <p>
@@ -1182,13 +1195,34 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="path-java.lang.String-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>path</h4>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.370">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>&nbsp;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>&nbsp;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">Replaces a variable of the form <js>"{name}"</js> in the URL path with the specified value.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - The path variable name.</dd>
+<dd><code>value</code> - The replacement value.</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> - If variable could not be found in path.</dd>
+</dl>
+</li>
+</ul>
 <a name="userInfo-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>userInfo</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.362">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>&nbsp;userInfo)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.398">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>&nbsp;userInfo)</pre>
 <div class="block">Sets the URI user info.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1204,7 +1238,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>userInfo</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.374">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>&nbsp;username,
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.410">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>&nbsp;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>&nbsp;password)</pre>
 <div class="block">Sets the URI user info.</div>
 <dl>
@@ -1222,7 +1256,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>input</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.394">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>&nbsp;input)
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.430">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>&nbsp;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>
@@ -1249,7 +1283,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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.408">serializer</a>(<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>&nbsp;serializer)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.444">serializer</a>(<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>&nbsp;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>
@@ -1267,7 +1301,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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.421">parser</a>(<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>&nbsp;parser)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.457">parser</a>(<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>&nbsp;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>
@@ -1285,9 +1319,10 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.441">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>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.478">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>&nbsp;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>&nbsp;value,
-                       boolean&nbsp;skipIfEmpty)</pre>
+                       boolean&nbsp;skipIfEmpty)
+                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 a header on the request.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1297,6 +1332,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>skipIfEmpty</code> - Don't add the header if the name is null/empty.</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>
@@ -1306,8 +1343,9 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.465">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>&nbsp;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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.506">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>&nbsp;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>&nbsp;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">Sets a header on the request.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1316,6 +1354,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The header value.</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>
@@ -1325,13 +1365,16 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>headers</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.475">headers</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>&lt;<a href="http://docs.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>&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.517">headers</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>&lt;<a href="http://docs.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>&gt;&nbsp;values)
+                 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 headers on the request.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>values</code> - The header values.</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>
@@ -1341,8 +1384,9 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>headerIfNE</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.489">headerIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.532">headerIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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>&nbsp;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">Sets a header on the request if the value is not null/empty.
  <p>
  NE = "not empty"</div>
@@ -1353,6 +1397,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The header value.</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>
@@ -1362,7 +1408,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>headersIfNE</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.501">headersIfNE</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>&lt;<a href="http://docs.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>&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.545">headersIfNE</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>&lt;<a href="http://docs.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>&gt;&nbsp;values)
+                     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 headers on the request if the values are not null/empty.
  <p>
  NE = "not empty"</div>
@@ -1371,6 +1418,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>values</code> - The header values.</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>
@@ -1380,7 +1429,8 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.513">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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.558">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>&nbsp;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">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>
@@ -1389,6 +1439,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The new header value.</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>
@@ -1398,7 +1450,8 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.525">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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.571">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>&nbsp;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">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>
@@ -1407,6 +1460,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The new header value.</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>
@@ -1416,7 +1471,8 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.537">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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.584">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>&nbsp;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">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>
@@ -1425,6 +1481,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The new header value.</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>
@@ -1434,7 +1492,8 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.549">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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.597">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>&nbsp;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">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>
@@ -1443,6 +1502,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The new header value.</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>
@@ -1452,7 +1513,8 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.561">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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.610">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>&nbsp;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">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>
@@ -1461,6 +1523,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The new header value.</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>
@@ -1470,7 +1534,8 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.573">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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.623">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>&nbsp;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">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>
@@ -1479,6 +1544,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The new header value.</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>
@@ -1488,7 +1555,8 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.585">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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.636">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>&nbsp;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">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>
@@ -1497,6 +1565,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The new header value.</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>
@@ -1506,7 +1576,8 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.597">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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.649">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>&nbsp;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">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>
@@ -1515,6 +1586,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The new header value.</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>
@@ -1524,7 +1597,8 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.609">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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.662">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>&nbsp;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">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>
@@ -1533,6 +1607,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The new header value.</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>
@@ -1542,7 +1618,8 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.621">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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.675">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>&nbsp;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">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>
@@ -1551,6 +1628,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>value</code> - The new header value.</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>
@@ -1560,7 +1639,8 @@ 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&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.633">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>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/client/

<TRUNCATED>


[35/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 a9a5564..060765b 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlDocSerializerSession.html
@@ -175,13 +175,14 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlDocSerializerSession.html#HtmlDocSerializerSession-org.apache.juneau.html.HtmlDocSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">HtmlDocSerializerSession</a></span>(<a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html" title="class in org.apache.juneau.html">HtmlDocSerializerContext</a>&nbsp;ctx,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlDocSerializerSession.html#HtmlDocSerializerSession-org.apache.juneau.html.HtmlDocSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">HtmlDocSerializerSession</a></span>(<a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html" title="class in org.apache.juneau.html">HtmlDocSerializerContext</a>&nbsp;ctx,
                         <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                         <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>&nbsp;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>&nbsp;locale,
                         <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>&nbsp;timeZone,
-                        <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+                        <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                        <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create a new session using properties specified in the context.</div>
 </td>
 </tr>
@@ -262,7 +263,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#
 isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Co
 llection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getUriContext--">getUriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTr
 imEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCu
 rrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.BeanSession">
@@ -299,33 +300,36 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="HtmlDocSerializerSession-org.apache.juneau.html.HtmlDocSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="HtmlDocSerializerSession-org.apache.juneau.html.HtmlDocSerializerContext-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HtmlDocSerializerSession</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.56">HtmlDocSerializerSession</a>(<a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html" title="class in org.apache.juneau.html">HtmlDocSerializerContext</a>&nbsp;ctx,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.58">HtmlDocSerializerSession</a>(<a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html" title="class in org.apache.juneau.html">HtmlDocSerializerContext</a>&nbsp;ctx,
                                    <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                                    <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>&nbsp;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>&nbsp;locale,
                                    <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>&nbsp;timeZone,
-                                   <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
+                                   <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                   <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>ctx</code> - The context creating this session object.
- The context contains all the configuration settings for this object.</dd>
+   The context contains all the configuration settings for this object.</dd>
 <dd><code>output</code> - The output object.  See <a href="../../../../org/apache/juneau/json/JsonSerializerSession.html#getWriter--"><code>JsonSerializerSession.getWriter()</code></a> for valid class types.</dd>
 <dd><code>op</code> - The override properties.
- These override any context properties defined in the context.</dd>
+   These override any context properties defined in the context.</dd>
 <dd><code>javaMethod</code> - The java method that called this serializer, usually the method in a REST servlet.</dd>
 <dd><code>locale</code> - The session locale.
- If <jk>null</jk>, then the locale defined on the context is used.</dd>
+   If <jk>null</jk>, then the locale defined on the context is used.</dd>
 <dd><code>timeZone</code> - The session timezone.
- If <jk>null</jk>, then the timezone defined on the context is used.</dd>
+   If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -343,7 +347,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getTitle</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.80">getTitle</a>()</pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.82">getTitle</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_title"><code>HtmlDocSerializerContext.HTMLDOC_title</code></a> setting value in this context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -357,7 +361,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getText</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.89">getText</a>()</pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.91">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>
@@ -371,7 +375,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getLinks</h4>
-<pre>public final&nbsp;<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>&lt;<a href="http://docs.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>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.98">getLinks</a>()</pre>
+<pre>public final&nbsp;<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>&lt;<a href="http://docs.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>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.100">getLinks</a>()</pre>
 <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>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -385,7 +389,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getCssUrl</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.107">getCssUrl</a>()</pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.109">getCssUrl</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_cssUrl"><code>HtmlDocSerializerContext.HTMLDOC_cssUrl</code></a> setting value in this context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -399,7 +403,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getCssImports</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.116">getCssImports</a>()</pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.118">getCssImports</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_cssImports"><code>HtmlDocSerializerContext.HTMLDOC_cssImports</code></a> setting value in this context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -413,7 +417,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>isNoWrap</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.125">isNoWrap</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.127">isNoWrap</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_nowrap"><code>HtmlDocSerializerContext.HTMLDOC_nowrap</code></a> setting value in this context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -427,7 +431,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html"
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getWriter</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.130">getWriter</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlDocSerializerSession.html#line.132">getWriter</a>()
                      throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">SerializerSession</a></code></span></div>
 <div class="block">Wraps the specified output object inside a writer.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/HtmlParserContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlParserContext.html b/content/site/apidocs/org/apache/juneau/html/HtmlParserContext.html
index 26bee05..f06f44a 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlParserContext.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlParserContext.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlParserContext.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 4c781ff..9d4f33d 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlParserSession.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlParserSession.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/html/HtmlParserContext.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/html/HtmlParserSession.html" target="_top">Frames</a></li>
@@ -423,7 +423,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlParserSession.html" title=
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/html/HtmlParserContext.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/html/HtmlParserSession.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/HtmlRender.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlRender.html b/content/site/apidocs/org/apache/juneau/html/HtmlRender.html
new file mode 100644
index 0000000..9bdbb45
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlRender.html
@@ -0,0 +1,420 @@
+<!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>HtmlRender (Apache Juneau (incubating) 6.2.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="HtmlRender (Apache Juneau (incubating) 6.2.1-incubating-SNAPSHOT)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":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/html/HtmlParserSession.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/html/HtmlRender.html" target="_top">Frames</a></li>
+<li><a href="HtmlRender.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.juneau.html</div>
+<h2 title="Class HtmlRender" class="title">Class HtmlRender&lt;T&gt;</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.html.HtmlRender&lt;T&gt;</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt><span class="paramLabel">Type Parameters:</span></dt>
+<dd><code>T</code> - The bean property type.</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/html/HtmlRender.html#line.121">HtmlRender</a>&lt;T&gt;
+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">Allows custom rendering of bean property values when serialized as HTML.
+ <p>
+ Associated with bean properties using the <a href="../../../../org/apache/juneau/html/annotation/Html.html#render--"><code>@Html.render()</code></a> annotation.
+ <p>
+ Using this class, you can alter the CSS style and HTML content of the bean property.
+ <p>
+ The following example shows two render classes that customize the appearance of the <code>pctFull</code> and
+   <code>status</code> columns shown below:
+ <p>
+ <img class='bordered' src='doc-files/HtmlRender_1.png'>
+
+ <p class='bcode'>
+
+   <jc>// Our bean class</jc>
+   <jk>public class</jk> FileSpace {
+
+      <jk>private final</jk> String <jf>drive</jf>;
+      <jk>private final long</jk> <jf>total</jf>, <jf>available</jf>;
+
+      <jk>public</jk> FileSpace(String drive, <jk>long</jk> total, <jk>long</jk> available) {
+         <jk>this</jk>.<jf>drive</jf> = drive;
+         <jk>this</jk>.<jf>total</jf> = total;
+         <jk>this</jk>.<jf>available</jf> = available;
+      }
+
+      <ja>@Html</ja>(link=<js>"drive/{drive}"</js>)
+      <jk>public</jk> String getDrive() {
+         <jk>return</jk> <jf>drive</jf>;
+      }
+
+      <jk>public long</jk> getTotal() {
+         <jk>return</jk> <jf>total</jf>;
+      }
+
+      <jk>public long</jk> getAvailable() {
+         <jk>return</jk> <jf>available</jf>;
+      }
+
+      <ja>@Html</ja>(render=FileSpacePctRender.<jk>class</jk>)
+      <jk>public float</jk> getPctFull() {
+         <jk>return</jk> ((100 * <jf>available</jf>) / <jf>total</jf>);
+      }
+
+      <ja>@Html</ja>(render=FileSpaceStatusRender.<jk>class</jk>)
+      <jk>public</jk> FileSpaceStatus getStatus() {
+         <jk>float</jk> pf = getPctFull();
+         <jk>if</jk> (pf < 80)
+            <jk>return</jk> FileSpaceStatus.<jsf>OK</jsf>;
+         <jk>if</jk> (pf < 90)
+            <jk>return</jk> FileSpaceStatus.<jsf>WARNING</jsf>;
+         <jk>return</jk> FileSpaceStatus.<jsf>SEVERE</jsf>;
+      }
+   }
+
+   <jc>// Possible values for the getStatus() method</jc>
+   <jk>public static enum</jk> FileSpaceStatus {
+      <jsf>OK</jsf>, <jsf>WARNING</jsf>, <jsf>SEVERE</jsf>;
+   }
+
+   <jc>// Custom render for getPctFull() method</jc>
+   <jk>public static class</jk> FileSpacePctRender <jk>extends</jk> HtmlRender&lt;Float&gt; {
+
+      <ja>@Override</ja>
+      <jk>public</jk> String getStyle(SerializerSession session, Float value) {
+         <jk>if</jk> (value < 80)
+            <jk>return</jk> <js>"background-color:lightgreen;text-align:center"</js>;
+         <jk>if</jk> (value < 90)
+            <jk>return</jk> <js>"background-color:yellow;text-align:center"</js>;
+         <jk>return</jk> <js>"background-color:red;text-align:center;border:;animation:color_change 0.5s infinite alternate"</js>;
+      }
+
+      <ja>@Override</ja>
+      <jk>public</jk> Object getContent(SerializerSession session, Float value) {
+         <jk>if</jk> (value >= 90)
+            <jk>return</jk> <jsm>div</jsm>(
+               String.<jsm>format</jsm>(<js>"%.0f%%"</js>, value),
+               <jsm>style</jsm>(<js>"@keyframes color_change { from { background-color: red; } to { background-color: yellow; }"</js>)
+            );
+         <jk>return</jk> String.<jsm>format</jsm>(<js>"%.0f%%"</js>, value);
+      }
+   }
+
+   <jc>// Custom render for getStatus() method</jc>
+   <jk>public static class</jk> FileSpaceStatusRender <jk>extends</jk> HtmlRender&lt;FileSpaceStatus&gt; {
+
+      <ja>@Override</ja>
+      <jk>public</jk> String getStyle(SerializerSession session, FileSpaceStatus value) {
+         <jk>return</jk> <js>"text-align:center"</js>;
+      }
+
+      <ja>@Override</ja>
+      <jk>public</jk> Object getContent(SerializerSession session, FileSpaceStatus value) {
+         <jk>switch</jk> (value) {
+            <jk>case</jk> <jsf>OK</jsf>:  <jk>return</jk> <jsm>img</jsm>().src(URI.<jsm>create</jsm>(<js>"servlet:/htdocs/ok.png"</js>));
+            <jk>case</jk> <jsf>WARNING</jsf>:  <jk>return</jk> <jsm>img</jsm>().src(URI.<jsm>create</jsm>(<js>"servlet:/htdocs/warning.png"</js>));
+            <jk>default</jk>: <jk>return</jk> <jsm>img</jsm>().src(URI.<jsm>create</jsm>(<js>"servlet:/htdocs/severe.png"</js>));
+         }
+      }
+   }
+ </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">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlRender.html#HtmlRender--">HtmlRender</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="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/HtmlRender.html#getContent-org.apache.juneau.serializer.SerializerSession-T-">getContent</a></span>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;session,
+          <a href="../../../../org/apache/juneau/html/HtmlRender.html" title="type parameter in HtmlRender">T</a>&nbsp;value)</code>
+<div class="block">Returns the delegate value for the specified bean property value.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlRender.html#getStyle-org.apache.juneau.serializer.SerializerSession-T-">getStyle</a></span>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;session,
+        <a href="../../../../org/apache/juneau/html/HtmlRender.html" title="type parameter in HtmlRender">T</a>&nbsp;value)</code>
+<div class="block">Returns the CSS style of the element containing the bean property value.</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&nbsp;java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://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">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="HtmlRender--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>HtmlRender</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlRender.html#line.121">HtmlRender</a>()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getStyle-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">
+<!--   -->
+</a><a name="getStyle-org.apache.juneau.serializer.SerializerSession-T-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getStyle</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlRender.html#line.131">getStyle</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;session,
+                       <a href="../../../../org/apache/juneau/html/HtmlRender.html" title="type parameter in HtmlRender">T</a>&nbsp;value)</pre>
+<div class="block">Returns the CSS style of the element containing the bean property value.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>session</code> - The current serializer session.
+   Can be used to retrieve properties and session-level information.</dd>
+<dd><code>value</code> - The bean property value.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The CSS style string, or <jk>null</jk> if no style should be added.</dd>
+</dl>
+</li>
+</ul>
+<a name="getContent-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">
+<!--   -->
+</a><a name="getContent-org.apache.juneau.serializer.SerializerSession-T-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getContent</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlRender.html#line.146">getContent</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;session,
+                         <a href="../../../../org/apache/juneau/html/HtmlRender.html" title="type parameter in HtmlRender">T</a>&nbsp;value)</pre>
+<div class="block">Returns the delegate value for the specified bean property value.
+ <p>
+ The default implementation simply returns the same value.
+ A typical use is to return an HTML element using one of the HTML5 DOM beans.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>session</code> - The current serializer session.
+   Can be used to retrieve properties and session-level information.</dd>
+<dd><code>value</code> - The bean property value.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The new bean property value.</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/html/HtmlParserSession.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/html/HtmlRender.html" target="_top">Frames</a></li>
+<li><a href="HtmlRender.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 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/37ddf434/content/site/apidocs/org/apache/juneau/html/HtmlSchemaDocSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlSchemaDocSerializer.html b/content/site/apidocs/org/apache/juneau/html/HtmlSchemaDocSerializer.html
index 77cb4b8..5afc9ec 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlSchemaDocSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlSchemaDocSerializer.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/html/HtmlParserSession.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -267,12 +267,13 @@ extends <a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" titl
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/html/HtmlDocSerializerSession.html" title="class in org.apache.juneau.html">HtmlDocSerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlSchemaDocSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlSchemaDocSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -406,7 +407,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" titl
 </dl>
 </li>
 </ul>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -417,15 +418,16 @@ extends <a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" titl
                                               <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>&nbsp;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>&nbsp;locale,
                                               <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>&nbsp;timeZone,
-                                              <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">Serializer</a></code></span></div>
+                                              <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                              <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">Serializer</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
    it's going to be a subclass of <a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><code>SerializerSession</code></a>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html">HtmlDocSerializer</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html">HtmlDocSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>output</code> - The output object.
    <br>Character-based serializers can handle the following output class types:
@@ -448,6 +450,8 @@ extends <a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" titl
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>
@@ -470,7 +474,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" titl
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html">HtmlDocSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -505,7 +509,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" titl
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/html/HtmlParserSession.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.Sq.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.Sq.html b/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.Sq.html
index aaffac9..3d12557 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.Sq.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.Sq.html
@@ -241,7 +241,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.html.<a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#serializeAnything-org.apache.juneau.html.HtmlSerializerSession-org.apache.juneau.html.HtmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-int-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#serializeAnything-org.apache.juneau.html.HtmlSerializerSession-org.apache.juneau.html.HtmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-int-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.xml.XmlSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.SqReadable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.SqReadable.html b/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.SqReadable.html
index 4a51ec6..700ab9c 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.SqReadable.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.SqReadable.html
@@ -241,7 +241,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.html.<a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#serializeAnything-org.apache.juneau.html.HtmlSerializerSession-org.apache.juneau.html.HtmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-int-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/html/HtmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/html/HtmlSerializer.html#serializeAnything-org.apache.juneau.html.HtmlSerializerSession-org.apache.juneau.html.HtmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-int-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.xml.XmlSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 2cbe14a..ed95e19 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlSerializer.html
@@ -359,12 +359,13 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html" title="class in org.apache.juneau.html">HtmlSerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -561,7 +562,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <ul class="blockList">
 <li class="blockList">
 <h4>getSchemaSerializer</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.680">getSchemaSerializer</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.706">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>
@@ -571,26 +572,27 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 </dl>
 </li>
 </ul>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createSession</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html" title="class in org.apache.juneau.html">HtmlSerializerSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.692">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>&nbsp;output,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html" title="class in org.apache.juneau.html">HtmlSerializerSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.718">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>&nbsp;output,
                                            <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
                                            <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>&nbsp;timeZone,
-                                           <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">Serializer</a></code></span></div>
+                                           <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                           <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">Serializer</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
    it's going to be a subclass of <a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><code>SerializerSession</code></a>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>output</code> - The output object.
    <br>Character-based serializers can handle the following output class types:
@@ -613,6 +615,8 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>
@@ -624,7 +628,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <ul class="blockListLast">
 <li class="blockList">
 <h4>doSerialize</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.697">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;session,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/html/HtmlSerializer.html#line.723">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;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>&nbsp;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:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">Serializer</a></code></span></div>
@@ -635,7 +639,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/HtmlSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlSerializerContext.html b/content/site/apidocs/org/apache/juneau/html/HtmlSerializerContext.html
index 7e808e3..499c8f4 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlSerializerContext.html
@@ -299,7 +299,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html" ti
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">


[30/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/package-tree.html b/content/site/apidocs/org/apache/juneau/package-tree.html
index 3c831b5..2d46634 100644
--- a/content/site/apidocs/org/apache/juneau/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/package-tree.html
@@ -168,6 +168,7 @@
 </li>
 </ul>
 </li>
+<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau"><span class="typeNameLink">UriContext</span></a></li>
 </ul>
 </li>
 </ul>
@@ -185,6 +186,8 @@
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, 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.<a href="../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau"><span class="typeNameLink">Visibility</span></a></li>
+<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau"><span class="typeNameLink">UriResolution</span></a></li>
+<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau"><span class="typeNameLink">UriRelativity</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/parser/ParserContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/parser/ParserContext.html b/content/site/apidocs/org/apache/juneau/parser/ParserContext.html
index 39041e9..64d345d 100644
--- a/content/site/apidocs/org/apache/juneau/parser/ParserContext.html
+++ b/content/site/apidocs/org/apache/juneau/parser/ParserContext.html
@@ -220,7 +220,7 @@ extends <a href="../../../../org/apache/juneau/BeanContext.html" title="class in
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/plaintext/PlainTextSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/plaintext/PlainTextSerializer.html b/content/site/apidocs/org/apache/juneau/plaintext/PlainTextSerializer.html
index 20419db..5d3be30 100644
--- a/content/site/apidocs/org/apache/juneau/plaintext/PlainTextSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/plaintext/PlainTextSerializer.html
@@ -239,7 +239,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a href="../../../../org/apache
 /juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a
  href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
@@ -344,7 +344,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/remoteable/FormData.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/FormData.html b/content/site/apidocs/org/apache/juneau/remoteable/FormData.html
index 418e4e0..69b0fb8 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/FormData.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/FormData.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/remoteable/FormData.html#line.53">FormData</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/FormData.html#line.55">FormData</a></pre>
 <div class="block">Annotation applied to Java method arguments of interface proxies to denote that they are FORM post parameters on the request.
  <p>
  <h5 class='section'>Example:</h5>
@@ -121,6 +121,8 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/For
    <li><code>NameValuePairs</code> - Individual name-value pairs.
    <li><code>Map&lt;String,Object&gt;</code> - Individual name-value pairs.
       Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-"><code>UrlEncodingSerializer.serializePart(Object, Boolean, Boolean)</code></a>.
+   <li>A bean - Individual name-value pairs.
+      Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-"><code>UrlEncodingSerializer.serializePart(Object, Boolean, Boolean)</code></a>.
  </ul></div>
 </li>
 </ul>
@@ -167,12 +169,19 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/For
 <ul class="blockListLast">
 <li class="blockList">
 <h4>value</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/FormData.html#line.59">value</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/FormData.html#line.68">value</a></pre>
 <div class="block">The form post parameter name.
- Can be blank if the value is an instance of <code>NameValuePairs</code> or <code>Map&lt;String,Object&gt;</code>.</div>
+ <p>
+ A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
+ for the following data types:
+ <ul>
+   <li><code>NameValuePairs</code>
+   <li><code>Map&lt;String,Object&gt;</code>
+   <li>A bean
+ </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>""</dd>
+<dd>"*"</dd>
 </dl>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/remoteable/FormDataIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/FormDataIfNE.html b/content/site/apidocs/org/apache/juneau/remoteable/FormDataIfNE.html
index f1fdd48..fde69fc 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/FormDataIfNE.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/FormDataIfNE.html
@@ -143,12 +143,19 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/For
 <ul class="blockListLast">
 <li class="blockList">
 <h4>value</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/FormDataIfNE.html#line.33">value</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/FormDataIfNE.html#line.40">value</a></pre>
 <div class="block">The form post parameter name.
- Can be blank if the value is an instance of <code>NameValuePairs</code> or <code>Map&lt;String,Object&gt;</code>.</div>
+ <p>
+ A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
+ for the following data types:
+ <ul>
+   <li><code>NameValuePairs</code>
+   <li><code>Map&lt;String,Object&gt;</code>
+   <li>A bean
+ </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>""</dd>
+<dd>"*"</dd>
 </dl>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/remoteable/Header.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/Header.html b/content/site/apidocs/org/apache/juneau/remoteable/Header.html
index 475b2cc..b87910f 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/Header.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/Header.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/remoteable/Header.html#line.49">Header</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Header.html#line.52">Header</a></pre>
 <div class="block">Annotation applied to Java method arguments of interface proxies to denote that they are serialized as an HTTP header value.
  <p>
  <h5 class='section'>Example:</h5>
@@ -114,9 +114,12 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
  <p>
  The argument can be any of the following types:
  <ul class='spaced-list'>
+   <li><code>NameValuePairs</code> - Individual name-value pairs.
    <li>Any serializable POJO - Converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-"><code>UrlEncodingSerializer.serializePart(Object, Boolean, Boolean)</code></a>.
    <li><code>Map&lt;String,Object&gt;</code> - Individual name-value pairs.
       Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-"><code>UrlEncodingSerializer.serializePart(Object, Boolean, Boolean)</code></a>.
+   <li>A bean - Individual name-value pairs.
+      Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-"><code>UrlEncodingSerializer.serializePart(Object, Boolean, Boolean)</code></a>.
  </ul></div>
 </li>
 </ul>
@@ -163,12 +166,19 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
 <ul class="blockListLast">
 <li class="blockList">
 <h4>value</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/Header.html#line.55">value</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/Header.html#line.65">value</a></pre>
 <div class="block">The HTTP header name.
- Can be blank if the value is an instance of <code>Map&lt;String,Object&gt;</code>.</div>
+ <p>
+ A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
+ for the following data types:
+ <ul>
+   <li><code>NameValuePairs</code>
+   <li><code>Map&lt;String,Object&gt;</code>
+   <li>A bean
+ </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>""</dd>
+<dd>"*"</dd>
 </dl>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/remoteable/HeaderIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/HeaderIfNE.html b/content/site/apidocs/org/apache/juneau/remoteable/HeaderIfNE.html
index 54ce368..b7a9f77 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/HeaderIfNE.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/HeaderIfNE.html
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/remoteable/Header.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/remoteable/Query.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/remoteable/HeaderIfNE.html" target="_top">Frames</a></li>
@@ -68,8 +68,8 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
-<li>Optional</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
@@ -104,17 +104,17 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
+<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.required.element.summary">
+<li class="blockList"><a name="annotation.type.optional.element.summary">
 <!--   -->
 </a>
-<h3>Required Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Required Element Summary table, listing required elements, and an explanation">
-<caption><span>Required Elements</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Optional Element Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
+<caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Required Element and Description</th>
+<th class="colLast" scope="col">Optional Element and Description</th>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
@@ -143,9 +143,20 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
 <ul class="blockListLast">
 <li class="blockList">
 <h4>value</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/HeaderIfNE.html#line.33">value</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/HeaderIfNE.html#line.40">value</a></pre>
 <div class="block">The HTTP header name.
- Can be blank if the value is an instance of <code>Map&lt;String,Object&gt;</code>.</div>
+ <p>
+ A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
+ for the following data types:
+ <ul>
+   <li><code>NameValuePairs</code>
+   <li><code>Map&lt;String,Object&gt;</code>
+   <li>A bean
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>"*"</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -176,7 +187,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/remoteable/Header.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/remoteable/Query.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/remoteable/HeaderIfNE.html" target="_top">Frames</a></li>
@@ -201,8 +212,8 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
-<li>Optional</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/remoteable/Path.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/Path.html b/content/site/apidocs/org/apache/juneau/remoteable/Path.html
new file mode 100644
index 0000000..183f126
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/remoteable/Path.html
@@ -0,0 +1,250 @@
+<!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>Path (Apache Juneau (incubating) 6.2.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="Path (Apache Juneau (incubating) 6.2.1-incubating-SNAPSHOT)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="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/remoteable/HeaderIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/remoteable/Query.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/remoteable/Path.html" target="_top">Frames</a></li>
+<li><a href="Path.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#annotation.type.element.detail">Element</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.remoteable</div>
+<h2 title="Annotation Type Path" class="title">Annotation Type Path</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Documented.html?is-external=true" title="class or interface in java.lang.annotation">@Documented</a>
+ <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/remoteable/Path.html#line.49">Path</a></pre>
+<div class="block">Annotation applied to Java method arguments of interface proxies to denote that they are path variables on the request.
+ <p>
+ <h5 class='section'>Example:</h5>
+ <p class='bcode'>
+   <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
+   <jk>public interface</jk> MyProxy {
+
+      <ja>@RemoteMethod</ja>(path=<js>"/mymethod1/{foo}"</js>)
+      String myProxyMethod1(<ja>@Path</ja>(<js>"foo"</js>)</ja> String foo);
+   }
+ </p>
+ <p>
+ The argument can be any of the following types:
+ <ul class='spaced-list'>
+   <li><code>NameValuePairs</code> - Individual name-value pairs.
+   <li>Any serializable POJO - Converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-"><code>UrlEncodingSerializer.serializePart(Object, Boolean, Boolean)</code></a>.
+   <li><code>Map&lt;String,Object&gt;</code> - Individual name-value pairs.
+      Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-"><code>UrlEncodingSerializer.serializePart(Object, Boolean, Boolean)</code></a>.
+   <li>A bean - Individual name-value pairs.
+      Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-"><code>UrlEncodingSerializer.serializePart(Object, Boolean, Boolean)</code></a>.
+ </ul></div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="annotation.type.optional.element.summary">
+<!--   -->
+</a>
+<h3>Optional Element Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
+<caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Optional Element and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Path.html#value--">value</a></span></code>
+<div class="block">The path parameter name.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="annotation.type.element.detail">
+<!--   -->
+</a>
+<h3>Element Detail</h3>
+<a name="value--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>value</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/Path.html#line.62">value</a></pre>
+<div class="block">The path parameter name.
+ <p>
+ A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
+ for the following data types:
+ <ul>
+   <li><code>NameValuePairs</code>
+   <li><code>Map&lt;String,Object&gt;</code>
+   <li>A bean
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>"*"</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/remoteable/HeaderIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/remoteable/Query.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/remoteable/Path.html" target="_top">Frames</a></li>
+<li><a href="Path.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#annotation.type.element.detail">Element</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 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/37ddf434/content/site/apidocs/org/apache/juneau/remoteable/Query.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/Query.html b/content/site/apidocs/org/apache/juneau/remoteable/Query.html
index 574d783..f0db72c 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/Query.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/Query.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/remoteable/HeaderIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/remoteable/QueryIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -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/remoteable/Query.html#line.53">Query</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Query.html#line.56">Query</a></pre>
 <div class="block">Annotation applied to Java method arguments of interface proxies to denote that they are QUERY parameters on the request.
  <p>
  <h5 class='section'>Example:</h5>
@@ -117,9 +117,12 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
  <p>
  The argument can be any of the following types:
  <ul class='spaced-list'>
+   <li><code>NameValuePairs</code> - Individual name-value pairs.
    <li>Any serializable POJO - Converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-"><code>UrlEncodingSerializer.serializePart(Object, Boolean, Boolean)</code></a>.
    <li><code>Map&lt;String,Object&gt;</code> - Individual name-value pairs.
       Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-"><code>UrlEncodingSerializer.serializePart(Object, Boolean, Boolean)</code></a>.
+   <li>A bean - Individual name-value pairs.
+      Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializePart-java.lang.Object-java.lang.Boolean-java.lang.Boolean-"><code>UrlEncodingSerializer.serializePart(Object, Boolean, Boolean)</code></a>.
    <li><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> - Treated as a query string.
  </ul></div>
 </li>
@@ -167,12 +170,20 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
 <ul class="blockListLast">
 <li class="blockList">
 <h4>value</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/Query.html#line.59">value</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/Query.html#line.70">value</a></pre>
 <div class="block">The query parameter name.
- Can be blank if the value is an instance of <code>Map&lt;String,Object&gt;</code> or <code>String</code>.</div>
+ <p>
+ A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
+ for the following data types:
+ <ul>
+   <li><code>String</code> - A complete query string.
+   <li><code>NameValuePairs</code>
+   <li><code>Map&lt;String,Object&gt;</code>
+   <li>A bean
+ </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>""</dd>
+<dd>"*"</dd>
 </dl>
 </li>
 </ul>
@@ -203,7 +214,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/remoteable/HeaderIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/remoteable/QueryIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/remoteable/QueryIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/QueryIfNE.html b/content/site/apidocs/org/apache/juneau/remoteable/QueryIfNE.html
index f65ac0e..b9a5657 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/QueryIfNE.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/QueryIfNE.html
@@ -68,8 +68,8 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
-<li>Optional</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
@@ -104,17 +104,17 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
+<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.required.element.summary">
+<li class="blockList"><a name="annotation.type.optional.element.summary">
 <!--   -->
 </a>
-<h3>Required Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Required Element Summary table, listing required elements, and an explanation">
-<caption><span>Required Elements</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Optional Element Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
+<caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Required Element and Description</th>
+<th class="colLast" scope="col">Optional Element and Description</th>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
@@ -143,9 +143,21 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
 <ul class="blockListLast">
 <li class="blockList">
 <h4>value</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/QueryIfNE.html#line.33">value</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/QueryIfNE.html#line.41">value</a></pre>
 <div class="block">The query parameter name.
- Can be blank if the value is an instance of <code>Map&lt;String,Object&gt;</code> or <code>String</code>.</div>
+ <p>
+ A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
+ for the following data types:
+ <ul>
+   <li><code>String</code> - A complete query string.
+   <li><code>NameValuePairs</code>
+   <li><code>Map&lt;String,Object&gt;</code>
+   <li>A bean
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>"*"</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -201,8 +213,8 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
-<li>Optional</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/remoteable/RemoteableMethodMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/RemoteableMethodMeta.html b/content/site/apidocs/org/apache/juneau/remoteable/RemoteableMethodMeta.html
index 38b8f45..135d1c2 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/RemoteableMethodMeta.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/RemoteableMethodMeta.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,"i6":10,"i7":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -183,11 +183,17 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/RemoteableMethodMeta.html#getPathArgs--">getPathArgs</a></span>()</code>
+<div class="block">Returns the <a href="../../../../org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable"><code>@Path</code></a> annotated arguments on this Java method.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a>[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/RemoteableMethodMeta.html#getQueryArgs--">getQueryArgs</a></span>()</code>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/remoteable/Query.html" title="annotation in org.apache.juneau.remoteable"><code>@Query</code></a> annotated arguments on this Java method.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" 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/remoteable/RemoteableMethodMeta.html#getUrl--">getUrl</a></span>()</code>
 <div class="block">Returns the absolute URL of the REST interface invoked by this Java method.</div>
@@ -245,7 +251,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getHttpMethod</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.126">getHttpMethod</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.131">getHttpMethod</a>()</pre>
 <div class="block">Returns the value of the <a href="../../../../org/apache/juneau/remoteable/RemoteMethod.html#httpMethod--"><code>RemoteMethod.httpMethod()</code></a> annotation on this Java method.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -259,7 +265,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getUrl</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.134">getUrl</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.139">getUrl</a>()</pre>
 <div class="block">Returns the absolute URL of the REST interface invoked by this Java method.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -267,13 +273,27 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="getPathArgs--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPathArgs</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.147">getPathArgs</a>()</pre>
+<div class="block">Returns the <a href="../../../../org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable"><code>@Path</code></a> annotated arguments on this Java method.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A map of <a href="../../../../org/apache/juneau/remoteable/Path.html#value--"><code>@Path.value()</code></a> names to zero-indexed argument indices.</dd>
+</dl>
+</li>
+</ul>
 <a name="getQueryArgs--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getQueryArgs</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.142">getQueryArgs</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.155">getQueryArgs</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/remoteable/Query.html" title="annotation in org.apache.juneau.remoteable"><code>@Query</code></a> annotated arguments on this Java method.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -287,7 +307,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getFormDataArgs</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.150">getFormDataArgs</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.163">getFormDataArgs</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/remoteable/FormData.html" title="annotation in org.apache.juneau.remoteable"><code>@FormData</code></a> annotated arguments on this Java method.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -301,7 +321,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getHeaderArgs</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.158">getHeaderArgs</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.171">getHeaderArgs</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/remoteable/Header.html" title="annotation in org.apache.juneau.remoteable"><code>@Header</code></a> annotated arguments on this Java method.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -315,7 +335,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getOtherArgs</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.166">getOtherArgs</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.179">getOtherArgs</a>()</pre>
 <div class="block">Returns the remaining non-annotated arguments on this Java method.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -329,7 +349,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getBodyArg</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.174">getBodyArg</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.187">getBodyArg</a>()</pre>
 <div class="block">Returns the argument annotated with <a href="../../../../org/apache/juneau/remoteable/Body.html" title="annotation in org.apache.juneau.remoteable"><code>@Body</code></a>.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/remoteable/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/package-frame.html b/content/site/apidocs/org/apache/juneau/remoteable/package-frame.html
index 4450f6f..8a2b638 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/package-frame.html
@@ -28,6 +28,7 @@
 <li><a href="FormDataIfNE.html" title="annotation in org.apache.juneau.remoteable" target="classFrame">FormDataIfNE</a></li>
 <li><a href="Header.html" title="annotation in org.apache.juneau.remoteable" target="classFrame">Header</a></li>
 <li><a href="HeaderIfNE.html" title="annotation in org.apache.juneau.remoteable" target="classFrame">HeaderIfNE</a></li>
+<li><a href="Path.html" title="annotation in org.apache.juneau.remoteable" target="classFrame">Path</a></li>
 <li><a href="Query.html" title="annotation in org.apache.juneau.remoteable" target="classFrame">Query</a></li>
 <li><a href="QueryIfNE.html" title="annotation in org.apache.juneau.remoteable" target="classFrame">QueryIfNE</a></li>
 <li><a href="Remoteable.html" title="annotation in org.apache.juneau.remoteable" target="classFrame">Remoteable</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/remoteable/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/package-summary.html b/content/site/apidocs/org/apache/juneau/remoteable/package-summary.html
index 032c15a..9a2fa75 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/package-summary.html
@@ -162,24 +162,30 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable">Path</a></td>
+<td class="colLast">
+<div class="block">Annotation applied to Java method arguments of interface proxies to denote that they are path variables on the request.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/remoteable/Query.html" title="annotation in org.apache.juneau.remoteable">Query</a></td>
 <td class="colLast">
 <div class="block">Annotation applied to Java method arguments of interface proxies to denote that they are QUERY parameters on the request.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/remoteable/QueryIfNE.html" title="annotation in org.apache.juneau.remoteable">QueryIfNE</a></td>
 <td class="colLast">
 <div class="block">Identical to <a href="../../../../org/apache/juneau/remoteable/Query.html" title="annotation in org.apache.juneau.remoteable"><code>@Query</code></a> except skips values if they're null/blank.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/remoteable/Remoteable.html" title="annotation in org.apache.juneau.remoteable">Remoteable</a></td>
 <td class="colLast">
 <div class="block">Identifies a remote proxy interface against a REST interface.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/remoteable/RemoteMethod.html" title="annotation in org.apache.juneau.remoteable">RemoteMethod</a></td>
 <td class="colLast">
 <div class="block">Annotation applied to Java methods on interface proxy classes.</div>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/remoteable/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/package-tree.html b/content/site/apidocs/org/apache/juneau/remoteable/package-tree.html
index feb7a39..16da733 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/package-tree.html
@@ -109,6 +109,7 @@
 <li type="circle">org.apache.juneau.remoteable.<a href="../../../../org/apache/juneau/remoteable/Remoteable.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Remoteable</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a href="../../../../org/apache/juneau/remoteable/QueryIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">QueryIfNE</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a href="../../../../org/apache/juneau/remoteable/Query.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Query</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.juneau.remoteable.<a href="../../../../org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Path</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a href="../../../../org/apache/juneau/remoteable/HeaderIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">HeaderIfNE</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a href="../../../../org/apache/juneau/remoteable/Header.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">Header</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a href="../../../../org/apache/juneau/remoteable/FormDataIfNE.html" title="annotation in org.apache.juneau.remoteable"><span class="typeNameLink">FormDataIfNE</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>


[12/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html
index bbd4f9c..130cef4 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html
@@ -62,242 +62,244 @@
 <span class="sourceLineNo">054</span>    * Create a new session using properties specified in the context.<a name="line.54"></a>
 <span class="sourceLineNo">055</span>    *<a name="line.55"></a>
 <span class="sourceLineNo">056</span>    * @param ctx The context creating this session object.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * The context contains all the configuration settings for this object.<a name="line.57"></a>
+<span class="sourceLineNo">057</span>    *    The context contains all the configuration settings for this object.<a name="line.57"></a>
 <span class="sourceLineNo">058</span>    * @param output The output object.  See {@link JsonSerializerSession#getWriter()} for valid class types.<a name="line.58"></a>
 <span class="sourceLineNo">059</span>    * @param op The override properties.<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * These override any context properties defined in the context.<a name="line.60"></a>
+<span class="sourceLineNo">060</span>    *    These override any context properties defined in the context.<a name="line.60"></a>
 <span class="sourceLineNo">061</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.61"></a>
 <span class="sourceLineNo">062</span>    * @param locale The session locale.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.63"></a>
+<span class="sourceLineNo">063</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.63"></a>
 <span class="sourceLineNo">064</span>    * @param timeZone The session timezone.<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.65"></a>
+<span class="sourceLineNo">065</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.65"></a>
 <span class="sourceLineNo">066</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    */<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   protected RdfSerializerSession(RdfSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.68"></a>
-<span class="sourceLineNo">069</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      ObjectMap jenaSettings = new ObjectMap();<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      jenaSettings.put("rdfXml.tab", isUseWhitespace() ? 2 : 0);<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      jenaSettings.put("rdfXml.attributeQuoteChar", Character.toString(getQuoteChar()));<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      jenaSettings.putAll(ctx.jenaSettings);<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      if (op == null || op.isEmpty()) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>         this.rdfLanguage = ctx.rdfLanguage;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>         this.juneauNs = ctx.juneauNs;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>         this.juneauBpNs = ctx.juneauBpNs;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>         this.addLiteralTypes = ctx.addLiteralTypes;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>         this.addRootProperty = ctx.addRootProperty;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>         this.collectionFormat = ctx.collectionFormat;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>         this.looseCollections = ctx.looseCollections;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>         this.useXmlNamespaces = ctx.useXmlNamespaces;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>         this.autoDetectNamespaces = ctx.autoDetectNamespaces;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>         this.namespaces = ctx.namespaces;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      } else {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>         this.rdfLanguage = op.getString(RDF_language, ctx.rdfLanguage);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>         this.juneauNs = (op.containsKey(RDF_juneauNs) ? NamespaceFactory.parseNamespace(op.get(RDF_juneauNs)) : ctx.juneauNs);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>         this.juneauBpNs = (op.containsKey(RDF_juneauBpNs) ? NamespaceFactory.parseNamespace(op.get(RDF_juneauBpNs)) : ctx.juneauBpNs);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>         this.addLiteralTypes = op.getBoolean(RDF_addLiteralTypes, ctx.addLiteralTypes);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>         this.addRootProperty = op.getBoolean(RDF_addRootProperty, ctx.addRootProperty);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>         for (Map.Entry&lt;String,Object&gt; e : op.entrySet()) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>            String key = e.getKey();<a name="line.93"></a>
-<span class="sourceLineNo">094</span>            if (key.startsWith("Rdf.jena."))<a name="line.94"></a>
-<span class="sourceLineNo">095</span>               jenaSettings.put(key.substring(9), e.getValue());<a name="line.95"></a>
-<span class="sourceLineNo">096</span>         }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>         this.collectionFormat = RdfCollectionFormat.valueOf(op.getString(RDF_collectionFormat, "DEFAULT"));<a name="line.97"></a>
-<span class="sourceLineNo">098</span>         this.looseCollections = op.getBoolean(RDF_looseCollections, ctx.looseCollections);<a name="line.98"></a>
-<span class="sourceLineNo">099</span>         this.useXmlNamespaces = op.getBoolean(RDF_useXmlNamespaces, ctx.useXmlNamespaces);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>         this.autoDetectNamespaces = op.getBoolean(RDF_autoDetectNamespaces, ctx.autoDetectNamespaces);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>         this.namespaces = op.get(Namespace[].class, RDF_namespaces, ctx.namespaces);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>         addBeanTypeProperties = op.getBoolean(RDF_addBeanTypeProperties, ctx.addBeanTypeProperties);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      }<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      this.model = ModelFactory.createDefaultModel();<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      addModelPrefix(juneauNs);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      addModelPrefix(juneauBpNs);<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      for (Namespace ns : this.namespaces)<a name="line.107"></a>
-<span class="sourceLineNo">108</span>         addModelPrefix(ns);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      this.pRoot = model.createProperty(juneauNs.getUri(), RDF_juneauNs_ROOT);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      this.pValue = model.createProperty(juneauNs.getUri(), RDF_juneauNs_VALUE);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      this.pType = model.createProperty(juneauNs.getUri(), RDF_juneauNs_TYPE);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      writer = model.getWriter(rdfLanguage);<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>      // Only apply properties with this prefix!<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      String propPrefix = RdfCommonContext.LANG_PROP_MAP.get(rdfLanguage);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      if (propPrefix == null)<a name="line.116"></a>
-<span class="sourceLineNo">117</span>         throw new RuntimeException("Unknown RDF language encountered: '"+rdfLanguage+"'");<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>      for (Map.Entry&lt;String,Object&gt; e : jenaSettings.entrySet())<a name="line.119"></a>
-<span class="sourceLineNo">120</span>         if (e.getKey().startsWith(propPrefix))<a name="line.120"></a>
-<span class="sourceLineNo">121</span>            writer.setProperty(e.getKey().substring(propPrefix.length()), e.getValue());<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>    * Adds the specified namespace as a model prefix.<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    *<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * @param ns The XML namespace.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    */<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   public void addModelPrefix(Namespace ns) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      model.setNsPrefix(ns.getName(), ns.getUri());<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 {@link RdfCommonContext#RDF_collectionFormat} setting value for this session.<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    *<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    * @return The {@link RdfCommonContext#RDF_collectionFormat} setting value for this session.<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    */<a name="line.137"></a>
-<span class="sourceLineNo">138</span>   public final RdfCollectionFormat getCollectionFormat() {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      return collectionFormat;<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>   /**<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    * Returns the {@link RdfCommonContext#RDF_useXmlNamespaces} setting value for this session.<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    *<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    * @return The {@link RdfCommonContext#RDF_useXmlNamespaces} setting value for this session.<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   public final boolean isUseXmlNamespaces() {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      return useXmlNamespaces;<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>    * Returns the {@link RdfCommonContext#RDF_looseCollections} setting value for this session.<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    *<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    * @return The {@link RdfCommonContext#RDF_looseCollections} setting value for this session.<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    */<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   public final boolean isLooseCollections() {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      return looseCollections;<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>   /**<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    * Returns the {@link RdfCommonContext#RDF_language} setting value for this session.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    *<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    * @return The {@link RdfCommonContext#RDF_language} setting value for this session.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    */<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   public final String getRdfLanguage() {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      return rdfLanguage;<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 the {@link RdfCommonContext#RDF_juneauNs} setting value for this session.<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    *<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    * @return The {@link RdfCommonContext#RDF_juneauNs} setting value for this session.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   public final Namespace getJuneauNs() {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      return juneauNs;<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>    * Returns the {@link RdfCommonContext#RDF_juneauBpNs} setting value for this session.<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    *<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    * @return The {@link RdfCommonContext#RDF_juneauBpNs} setting value for this session.<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    */<a name="line.182"></a>
-<span class="sourceLineNo">183</span>   public final Namespace getJuneauBpNs() {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      return juneauBpNs;<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>    * Returns the {@link RdfSerializerContext#RDF_addLiteralTypes} setting value for this session.<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    *<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    * @return The {@link RdfSerializerContext#RDF_addLiteralTypes} setting value for this session.<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    */<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   public final boolean isAddLiteralTypes() {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      return addLiteralTypes;<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>   /**<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    * Returns the {@link RdfSerializerContext#RDF_addRootProperty} setting value for this session.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    *<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    * @return The {@link RdfSerializerContext#RDF_addRootProperty} setting value for this session.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   public final boolean isAddRootProp() {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      return addRootProperty;<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>   /**<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    * Returns the {@link RdfSerializerContext#RDF_autoDetectNamespaces} setting value for this session.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    *<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    * @return The {@link RdfSerializerContext#RDF_autoDetectNamespaces} setting value for this session.<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   public final boolean isAutoDetectNamespaces() {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      return autoDetectNamespaces;<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>   /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    * Returns the {@link MsgPackSerializerContext#MSGPACK_addBeanTypeProperties} setting value for this session.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    *<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    * @return The {@link MsgPackSerializerContext#MSGPACK_addBeanTypeProperties} setting value for this session.<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    */<a name="line.218"></a>
-<span class="sourceLineNo">219</span>   @Override /* SerializerSession */<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   public final boolean isAddBeanTypeProperties() {<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      return addBeanTypeProperties;<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 the RDF property that identifies the root node in the RDF model.<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    *<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    * @return The RDF property that identifies the root node in the RDF model.<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    */<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   public final Property getRootProp() {<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      return pRoot;<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>    * Returns the RDF property that represents a value in the RDF model.<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    *<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    * @return The RDF property that represents a value in the RDF model.<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    */<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   public final Property getValueProperty() {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return pValue;<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>   /**<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    * Returns the RDF property that represents a class in the RDF model.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    *<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    * @return The RDF property that represents a class in the RDF model.<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    */<a name="line.246"></a>
-<span class="sourceLineNo">247</span>   public final Property getTypeProperty() {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      return pType;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   }<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>    * Returns the RDF model being serialized.<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    *<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    * @return The RDF model being serialized.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>   public final Model getModel() {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      return model;<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>    * Returns the RDF writer that's being serialized to.<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    *<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    * @return The RDF writer that's being serialized to.<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    */<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   public final RDFWriter getRdfWriter() {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      return writer;<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>    * XML-encodes the specified string using the {@link XmlUtils#encodeInvalidCharsForText(Object)} method.<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    *<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    * @param o The string being encoded.<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    * @return The encoded string, or &lt;jk&gt;null&lt;/jk&gt; if the input was &lt;jk&gt;null&lt;/jk&gt;.<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    */<a name="line.274"></a>
-<span class="sourceLineNo">275</span>   public final String encodeTextInvalidChars(Object o) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      if (o == null)<a name="line.276"></a>
-<span class="sourceLineNo">277</span>         return null;<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      String s = toString(o);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      return XmlUtils.encodeInvalidCharsForText(s);<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>    * XML-encoded the specified element name using the {@link XmlUtils#encodeElementName(Object)} method.<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    *<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    * @param o The string being encoded.<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    * @return The encoded string.<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    */<a name="line.287"></a>
-<span class="sourceLineNo">288</span>   public final String encodeElementName(Object o) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      String s = toString(o);<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      return XmlUtils.encodeElementName(s);<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">067</span>    * @param uriContext The URI context.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form. <a name="line.68"></a>
+<span class="sourceLineNo">069</span>    */<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   protected RdfSerializerSession(RdfSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      ObjectMap jenaSettings = new ObjectMap();<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      jenaSettings.put("rdfXml.tab", isUseWhitespace() ? 2 : 0);<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      jenaSettings.put("rdfXml.attributeQuoteChar", Character.toString(getQuoteChar()));<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      jenaSettings.putAll(ctx.jenaSettings);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      if (op == null || op.isEmpty()) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>         this.rdfLanguage = ctx.rdfLanguage;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>         this.juneauNs = ctx.juneauNs;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>         this.juneauBpNs = ctx.juneauBpNs;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>         this.addLiteralTypes = ctx.addLiteralTypes;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>         this.addRootProperty = ctx.addRootProperty;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>         this.collectionFormat = ctx.collectionFormat;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>         this.looseCollections = ctx.looseCollections;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>         this.useXmlNamespaces = ctx.useXmlNamespaces;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>         this.autoDetectNamespaces = ctx.autoDetectNamespaces;<a name="line.85"></a>
+<span class="sourceLineNo">086</span>         this.namespaces = ctx.namespaces;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      } else {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>         this.rdfLanguage = op.getString(RDF_language, ctx.rdfLanguage);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>         this.juneauNs = (op.containsKey(RDF_juneauNs) ? NamespaceFactory.parseNamespace(op.get(RDF_juneauNs)) : ctx.juneauNs);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>         this.juneauBpNs = (op.containsKey(RDF_juneauBpNs) ? NamespaceFactory.parseNamespace(op.get(RDF_juneauBpNs)) : ctx.juneauBpNs);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>         this.addLiteralTypes = op.getBoolean(RDF_addLiteralTypes, ctx.addLiteralTypes);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>         this.addRootProperty = op.getBoolean(RDF_addRootProperty, ctx.addRootProperty);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>         for (Map.Entry&lt;String,Object&gt; e : op.entrySet()) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>            String key = e.getKey();<a name="line.95"></a>
+<span class="sourceLineNo">096</span>            if (key.startsWith("Rdf.jena."))<a name="line.96"></a>
+<span class="sourceLineNo">097</span>               jenaSettings.put(key.substring(9), e.getValue());<a name="line.97"></a>
+<span class="sourceLineNo">098</span>         }<a name="line.98"></a>
+<span class="sourceLineNo">099</span>         this.collectionFormat = RdfCollectionFormat.valueOf(op.getString(RDF_collectionFormat, "DEFAULT"));<a name="line.99"></a>
+<span class="sourceLineNo">100</span>         this.looseCollections = op.getBoolean(RDF_looseCollections, ctx.looseCollections);<a name="line.100"></a>
+<span class="sourceLineNo">101</span>         this.useXmlNamespaces = op.getBoolean(RDF_useXmlNamespaces, ctx.useXmlNamespaces);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>         this.autoDetectNamespaces = op.getBoolean(RDF_autoDetectNamespaces, ctx.autoDetectNamespaces);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>         this.namespaces = op.get(Namespace[].class, RDF_namespaces, ctx.namespaces);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>         addBeanTypeProperties = op.getBoolean(RDF_addBeanTypeProperties, ctx.addBeanTypeProperties);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      }<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      this.model = ModelFactory.createDefaultModel();<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      addModelPrefix(juneauNs);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      addModelPrefix(juneauBpNs);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      for (Namespace ns : this.namespaces)<a name="line.109"></a>
+<span class="sourceLineNo">110</span>         addModelPrefix(ns);<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      this.pRoot = model.createProperty(juneauNs.getUri(), RDF_juneauNs_ROOT);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      this.pValue = model.createProperty(juneauNs.getUri(), RDF_juneauNs_VALUE);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      this.pType = model.createProperty(juneauNs.getUri(), RDF_juneauNs_TYPE);<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      writer = model.getWriter(rdfLanguage);<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span>      // Only apply properties with this prefix!<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      String propPrefix = RdfCommonContext.LANG_PROP_MAP.get(rdfLanguage);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      if (propPrefix == null)<a name="line.118"></a>
+<span class="sourceLineNo">119</span>         throw new RuntimeException("Unknown RDF language encountered: '"+rdfLanguage+"'");<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>      for (Map.Entry&lt;String,Object&gt; e : jenaSettings.entrySet())<a name="line.121"></a>
+<span class="sourceLineNo">122</span>         if (e.getKey().startsWith(propPrefix))<a name="line.122"></a>
+<span class="sourceLineNo">123</span>            writer.setProperty(e.getKey().substring(propPrefix.length()), e.getValue());<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>   /**<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    * Adds the specified namespace as a model prefix.<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    *<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    * @param ns The XML namespace.<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    */<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   public void addModelPrefix(Namespace ns) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      model.setNsPrefix(ns.getName(), ns.getUri());<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>   /**<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    * Returns the {@link RdfCommonContext#RDF_collectionFormat} setting value for this session.<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    *<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    * @return The {@link RdfCommonContext#RDF_collectionFormat} setting value for this session.<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    */<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   public final RdfCollectionFormat getCollectionFormat() {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      return collectionFormat;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>   }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>   /**<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    * Returns the {@link RdfCommonContext#RDF_useXmlNamespaces} setting value for this session.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    *<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    * @return The {@link RdfCommonContext#RDF_useXmlNamespaces} setting value for this session.<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    */<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   public final boolean isUseXmlNamespaces() {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      return useXmlNamespaces;<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>    * Returns the {@link RdfCommonContext#RDF_looseCollections} setting value for this session.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    *<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    * @return The {@link RdfCommonContext#RDF_looseCollections} setting value for this session.<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    */<a name="line.157"></a>
+<span class="sourceLineNo">158</span>   public final boolean isLooseCollections() {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      return looseCollections;<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>   /**<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    * Returns the {@link RdfCommonContext#RDF_language} setting value for this session.<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    *<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    * @return The {@link RdfCommonContext#RDF_language} setting value for this session.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    */<a name="line.166"></a>
+<span class="sourceLineNo">167</span>   public final String getRdfLanguage() {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      return rdfLanguage;<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   }<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>    * Returns the {@link RdfCommonContext#RDF_juneauNs} setting value for this session.<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    *<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    * @return The {@link RdfCommonContext#RDF_juneauNs} setting value for this session.<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    */<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   public final Namespace getJuneauNs() {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      return juneauNs;<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>    * Returns the {@link RdfCommonContext#RDF_juneauBpNs} setting value for this session.<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    *<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    * @return The {@link RdfCommonContext#RDF_juneauBpNs} setting value for this session.<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    */<a name="line.184"></a>
+<span class="sourceLineNo">185</span>   public final Namespace getJuneauBpNs() {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      return juneauBpNs;<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 {@link RdfSerializerContext#RDF_addLiteralTypes} setting value for this session.<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    *<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    * @return The {@link RdfSerializerContext#RDF_addLiteralTypes} setting value for this session.<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    */<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   public final boolean isAddLiteralTypes() {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      return addLiteralTypes;<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>    * Returns the {@link RdfSerializerContext#RDF_addRootProperty} setting value for this session.<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    *<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    * @return The {@link RdfSerializerContext#RDF_addRootProperty} setting value for this session.<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    */<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   public final boolean isAddRootProp() {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      return addRootProperty;<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   }<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>    * Returns the {@link RdfSerializerContext#RDF_autoDetectNamespaces} setting value for this session.<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    *<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    * @return The {@link RdfSerializerContext#RDF_autoDetectNamespaces} setting value for this session.<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    */<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   public final boolean isAutoDetectNamespaces() {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      return autoDetectNamespaces;<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>    * Returns the {@link MsgPackSerializerContext#MSGPACK_addBeanTypeProperties} setting value for this session.<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    *<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    * @return The {@link MsgPackSerializerContext#MSGPACK_addBeanTypeProperties} setting value for this session.<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    */<a name="line.220"></a>
+<span class="sourceLineNo">221</span>   @Override /* SerializerSession */<a name="line.221"></a>
+<span class="sourceLineNo">222</span>   public final boolean isAddBeanTypeProperties() {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      return addBeanTypeProperties;<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>   /**<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    * Returns the RDF property that identifies the root node in the RDF model.<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    *<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    * @return The RDF property that identifies the root node in the RDF model.<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    */<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   public final Property getRootProp() {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      return pRoot;<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>    * Returns the RDF property that represents a value in the RDF model.<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    *<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    * @return The RDF property that represents a value in the RDF model.<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    */<a name="line.239"></a>
+<span class="sourceLineNo">240</span>   public final Property getValueProperty() {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      return pValue;<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>    * Returns the RDF property that represents a class in the RDF model.<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    *<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    * @return The RDF property that represents a class in the RDF model.<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    */<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   public final Property getTypeProperty() {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      return pType;<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>   /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    * Returns the RDF model being serialized.<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    *<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    * @return The RDF model being serialized.<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    */<a name="line.257"></a>
+<span class="sourceLineNo">258</span>   public final Model getModel() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      return model;<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>    * Returns the RDF writer that's being serialized to.<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    *<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    * @return The RDF writer that's being serialized to.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    */<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   public final RDFWriter getRdfWriter() {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      return writer;<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>   /**<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    * XML-encodes the specified string using the {@link XmlUtils#encodeInvalidCharsForText(Object)} method.<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    *<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    * @param o The string being encoded.<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    * @return The encoded string, or &lt;jk&gt;null&lt;/jk&gt; if the input was &lt;jk&gt;null&lt;/jk&gt;.<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    */<a name="line.276"></a>
+<span class="sourceLineNo">277</span>   public final String encodeTextInvalidChars(Object o) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (o == null)<a name="line.278"></a>
+<span class="sourceLineNo">279</span>         return null;<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      String s = toString(o);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      return XmlUtils.encodeInvalidCharsForText(s);<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>    * XML-encoded the specified element name using the {@link XmlUtils#encodeElementName(Object)} method.<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    *<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    * @param o The string being encoded.<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    * @return The encoded string.<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    */<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   public final String encodeElementName(Object o) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      String s = toString(o);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      return XmlUtils.encodeElementName(s);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html
index 483af2f..971d7ac 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html
@@ -79,8 +79,8 @@
 <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>   @Override /* Serializer */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.75"></a>
+<span class="sourceLineNo">074</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* JsonSerializer */<a name="line.78"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Readable.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Readable.html
index bb00271..cd32e5a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Readable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Readable.html
@@ -389,8 +389,8 @@
 <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>   @Override /* Serializer */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.385"></a>
+<span class="sourceLineNo">384</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* Serializer */<a name="line.388"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Simple.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Simple.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Simple.html
index bb00271..cd32e5a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Simple.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Simple.html
@@ -389,8 +389,8 @@
 <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>   @Override /* Serializer */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.385"></a>
+<span class="sourceLineNo">384</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* Serializer */<a name="line.388"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadable.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
index bb00271..cd32e5a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
@@ -389,8 +389,8 @@
 <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>   @Override /* Serializer */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.385"></a>
+<span class="sourceLineNo">384</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* Serializer */<a name="line.388"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
index bb00271..cd32e5a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
@@ -389,8 +389,8 @@
 <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>   @Override /* Serializer */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.385"></a>
+<span class="sourceLineNo">384</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* Serializer */<a name="line.388"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.html
index bb00271..cd32e5a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.html
@@ -389,8 +389,8 @@
 <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>   @Override /* Serializer */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.385"></a>
+<span class="sourceLineNo">384</span>   public JsonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      return new JsonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* Serializer */<a name="line.388"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
index 91029ad..66697a4 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
@@ -45,66 +45,68 @@
 <span class="sourceLineNo">037</span>    * Create a new session using properties specified in the context.<a name="line.37"></a>
 <span class="sourceLineNo">038</span>    *<a name="line.38"></a>
 <span class="sourceLineNo">039</span>    * @param ctx The context creating this session object.<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    * The context contains all the configuration settings for this object.<a name="line.40"></a>
+<span class="sourceLineNo">040</span>    *    The context contains all the configuration settings for this object.<a name="line.40"></a>
 <span class="sourceLineNo">041</span>    * @param output The output object.  See {@link JsonSerializerSession#getWriter()} for valid class types.<a name="line.41"></a>
 <span class="sourceLineNo">042</span>    * @param op The override properties.<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    * These override any context properties defined in the context.<a name="line.43"></a>
+<span class="sourceLineNo">043</span>    *    These override any context properties defined in the context.<a name="line.43"></a>
 <span class="sourceLineNo">044</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.44"></a>
 <span class="sourceLineNo">045</span>    * @param locale The session locale.<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.46"></a>
+<span class="sourceLineNo">046</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.46"></a>
 <span class="sourceLineNo">047</span>    * @param timeZone The session timezone.<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.48"></a>
+<span class="sourceLineNo">048</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.48"></a>
 <span class="sourceLineNo">049</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    */<a name="line.50"></a>
-<span class="sourceLineNo">051</span>   protected JsonSerializerSession(JsonSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      if (op == null || op.isEmpty()) {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>         simpleMode = ctx.simpleMode;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>         escapeSolidus = ctx.escapeSolidus;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      } else {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>         simpleMode = op.getBoolean(JSON_simpleMode, ctx.simpleMode);<a name="line.58"></a>
-<span class="sourceLineNo">059</span>         escapeSolidus = op.getBoolean(JSON_escapeSolidus, ctx.escapeSolidus);<a name="line.59"></a>
-<span class="sourceLineNo">060</span>         addBeanTypeProperties = op.getBoolean(JSON_addBeanTypeProperties, ctx.addBeanTypeProperties);<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      }<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>   /**<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    * Returns the {@link JsonSerializerContext#JSON_simpleMode} setting value for this session.<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    *<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    * @return The {@link JsonSerializerContext#JSON_simpleMode} setting value for this session.<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    */<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   public final boolean isSimpleMode() {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      return simpleMode;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   }<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>   /**<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    * Returns the {@link JsonSerializerContext#JSON_escapeSolidus} setting value for this session.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    *<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    * @return The {@link JsonSerializerContext#JSON_escapeSolidus} setting value for this session.<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    */<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   public final boolean isEscapeSolidus() {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      return escapeSolidus;<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 {@link JsonSerializerContext#JSON_addBeanTypeProperties} setting value for this session.<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    *<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    * @return The {@link JsonSerializerContext#JSON_addBeanTypeProperties} setting value for this session.<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   @Override /* SerializerSession */<a name="line.87"></a>
-<span class="sourceLineNo">088</span>   public final boolean isAddBeanTypeProperties() {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      return addBeanTypeProperties;<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>   @Override /* ParserSession */<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   public JsonWriter getWriter() throws Exception {<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      Object output = getOutput();<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      if (output instanceof JsonWriter)<a name="line.95"></a>
-<span class="sourceLineNo">096</span>         return (JsonWriter)output;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      return new JsonWriter(super.getWriter(), isUseWhitespace(), isEscapeSolidus(), getQuoteChar(), isSimpleMode(), isTrimStrings(), getRelativeUriBase(), getAbsolutePathUriBase());<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   }<a name="line.98"></a>
-<span class="sourceLineNo">099</span>}<a name="line.99"></a>
+<span class="sourceLineNo">050</span>    * @param uriContext The URI context.<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   protected JsonSerializerSession(JsonSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.54"></a>
+<span class="sourceLineNo">055</span>      if (op == null || op.isEmpty()) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>         simpleMode = ctx.simpleMode;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>         escapeSolidus = ctx.escapeSolidus;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      } else {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>         simpleMode = op.getBoolean(JSON_simpleMode, ctx.simpleMode);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>         escapeSolidus = op.getBoolean(JSON_escapeSolidus, ctx.escapeSolidus);<a name="line.61"></a>
+<span class="sourceLineNo">062</span>         addBeanTypeProperties = op.getBoolean(JSON_addBeanTypeProperties, ctx.addBeanTypeProperties);<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>   /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    * Returns the {@link JsonSerializerContext#JSON_simpleMode} setting value for this session.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    *<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    * @return The {@link JsonSerializerContext#JSON_simpleMode} setting value for this session.<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    */<a name="line.70"></a>
+<span class="sourceLineNo">071</span>   public final boolean isSimpleMode() {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      return simpleMode;<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>    * Returns the {@link JsonSerializerContext#JSON_escapeSolidus} setting value for this session.<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    *<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    * @return The {@link JsonSerializerContext#JSON_escapeSolidus} setting value for this session.<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    */<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   public final boolean isEscapeSolidus() {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      return escapeSolidus;<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>   /**<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    * Returns the {@link JsonSerializerContext#JSON_addBeanTypeProperties} setting value for this session.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    *<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    * @return The {@link JsonSerializerContext#JSON_addBeanTypeProperties} setting value for this session.<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    */<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   @Override /* SerializerSession */<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   public final boolean isAddBeanTypeProperties() {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      return addBeanTypeProperties;<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>   @Override /* ParserSession */<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   public JsonWriter getWriter() throws Exception {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      Object output = getOutput();<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      if (output instanceof JsonWriter)<a name="line.97"></a>
+<span class="sourceLineNo">098</span>         return (JsonWriter)output;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      return new JsonWriter(super.getWriter(), isUseWhitespace(), isEscapeSolidus(), getQuoteChar(), isSimpleMode(), isTrimStrings(), getRelativeUriBase(), getAbsolutePathUriBase(), getUriContext());<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>
 
 
 


[24/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 a9a7c71..b610721 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html
@@ -121,7 +121,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.31">SerializerWriter</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.32">SerializerWriter</a>
 extends <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></pre>
 <div class="block">Simple wrapper around a standard <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a> with additional methods.
  <p>
@@ -181,6 +181,12 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>protected <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#uriContext">uriContext</a></span></code>
+<div class="block">The URI context of the request.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>protected boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#useWhitespace">useWhitespace</a></span></code>
 <div class="block">Use-whitespace flag.</div>
@@ -208,12 +214,13 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <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/SerializerWriter.html#SerializerWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-">SerializerWriter</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>&nbsp;out,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#SerializerWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">SerializerWriter</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>&nbsp;out,
                 boolean&nbsp;useWhitespace,
                 boolean&nbsp;trimStrings,
                 char&nbsp;quoteChar,
                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;relativeUriBase,
-                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase)</code>&nbsp;</td>
+                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase,
+                <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -385,7 +392,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>out</h4>
-<pre>protected final&nbsp;<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> <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.34">out</a></pre>
+<pre>protected final&nbsp;<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> <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.35">out</a></pre>
 <div class="block">The underlying writer.</div>
 </li>
 </ul>
@@ -395,7 +402,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>useWhitespace</h4>
-<pre>protected final&nbsp;boolean <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.37">useWhitespace</a></pre>
+<pre>protected final&nbsp;boolean <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.38">useWhitespace</a></pre>
 <div class="block">Use-whitespace flag.</div>
 </li>
 </ul>
@@ -405,7 +412,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>trimStrings</h4>
-<pre>protected final&nbsp;boolean <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.40">trimStrings</a></pre>
+<pre>protected final&nbsp;boolean <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.41">trimStrings</a></pre>
 <div class="block">Trim strings flag.</div>
 </li>
 </ul>
@@ -415,7 +422,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>quoteChar</h4>
-<pre>protected final&nbsp;char <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.43">quoteChar</a></pre>
+<pre>protected final&nbsp;char <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.44">quoteChar</a></pre>
 <div class="block">The quote character being used by this writer.</div>
 </li>
 </ul>
@@ -425,20 +432,30 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>relativeUriBase</h4>
-<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.46">relativeUriBase</a></pre>
+<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.47">relativeUriBase</a></pre>
 <div class="block">The base (e.g. <js>https://localhost:9443/contextPath"</js>) for relative URIs (e.g. <js>"my/path"</js>).</div>
 </li>
 </ul>
 <a name="absolutePathUriBase">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>absolutePathUriBase</h4>
-<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.49">absolutePathUriBase</a></pre>
+<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.50">absolutePathUriBase</a></pre>
 <div class="block">The base (e.g. <js>https://localhost:9443"</js>) for relative URIs with absolute paths (e.g. <js>"/contextPath/my/path"</js>).</div>
 </li>
 </ul>
+<a name="uriContext">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>uriContext</h4>
+<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a> <a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.53">uriContext</a></pre>
+<div class="block">The URI context of the request. (i.e. the REST request URL broken down into authority/context/servlet/pathInfo parts.</div>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -447,26 +464,30 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SerializerWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-">
+<a name="SerializerWriter-java.io.Writer-boolean-boolean-char-java.lang.String-java.lang.String-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SerializerWriter</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.59">SerializerWriter</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>&nbsp;out,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.66">SerializerWriter</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>&nbsp;out,
                         boolean&nbsp;useWhitespace,
                         boolean&nbsp;trimStrings,
                         char&nbsp;quoteChar,
                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;relativeUriBase,
-                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase)</pre>
+                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;absolutePathUriBase,
+                        <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>out</code> - The writer being wrapped.</dd>
-<dd><code>useWhitespace</code> - If <jk>true</jk>, calling <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#cr-int-"><code>cr(int)</code></a> will create an indentation and calling <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#s--"><code>s()</code></a> will write a space character.</dd>
+<dd><code>useWhitespace</code> - If <jk>true</jk>, calling <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#cr-int-"><code>cr(int)</code></a> will create an indentation and calling
+   <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#s--"><code>s()</code></a> will write a space character.</dd>
 <dd><code>trimStrings</code> - If <jk>true</jk>, strings should be trimmed before they're serialized.</dd>
 <dd><code>quoteChar</code> - The character to write when <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#q--"><code>q()</code></a> is called.</dd>
 <dd><code>relativeUriBase</code> - The base (e.g. <js>https://localhost:9443/contextPath"</js>) for relative URIs (e.g. <js>"my/path"</js>).</dd>
 <dd><code>absolutePathUriBase</code> - The base (e.g. <js>https://localhost:9443"</js>) for relative URIs with absolute paths (e.g. <js>"/contextPath/my/path"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -484,7 +505,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>cr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.77">cr</a>(int&nbsp;depth)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.85">cr</a>(int&nbsp;depth)
                     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">Performs a carriage return.
  <p>
@@ -505,7 +526,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.92">appendln</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.100">appendln</a>(int&nbsp;indent,
                                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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">Writes an indent (if the <code>useWhitespace</code> setting is enabled), followed by text,
@@ -527,7 +548,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.103">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.111">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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">Writes the specified text followed by a newline (if the <code>useWhitespace</code> setting is enabled).</div>
 <dl>
@@ -546,7 +567,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.115">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.123">append</a>(int&nbsp;indent,
                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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">Writes an indent (if the <code>useWhitespace</code> setting is enabled), followed by text.</div>
@@ -567,7 +588,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.127">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.135">append</a>(int&nbsp;indent,
                                char&nbsp;c)
                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes an indent (if the <code>useWhitespace</code> setting is enabled), followed by text.</div>
@@ -588,7 +609,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>appendUri</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.165">appendUri</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>&nbsp;uri)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.173">appendUri</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>&nbsp;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">Appends the specified object as a URI.
  <p>
@@ -616,7 +637,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.190">append</a>(char[]&nbsp;characters)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.198">append</a>(char[]&nbsp;characters)
                         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">Appends the specified characters to this writer.</div>
 <dl>
@@ -635,7 +656,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>s</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.202">s</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.210">s</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">Adds a whitespace character to the output if the <code>useWhitespace</code> setting is enabled.</div>
 <dl>
@@ -652,7 +673,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>q</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.214">q</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.222">q</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">Adds the quote character specified by the <code>quoteChar</code> setting to the output.</div>
 <dl>
@@ -669,7 +690,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>i</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.226">i</a>(int&nbsp;indent)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.234">i</a>(int&nbsp;indent)
                    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">Writes an indent to the writer if the <code>useWhitespace</code> setting is enabled.</div>
 <dl>
@@ -688,7 +709,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>nl</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.239">nl</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.247">nl</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">Writes a newline to the writer if the <code>useWhitespace</code> setting is enabled.</div>
 <dl>
@@ -705,7 +726,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>nlIf</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.252">nlIf</a>(boolean&nbsp;b)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.260">nlIf</a>(boolean&nbsp;b)
                       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">Writes a newline to the writer if the <code>useWhitespace</code> setting is enabled and the boolean flag is true.</div>
 <dl>
@@ -724,7 +745,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.265">append</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>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.273">append</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>&nbsp;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">Writes the specified text to the writer.</div>
 <dl>
@@ -743,7 +764,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.277">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.285">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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">Writes the specified text to the writer.</div>
 <dl>
@@ -762,7 +783,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>appendIf</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.291">appendIf</a>(boolean&nbsp;b,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.299">appendIf</a>(boolean&nbsp;b,
                                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;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">Writes the specified text to the writer if b is true.</div>
@@ -783,7 +804,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>appendIf</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.305">appendIf</a>(boolean&nbsp;b,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.313">appendIf</a>(boolean&nbsp;b,
                                  char&nbsp;c)
                           throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes the specified text to the writer if b is true.</div>
@@ -804,7 +825,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.317">append</a>(char&nbsp;c)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.325">append</a>(char&nbsp;c)
                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -822,7 +843,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>write</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.323">write</a>(char[]&nbsp;cbuf,
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.331">write</a>(char[]&nbsp;cbuf,
                   int&nbsp;off,
                   int&nbsp;len)
            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>
@@ -840,7 +861,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>flush</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.328">flush</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.336">flush</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>
@@ -858,7 +879,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockListLast">
 <li class="blockList">
 <h4>close</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.333">close</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.341">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>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 df5ab6e..ce498e3 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/WriterSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/WriterSerializer.html
@@ -131,7 +131,7 @@ extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title
  This class is typically the parent class of all character-based serializers.
  It has 2 abstract methods to implement...
  <ul class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>
+   <li><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>
    <li><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-"><code>Serializer.doSerialize(SerializerSession, Object)</code></a>
  </ul>
 
@@ -232,7 +232,7 @@ extends <a href="../../../../org/apache/juneau/serializer/Serializer.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../../../org/apache/juneau/seriali
 zer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../..
 /../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</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/37ddf434/content/site/apidocs/org/apache/juneau/soap/SoapXmlSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/soap/SoapXmlSerializer.html b/content/site/apidocs/org/apache/juneau/soap/SoapXmlSerializer.html
index a2b24d6..e1184d9 100644
--- a/content/site/apidocs/org/apache/juneau/soap/SoapXmlSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/soap/SoapXmlSerializer.html
@@ -244,7 +244,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.xml.<a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>, <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnythin
 g</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">
@@ -327,7 +327,7 @@ extends <a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml">XmlSerializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/uon/UonParserContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonParserContext.html b/content/site/apidocs/org/apache/juneau/uon/UonParserContext.html
index b711db5..0335319 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonParserContext.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonParserContext.html
@@ -227,7 +227,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserContext.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Encoding.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Encoding.html b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Encoding.html
index c4f0931..42963b6 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Encoding.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Encoding.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="cl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Readable.html b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Readable.html
index 21e7656..cc4a353 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Readable.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Readable.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="cl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/uon/UonSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.html b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.html
index 09f2703..38d233b 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.html
@@ -345,12 +345,13 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -526,7 +527,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 </dl>
 </li>
 </ul>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -537,15 +538,16 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
                                           <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>&nbsp;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>&nbsp;locale,
                                           <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>&nbsp;timeZone,
-                                          <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">Serializer</a></code></span></div>
+                                          <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                          <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">Serializer</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
    it's going to be a subclass of <a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><code>SerializerSession</code></a>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>output</code> - The output object.
    <br>Character-based serializers can handle the following output class types:
@@ -568,6 +570,8 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>
@@ -590,7 +594,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/uon/UonSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonSerializerContext.html b/content/site/apidocs/org/apache/juneau/uon/UonSerializerContext.html
index 52c128d..2e9cf4f 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonSerializerContext.html
@@ -233,7 +233,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 a3f04ac..b1abb3f 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html
@@ -167,14 +167,15 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonSerializerSession.html#UonSerializerSession-org.apache.juneau.uon.UonSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">UonSerializerSession</a></span>(<a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" title="class in org.apache.juneau.uon">UonSerializerContext</a>&nbsp;ctx,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonSerializerSession.html#UonSerializerSession-org.apache.juneau.uon.UonSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">UonSerializerSession</a></span>(<a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" title="class in org.apache.juneau.uon">UonSerializerContext</a>&nbsp;ctx,
                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>&nbsp;encode,
                     <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                     <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>&nbsp;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>&nbsp;locale,
                     <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>&nbsp;timeZone,
-                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                    <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create a new session using properties specified in the context.</div>
 </td>
 </tr>
@@ -217,7 +218,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#
 isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCurrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Co
 llection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#addBeanGetterWarning-org.apache.juneau.BeanPropertyMeta-java.lang.Throwable-">addBeanGetterWarning</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#canIgnoreValue-org.apache.juneau.ClassMeta-java.lang.String-java.lang.Object-">canIgnoreValue</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#close--">close</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#createBeanTypeNameProperty-org.apache.juneau.BeanMap-java.lang.String-">createBeanTypeNameProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#generalize-java.lang.Object-org.apache.juneau.ClassMeta-">generalize</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getAbsolutePathUriBase--">getAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getBeanTypeName-org.apach
 e.juneau.ClassMeta-org.apache.juneau.ClassMeta-org.apache.juneau.BeanPropertyMeta-">getBeanTypeName</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getExpectedRootType-java.lang.Object-">getExpectedRootType</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getIndent--">getIndent</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getInitialDepth--">getInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getJavaMethod--">getJavaMethod</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getLastLocation--">getLastLocation</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getMaxDepth--">getMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutput--">getOutput</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getOutputStream--">getOutputStream</a>, 
 <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getQuoteChar--">getQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getRelativeUriBase--">getRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getUriContext--">getUriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isIgnoreRecursions--">isIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortCollections--">isSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isSortMaps--">isSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimEmptyCollections--">isTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTr
 imEmptyMaps--">isTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimNulls--">isTrimNulls</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--">isTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#isUseWhitespace--">isUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#pop--">pop</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#push-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">push</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.String-">resolveUri</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentClass-org.apache.juneau.ClassMeta-">setCurrentClass</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#setCurrentProperty-org.apache.juneau.BeanPropertyMeta-">setCu
 rrentProperty</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Collection-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#sort-java.util.Map-">sort</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#toString-java.lang.Object-">toString</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#trim-java.lang.Object-">trim</a>, <a href="../../../../org/apache/juneau/serializer/SerializerSession.html#willRecurse-java.lang.String-java.lang.Object-org.apache.juneau.ClassMeta-">willRecurse</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.BeanSession">
@@ -254,35 +255,38 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="UonSerializerSession-org.apache.juneau.uon.UonSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="UonSerializerSession-org.apache.juneau.uon.UonSerializerContext-java.lang.Boolean-org.apache.juneau.ObjectMap-java.lang.Object-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>UonSerializerSession</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.53">UonSerializerSession</a>(<a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" title="class in org.apache.juneau.uon">UonSerializerContext</a>&nbsp;ctx,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.55">UonSerializerSession</a>(<a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" title="class in org.apache.juneau.uon">UonSerializerContext</a>&nbsp;ctx,
                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>&nbsp;encode,
                                <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;op,
                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output,
                                <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>&nbsp;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>&nbsp;locale,
                                <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>&nbsp;timeZone,
-                               <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
+                               <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                               <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>ctx</code> - The context creating this session object.
- The context contains all the configuration settings for this object.</dd>
+   The context contains all the configuration settings for this object.</dd>
 <dd><code>encode</code> - Override the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_encodeChars"><code>UonSerializerContext.UON_encodeChars</code></a> setting.</dd>
 <dd><code>output</code> - The output object.  See <a href="../../../../org/apache/juneau/json/JsonSerializerSession.html#getWriter--"><code>JsonSerializerSession.getWriter()</code></a> for valid class types.</dd>
 <dd><code>op</code> - The override properties.
- These override any context properties defined in the context.</dd>
+   These override any context properties defined in the context.</dd>
 <dd><code>javaMethod</code> - The java method that called this serializer, usually the method in a REST servlet.</dd>
 <dd><code>locale</code> - The session locale.
- If <jk>null</jk>, then the locale defined on the context is used.</dd>
+   If <jk>null</jk>, then the locale defined on the context is used.</dd>
 <dd><code>timeZone</code> - The session timezone.
- If <jk>null</jk>, then the timezone defined on the context is used.</dd>
+   If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 </dl>
 </li>
 </ul>
@@ -300,7 +304,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isEncodeChars</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.69">isEncodeChars</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.71">isEncodeChars</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_encodeChars"><code>UonSerializerContext.UON_encodeChars</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -314,7 +318,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddBeanTypeProperties</h4>
-<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.79">isAddBeanTypeProperties</a>()</pre>
+<pre>public final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.81">isAddBeanTypeProperties</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_addBeanTypeProperties"><code>UonSerializerContext.UON_addBeanTypeProperties</code></a> setting value for this session.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -330,7 +334,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getWriter</h4>
-<pre>public final&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.84">getWriter</a>()
+<pre>public final&nbsp;<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.86">getWriter</a>()
                           throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">SerializerSession</a></code></span></div>
 <div class="block">Wraps the specified output object inside a writer.


[03/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
index 4c30f4e..9615c0a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
@@ -22,255 +22,258 @@
 <span class="sourceLineNo">014</span><a name="line.14"></a>
 <span class="sourceLineNo">015</span>import java.io.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.internal.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.serializer.*;<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> * Specialized writer for serializing UON-encoded text.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * &lt;p&gt;<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;ul&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *    &lt;li&gt;This class is not intended for external use.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * &lt;/ul&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> */<a name="line.27"></a>
-<span class="sourceLineNo">028</span>public final class UonWriter extends SerializerWriter {<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>   private final UonSerializerSession session;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>   private final boolean encodeChars;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>   // Characters that do not need to be URL-encoded in strings.<a name="line.33"></a>
-<span class="sourceLineNo">034</span>   private static final AsciiSet unencodedChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/?:@-_.!*'$(),~=");<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>   // Characters that do not need to be URL-encoded in attribute names.<a name="line.36"></a>
-<span class="sourceLineNo">037</span>   // Identical to unencodedChars, but excludes '='.<a name="line.37"></a>
-<span class="sourceLineNo">038</span>   private static final AsciiSet unencodedCharsAttrName = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/?:@-_.!*'$(),~");<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>   // Characters that need to be preceeded with an escape character.<a name="line.40"></a>
-<span class="sourceLineNo">041</span>   private static final AsciiSet escapedChars = new AsciiSet("~'");<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>   private static final AsciiSet noChars = new AsciiSet("");<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>   private static char[] hexArray = "0123456789ABCDEF".toCharArray();<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>    * Constructor.<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    *<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    * @param session The session that created this writer.<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    * @param out The writer being wrapped.<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt;, tabs will be used in output.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    * @param encodeChars If &lt;jk&gt;true&lt;/jk&gt;, special characters should be encoded.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings should be trimmed before they're serialized.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    * @param relativeUriBase The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;).<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    * @param absolutePathUriBase The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;).<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    */<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   protected UonWriter(UonSerializerSession session, Writer out, boolean useWhitespace, boolean encodeChars, boolean trimStrings, String relativeUriBase, String absolutePathUriBase) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>      super(out, useWhitespace, trimStrings, '\'', relativeUriBase, absolutePathUriBase);<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      this.session = session;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      this.encodeChars = encodeChars;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   }<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>    * Serializes the specified simple object as a UON string value.<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    *<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    * @param o The object being serialized.<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    * @param isTopAttrName If this is a top-level attribute name we're serializing.<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    * @param plainTextParams This is a top-level name or parameter we're serializing and the parameter format is PLAINTEXT.<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    * @return This object (for method chaining).<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    * @throws IOException Should never happen.<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    */<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   public final UonWriter appendObject(Object o, boolean isTopAttrName, boolean plainTextParams) throws IOException {<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>      if (o instanceof Boolean)<a name="line.75"></a>
-<span class="sourceLineNo">076</span>         return appendBoolean(o);<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      if (o instanceof Number)<a name="line.77"></a>
-<span class="sourceLineNo">078</span>         return appendNumber(o);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      if (o == null)<a name="line.79"></a>
-<span class="sourceLineNo">080</span>         return append("null");<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>      String s = session.toString(o);<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>      boolean needsQuotes = (! plainTextParams) &amp;&amp; UonUtils.needsQuotes(s);<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>      AsciiSet unenc = (isTopAttrName ? unencodedCharsAttrName : unencodedChars);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      AsciiSet esc = plainTextParams ? noChars : escapedChars;<a name="line.87"></a>
+<span class="sourceLineNo">017</span>import org.apache.juneau.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.internal.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.serializer.*;<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> * Specialized writer for serializing UON-encoded text.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * &lt;p&gt;<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * &lt;ul&gt;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *    &lt;li&gt;This class is not intended for external use.<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * &lt;/ul&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> */<a name="line.28"></a>
+<span class="sourceLineNo">029</span>public final class UonWriter extends SerializerWriter {<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>   private final UonSerializerSession session;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>   private final boolean encodeChars;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>   // Characters that do not need to be URL-encoded in strings.<a name="line.34"></a>
+<span class="sourceLineNo">035</span>   private static final AsciiSet unencodedChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/?:@-_.!*'$(),~=");<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>   // Characters that do not need to be URL-encoded in attribute names.<a name="line.37"></a>
+<span class="sourceLineNo">038</span>   // Identical to unencodedChars, but excludes '='.<a name="line.38"></a>
+<span class="sourceLineNo">039</span>   private static final AsciiSet unencodedCharsAttrName = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/?:@-_.!*'$(),~");<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>   // Characters that need to be preceeded with an escape character.<a name="line.41"></a>
+<span class="sourceLineNo">042</span>   private static final AsciiSet escapedChars = new AsciiSet("~'");<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>   private static final AsciiSet noChars = new AsciiSet("");<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>   private static char[] hexArray = "0123456789ABCDEF".toCharArray();<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>   /**<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    * Constructor.<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    *<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    * @param session The session that created this writer.<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    * @param out The writer being wrapped.<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt;, tabs will be used in output.<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    * @param encodeChars If &lt;jk&gt;true&lt;/jk&gt;, special characters should be encoded.<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings should be trimmed before they're serialized.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    * @param relativeUriBase The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;).<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    * @param absolutePathUriBase The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;).<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    * @param uriContext The URI context.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    */<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   protected UonWriter(UonSerializerSession session, Writer out, boolean useWhitespace, boolean encodeChars, boolean trimStrings, String relativeUriBase, String absolutePathUriBase, UriContext uriContext) {<a name="line.61"></a>
+<span class="sourceLineNo">062</span>      super(out, useWhitespace, trimStrings, '\'', relativeUriBase, absolutePathUriBase, uriContext);<a name="line.62"></a>
+<span class="sourceLineNo">063</span>      this.session = session;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      this.encodeChars = encodeChars;<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>   /**<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    * Serializes the specified simple object as a UON string value.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    *<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    * @param o The object being serialized.<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    * @param isTopAttrName If this is a top-level attribute name we're serializing.<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    * @param plainTextParams This is a top-level name or parameter we're serializing and the parameter format is PLAINTEXT.<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    * @return This object (for method chaining).<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    * @throws IOException Should never happen.<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    */<a name="line.75"></a>
+<span class="sourceLineNo">076</span>   public final UonWriter appendObject(Object o, boolean isTopAttrName, boolean plainTextParams) throws IOException {<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>      if (o instanceof Boolean)<a name="line.78"></a>
+<span class="sourceLineNo">079</span>         return appendBoolean(o);<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      if (o instanceof Number)<a name="line.80"></a>
+<span class="sourceLineNo">081</span>         return appendNumber(o);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      if (o == null)<a name="line.82"></a>
+<span class="sourceLineNo">083</span>         return append("null");<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>      String s = session.toString(o);<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>      boolean needsQuotes = (! plainTextParams) &amp;&amp; UonUtils.needsQuotes(s);<a name="line.87"></a>
 <span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>      if (needsQuotes)<a name="line.89"></a>
-<span class="sourceLineNo">090</span>         append('\'');<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>         char c = s.charAt(i);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>         if (esc.contains(c))<a name="line.93"></a>
-<span class="sourceLineNo">094</span>            append('~');<a name="line.94"></a>
-<span class="sourceLineNo">095</span>         if ((!encodeChars) || unenc.contains(c))<a name="line.95"></a>
-<span class="sourceLineNo">096</span>            append(c);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>         else {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>            if (c == ' ')<a name="line.98"></a>
-<span class="sourceLineNo">099</span>               append('+');<a name="line.99"></a>
-<span class="sourceLineNo">100</span>            else {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>               int p = s.codePointAt(i);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>               if (p &lt; 0x0080)<a name="line.102"></a>
-<span class="sourceLineNo">103</span>                  appendHex(p);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>               else if (p &lt; 0x0800) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>                  int p1=p&gt;&gt;&gt;6;<a name="line.105"></a>
-<span class="sourceLineNo">106</span>                  appendHex(p1+192).appendHex((p&amp;63)+128);<a name="line.106"></a>
-<span class="sourceLineNo">107</span>               } else if (p &lt; 0x10000) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>                  int p1=p&gt;&gt;&gt;6, p2=p1&gt;&gt;&gt;6;<a name="line.108"></a>
-<span class="sourceLineNo">109</span>                  appendHex(p2+224).appendHex((p1&amp;63)+128).appendHex((p&amp;63)+128);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>               } else {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>                  i++;  // Two-byte codepoint...skip past surrogate pair lower byte.<a name="line.111"></a>
-<span class="sourceLineNo">112</span>                  int p1=p&gt;&gt;&gt;6, p2=p1&gt;&gt;&gt;6, p3=p2&gt;&gt;&gt;6;<a name="line.112"></a>
-<span class="sourceLineNo">113</span>                  appendHex(p3+240).appendHex((p2&amp;63)+128).appendHex((p1&amp;63)+128).appendHex((p&amp;63)+128);<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>         }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      if (needsQuotes)<a name="line.118"></a>
-<span class="sourceLineNo">119</span>         append('\'');<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>      return this;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   }<a name="line.122"></a>
+<span class="sourceLineNo">089</span>      AsciiSet unenc = (isTopAttrName ? unencodedCharsAttrName : unencodedChars);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      AsciiSet esc = plainTextParams ? noChars : escapedChars;<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>      if (needsQuotes)<a name="line.92"></a>
+<span class="sourceLineNo">093</span>         append('\'');<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>         char c = s.charAt(i);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>         if (esc.contains(c))<a name="line.96"></a>
+<span class="sourceLineNo">097</span>            append('~');<a name="line.97"></a>
+<span class="sourceLineNo">098</span>         if ((!encodeChars) || unenc.contains(c))<a name="line.98"></a>
+<span class="sourceLineNo">099</span>            append(c);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>         else {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>            if (c == ' ')<a name="line.101"></a>
+<span class="sourceLineNo">102</span>               append('+');<a name="line.102"></a>
+<span class="sourceLineNo">103</span>            else {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>               int p = s.codePointAt(i);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>               if (p &lt; 0x0080)<a name="line.105"></a>
+<span class="sourceLineNo">106</span>                  appendHex(p);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>               else if (p &lt; 0x0800) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>                  int p1=p&gt;&gt;&gt;6;<a name="line.108"></a>
+<span class="sourceLineNo">109</span>                  appendHex(p1+192).appendHex((p&amp;63)+128);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>               } else if (p &lt; 0x10000) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>                  int p1=p&gt;&gt;&gt;6, p2=p1&gt;&gt;&gt;6;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>                  appendHex(p2+224).appendHex((p1&amp;63)+128).appendHex((p&amp;63)+128);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>               } else {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>                  i++;  // Two-byte codepoint...skip past surrogate pair lower byte.<a name="line.114"></a>
+<span class="sourceLineNo">115</span>                  int p1=p&gt;&gt;&gt;6, p2=p1&gt;&gt;&gt;6, p3=p2&gt;&gt;&gt;6;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>                  appendHex(p3+240).appendHex((p2&amp;63)+128).appendHex((p1&amp;63)+128).appendHex((p&amp;63)+128);<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>         }<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      }<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      if (needsQuotes)<a name="line.121"></a>
+<span class="sourceLineNo">122</span>         append('\'');<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>    * Appends a boolean value to the output.<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    *<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * @param o The boolean value to append to the output.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    * @return This object (for method chaining).<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    * @throws IOException<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    */<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   protected UonWriter appendBoolean(Object o) throws IOException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      append(o.toString());<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      return this;<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>    * Appends a numeric value to the output.<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    *<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    * @param o The numeric value to append to the output.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    * @return This object (for method chaining).<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>   protected UonWriter appendNumber(Object o) throws IOException {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      append(o.toString());<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      return this;<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>   /**<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    * Prints out a two-byte %xx sequence for the given byte value.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    */<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   private UonWriter appendHex(int b) throws IOException {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      if (b &gt; 255)<a name="line.152"></a>
-<span class="sourceLineNo">153</span>         throw new IOException("Invalid value passed to appendHex.  Must be in the range 0-255.  Value=" + b);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      append('%').append(hexArray[b&gt;&gt;&gt;4]).append(hexArray[b&amp;0x0F]);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      return this;<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>    * Appends a URI to the output.<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    *<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    * @param uri The URI to append to the output.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    * @return This object (for method chaining).<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    * @throws IOException<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    */<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   @Override<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   public SerializerWriter appendUri(Object uri) throws IOException {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      String s = uri.toString();<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      if (s.indexOf("://") == -1) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>         if (StringUtils.startsWith(s, '/')) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>            if (absolutePathUriBase != null)<a name="line.170"></a>
-<span class="sourceLineNo">171</span>               append(absolutePathUriBase);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>         } else {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>            if (relativeUriBase != null) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>               append(relativeUriBase);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>               if (! relativeUriBase.equals("/"))<a name="line.175"></a>
-<span class="sourceLineNo">176</span>                  append("/");<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>      return appendObject(s, false, false);<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><a name="line.183"></a>
-<span class="sourceLineNo">184</span>   //--------------------------------------------------------------------------------<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   // Overridden methods<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>   @Override /* SerializerWriter */<a name="line.188"></a>
-<span class="sourceLineNo">189</span>   public UonWriter cr(int depth) throws IOException {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      super.cr(depth);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   public UonWriter appendln(int indent, String text) throws IOException {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      super.appendln(indent, text);<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>   @Override /* SerializerWriter */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   public UonWriter appendln(String text) throws IOException {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      super.appendln(text);<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      return this;<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>   @Override /* SerializerWriter */<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   public UonWriter append(int indent, String text) throws IOException {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      super.append(indent, text);<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>   @Override /* SerializerWriter */<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   public UonWriter append(int indent, char c) throws IOException {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      super.append(indent, c);<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>   @Override /* SerializerWriter */<a name="line.218"></a>
-<span class="sourceLineNo">219</span>   public UonWriter q() throws IOException {<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      super.q();<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.224"></a>
-<span class="sourceLineNo">225</span>   public UonWriter i(int indent) throws IOException {<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      super.i(indent);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   public UonWriter nl() throws IOException {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      super.nl();<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   public UonWriter append(Object text) throws IOException {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      super.append(text);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   public UonWriter append(String text) throws IOException {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      super.append(text);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      return this;<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 /* SerializerWriter */<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   public UonWriter appendIf(boolean b, String text) throws IOException {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      super.appendIf(b, text);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   public UonWriter appendIf(boolean b, char c) throws IOException {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      super.appendIf(b, c);<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>   @Override /* SerializerWriter */<a name="line.260"></a>
-<span class="sourceLineNo">261</span>   public UonWriter append(char c) throws IOException {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      super.append(c);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      return this;<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">124</span>      return this;<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>    * Appends a boolean value to the output.<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    *<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    * @param o The boolean value to append to the output.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    * @return This object (for method chaining).<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    * @throws IOException<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    */<a name="line.133"></a>
+<span class="sourceLineNo">134</span>   protected UonWriter appendBoolean(Object o) throws IOException {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      append(o.toString());<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      return this;<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>    * Appends a numeric value to the output.<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    *<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    * @param o The numeric value to append to the output.<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    * @return This object (for method chaining).<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    * @throws IOException<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    */<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   protected UonWriter appendNumber(Object o) throws IOException {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      append(o.toString());<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      return this;<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>    * Prints out a two-byte %xx sequence for the given byte value.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    */<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   private UonWriter appendHex(int b) throws IOException {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      if (b &gt; 255)<a name="line.155"></a>
+<span class="sourceLineNo">156</span>         throw new IOException("Invalid value passed to appendHex.  Must be in the range 0-255.  Value=" + b);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      append('%').append(hexArray[b&gt;&gt;&gt;4]).append(hexArray[b&amp;0x0F]);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      return this;<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>   /**<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    * Appends a URI to the output.<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    *<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    * @param uri The URI to append to the output.<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    * @return This object (for method chaining).<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    * @throws IOException<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    */<a name="line.167"></a>
+<span class="sourceLineNo">168</span>   @Override<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   public SerializerWriter appendUri(Object uri) throws IOException {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      String s = uri.toString();<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      if (s.indexOf("://") == -1) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>         if (StringUtils.startsWith(s, '/')) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>            if (absolutePathUriBase != null)<a name="line.173"></a>
+<span class="sourceLineNo">174</span>               append(absolutePathUriBase);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>         } else {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>            if (relativeUriBase != null) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>               append(relativeUriBase);<a name="line.177"></a>
+<span class="sourceLineNo">178</span>               if (! relativeUriBase.equals("/"))<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                  append("/");<a name="line.179"></a>
+<span class="sourceLineNo">180</span>            }<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>      return appendObject(s, false, false);<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>   //--------------------------------------------------------------------------------<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   // Overridden methods<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>   @Override /* SerializerWriter */<a name="line.191"></a>
+<span class="sourceLineNo">192</span>   public UonWriter cr(int depth) throws IOException {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      super.cr(depth);<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      return this;<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span>   @Override /* SerializerWriter */<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   public UonWriter appendln(int indent, String text) throws IOException {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      super.appendln(indent, text);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   public UonWriter appendln(String text) throws IOException {<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      super.appendln(text);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      return this;<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 /* SerializerWriter */<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   public UonWriter append(int indent, String text) throws IOException {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      super.append(indent, text);<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>   @Override /* SerializerWriter */<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   public UonWriter append(int indent, char c) throws IOException {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      super.append(indent, c);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      return this;<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 /* SerializerWriter */<a name="line.221"></a>
+<span class="sourceLineNo">222</span>   public UonWriter q() throws IOException {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      super.q();<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   public UonWriter i(int indent) throws IOException {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      super.i(indent);<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   public UonWriter nl() throws IOException {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      super.nl();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.239"></a>
+<span class="sourceLineNo">240</span>   public UonWriter append(Object text) throws IOException {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      super.append(text);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   public UonWriter append(String text) throws IOException {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      super.append(text);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      return this;<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>   @Override /* SerializerWriter */<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   public UonWriter appendIf(boolean b, String text) throws IOException {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      super.appendIf(b, text);<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>   @Override /* SerializerWriter */<a name="line.257"></a>
+<span class="sourceLineNo">258</span>   public UonWriter appendIf(boolean b, char c) throws IOException {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      super.appendIf(b, c);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   public UonWriter append(char c) throws IOException {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      super.append(c);<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      return this;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
index c7cf0f9..1557a76 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
@@ -420,7 +420,7 @@
 <span class="sourceLineNo">412</span>         }<a name="line.412"></a>
 <span class="sourceLineNo">413</span><a name="line.413"></a>
 <span class="sourceLineNo">414</span>         StringWriter w = new StringWriter();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON);<a name="line.415"></a>
+<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.415"></a>
 <span class="sourceLineNo">416</span>         super.doSerialize(s, o);<a name="line.416"></a>
 <span class="sourceLineNo">417</span>         return w.toString();<a name="line.417"></a>
 <span class="sourceLineNo">418</span>      } catch (Exception e) {<a name="line.418"></a>
@@ -434,8 +434,8 @@
 <span class="sourceLineNo">426</span>   //--------------------------------------------------------------------------------<a name="line.426"></a>
 <span class="sourceLineNo">427</span><a name="line.427"></a>
 <span class="sourceLineNo">428</span>   @Override /* Serializer */<a name="line.428"></a>
-<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.430"></a>
+<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.430"></a>
 <span class="sourceLineNo">431</span>   }<a name="line.431"></a>
 <span class="sourceLineNo">432</span><a name="line.432"></a>
 <span class="sourceLineNo">433</span>   @Override /* Serializer */<a name="line.433"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
index c7cf0f9..1557a76 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
@@ -420,7 +420,7 @@
 <span class="sourceLineNo">412</span>         }<a name="line.412"></a>
 <span class="sourceLineNo">413</span><a name="line.413"></a>
 <span class="sourceLineNo">414</span>         StringWriter w = new StringWriter();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON);<a name="line.415"></a>
+<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.415"></a>
 <span class="sourceLineNo">416</span>         super.doSerialize(s, o);<a name="line.416"></a>
 <span class="sourceLineNo">417</span>         return w.toString();<a name="line.417"></a>
 <span class="sourceLineNo">418</span>      } catch (Exception e) {<a name="line.418"></a>
@@ -434,8 +434,8 @@
 <span class="sourceLineNo">426</span>   //--------------------------------------------------------------------------------<a name="line.426"></a>
 <span class="sourceLineNo">427</span><a name="line.427"></a>
 <span class="sourceLineNo">428</span>   @Override /* Serializer */<a name="line.428"></a>
-<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.430"></a>
+<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.430"></a>
 <span class="sourceLineNo">431</span>   }<a name="line.431"></a>
 <span class="sourceLineNo">432</span><a name="line.432"></a>
 <span class="sourceLineNo">433</span>   @Override /* Serializer */<a name="line.433"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
index c7cf0f9..1557a76 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
@@ -420,7 +420,7 @@
 <span class="sourceLineNo">412</span>         }<a name="line.412"></a>
 <span class="sourceLineNo">413</span><a name="line.413"></a>
 <span class="sourceLineNo">414</span>         StringWriter w = new StringWriter();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON);<a name="line.415"></a>
+<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.415"></a>
 <span class="sourceLineNo">416</span>         super.doSerialize(s, o);<a name="line.416"></a>
 <span class="sourceLineNo">417</span>         return w.toString();<a name="line.417"></a>
 <span class="sourceLineNo">418</span>      } catch (Exception e) {<a name="line.418"></a>
@@ -434,8 +434,8 @@
 <span class="sourceLineNo">426</span>   //--------------------------------------------------------------------------------<a name="line.426"></a>
 <span class="sourceLineNo">427</span><a name="line.427"></a>
 <span class="sourceLineNo">428</span>   @Override /* Serializer */<a name="line.428"></a>
-<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.430"></a>
+<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.430"></a>
 <span class="sourceLineNo">431</span>   }<a name="line.431"></a>
 <span class="sourceLineNo">432</span><a name="line.432"></a>
 <span class="sourceLineNo">433</span>   @Override /* Serializer */<a name="line.433"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
index 0b96df7..d11761c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
@@ -41,71 +41,73 @@
 <span class="sourceLineNo">033</span>    * Create a new session using properties specified in the context.<a name="line.33"></a>
 <span class="sourceLineNo">034</span>    *<a name="line.34"></a>
 <span class="sourceLineNo">035</span>    * @param ctx The context creating this session object.<a name="line.35"></a>
-<span class="sourceLineNo">036</span>    * The context contains all the configuration settings for this object.<a name="line.36"></a>
+<span class="sourceLineNo">036</span>    *    The context contains all the configuration settings for this object.<a name="line.36"></a>
 <span class="sourceLineNo">037</span>    * @param encode Overrides the {@link UonSerializerContext#UON_encodeChars} setting.<a name="line.37"></a>
 <span class="sourceLineNo">038</span>    * @param output The output object.  See {@link JsonSerializerSession#getWriter()} for valid class types.<a name="line.38"></a>
 <span class="sourceLineNo">039</span>    * @param op The override properties.<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    * These override any context properties defined in the context.<a name="line.40"></a>
+<span class="sourceLineNo">040</span>    *    These override any context properties defined in the context.<a name="line.40"></a>
 <span class="sourceLineNo">041</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.41"></a>
 <span class="sourceLineNo">042</span>    * @param locale The session locale.<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.43"></a>
+<span class="sourceLineNo">043</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.43"></a>
 <span class="sourceLineNo">044</span>    * @param timeZone The session timezone.<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.45"></a>
+<span class="sourceLineNo">045</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.45"></a>
 <span class="sourceLineNo">046</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    */<a name="line.47"></a>
-<span class="sourceLineNo">048</span>   public UrlEncodingSerializerSession(UrlEncodingSerializerContext ctx, Boolean encode, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.48"></a>
-<span class="sourceLineNo">049</span>      super(ctx, encode, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.49"></a>
-<span class="sourceLineNo">050</span>      if (op == null || op.isEmpty()) {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>         expandedParams = ctx.expandedParams;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>         plainTextParams = ctx.plainTextParams;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      } else {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>         expandedParams = op.getBoolean(UrlEncodingContext.URLENC_expandedParams, false);<a name="line.54"></a>
-<span class="sourceLineNo">055</span>         plainTextParams = op.getString(UrlEncodingSerializerContext.URLENC_paramFormat, "UON").equals("PLAINTEXT");<a name="line.55"></a>
-<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><a name="line.58"></a>
-<span class="sourceLineNo">059</span>   /**<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified bean property should be expanded as multiple key-value pairs.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    *<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * @param pMeta The metadata on the bean property.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified bean property should be expanded as multiple key-value pairs.<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    */<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   public final boolean shouldUseExpandedParams(BeanPropertyMeta pMeta) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      ClassMeta&lt;?&gt; cm = pMeta.getClassMeta();<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      if (cm.isCollectionOrArray()) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>         if (expandedParams)<a name="line.68"></a>
-<span class="sourceLineNo">069</span>            return true;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>         if (pMeta.getBeanMeta().getClassMeta().getExtendedMeta(UrlEncodingClassMeta.class).isExpandedParams())<a name="line.70"></a>
+<span class="sourceLineNo">047</span>    * @param uriContext The URI context.<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   public UrlEncodingSerializerSession(UrlEncodingSerializerContext ctx, Boolean encode, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      super(ctx, encode, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.51"></a>
+<span class="sourceLineNo">052</span>      if (op == null || op.isEmpty()) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>         expandedParams = ctx.expandedParams;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>         plainTextParams = ctx.plainTextParams;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>      } else {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>         expandedParams = op.getBoolean(UrlEncodingContext.URLENC_expandedParams, false);<a name="line.56"></a>
+<span class="sourceLineNo">057</span>         plainTextParams = op.getString(UrlEncodingSerializerContext.URLENC_paramFormat, "UON").equals("PLAINTEXT");<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>   /**<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified bean property should be expanded as multiple key-value pairs.<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    *<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    * @param pMeta The metadata on the bean property.<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified bean property should be expanded as multiple key-value pairs.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    */<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   public final boolean shouldUseExpandedParams(BeanPropertyMeta pMeta) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      ClassMeta&lt;?&gt; cm = pMeta.getClassMeta();<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      if (cm.isCollectionOrArray()) {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>         if (expandedParams)<a name="line.70"></a>
 <span class="sourceLineNo">071</span>            return true;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      }<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      return false;<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified value should be represented as an expanded parameter list.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    *<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    * @param value The value to check.<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified value should be represented as an expanded parameter list.<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   public final boolean shouldUseExpandedParams(Object value) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      if (value == null || ! expandedParams)<a name="line.83"></a>
-<span class="sourceLineNo">084</span>         return false;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      ClassMeta&lt;?&gt; cm = getClassMetaForObject(value).getSerializedClassMeta();<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      if (cm.isCollectionOrArray()) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>         if (expandedParams)<a name="line.87"></a>
-<span class="sourceLineNo">088</span>            return true;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      }<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      return false;<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>   /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the {@link UrlEncodingSerializerContext#URLENC_paramFormat} is &lt;js&gt;"PLAINTEXT"&lt;/js&gt;.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the {@link UrlEncodingSerializerContext#URLENC_paramFormat} is &lt;js&gt;"PLAINTEXT"&lt;/js&gt;.<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    */<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   protected boolean plainTextParams() {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      return plainTextParams;<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">072</span>         if (pMeta.getBeanMeta().getClassMeta().getExtendedMeta(UrlEncodingClassMeta.class).isExpandedParams())<a name="line.72"></a>
+<span class="sourceLineNo">073</span>            return true;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      }<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      return false;<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified value should be represented as an expanded parameter list.<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    *<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    * @param value The value to check.<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified value should be represented as an expanded parameter list.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    */<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   public final boolean shouldUseExpandedParams(Object value) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      if (value == null || ! expandedParams)<a name="line.85"></a>
+<span class="sourceLineNo">086</span>         return false;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      ClassMeta&lt;?&gt; cm = getClassMetaForObject(value).getSerializedClassMeta();<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      if (cm.isCollectionOrArray()) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>         if (expandedParams)<a name="line.89"></a>
+<span class="sourceLineNo">090</span>            return true;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      }<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      return false;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>   /**<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the {@link UrlEncodingSerializerContext#URLENC_paramFormat} is &lt;js&gt;"PLAINTEXT"&lt;/js&gt;.<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the {@link UrlEncodingSerializerContext#URLENC_paramFormat} is &lt;js&gt;"PLAINTEXT"&lt;/js&gt;.<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    */<a name="line.98"></a>
+<span class="sourceLineNo">099</span>   protected boolean plainTextParams() {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      return plainTextParams;<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>}<a name="line.102"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializer.html
index 6824037..90077d8 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializer.html
@@ -103,7 +103,7 @@
 <span class="sourceLineNo">095</span>   /**<a name="line.95"></a>
 <span class="sourceLineNo">096</span>    * Returns an XML-Schema validator based on the output returned by {@link #doSerialize(SerializerSession, Object)};<a name="line.96"></a>
 <span class="sourceLineNo">097</span>    *<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    * @param session The serializer session object return by {@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)}.&lt;br&gt;<a name="line.98"></a>
+<span class="sourceLineNo">098</span>    * @param session The serializer session object return by {@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)}.&lt;br&gt;<a name="line.98"></a>
 <span class="sourceLineNo">099</span>    * Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.99"></a>
 <span class="sourceLineNo">100</span>    * @param o The object to serialize.<a name="line.100"></a>
 <span class="sourceLineNo">101</span>    * @return The new validator.<a name="line.101"></a>
@@ -274,7 +274,7 @@
 <span class="sourceLineNo">266</span>         this.defaultNs = defaultNs;<a name="line.266"></a>
 <span class="sourceLineNo">267</span>         this.targetNs = targetNs;<a name="line.267"></a>
 <span class="sourceLineNo">268</span>         this.session = session;<a name="line.268"></a>
-<span class="sourceLineNo">269</span>         w = new XmlWriter(sw, session.isUseWhitespace(), session.isTrimStrings(), session.getQuoteChar(), null, null, true, null);<a name="line.269"></a>
+<span class="sourceLineNo">269</span>         w = new XmlWriter(sw, session.isUseWhitespace(), session.isTrimStrings(), session.getQuoteChar(), null, null, null, true, null);<a name="line.269"></a>
 <span class="sourceLineNo">270</span>         int i = session.getIndent();<a name="line.270"></a>
 <span class="sourceLineNo">271</span>         w.oTag(i, "schema");<a name="line.271"></a>
 <span class="sourceLineNo">272</span>         w.attr("xmlns", xs.getUri());<a name="line.272"></a>
@@ -588,12 +588,12 @@
 <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>   @Override /* Serializer */<a name="line.582"></a>
-<span class="sourceLineNo">583</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.583"></a>
+<span class="sourceLineNo">583</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.583"></a>
 <span class="sourceLineNo">584</span>      // This serializer must always have namespaces enabled.<a name="line.584"></a>
 <span class="sourceLineNo">585</span>      if (op == null)<a name="line.585"></a>
 <span class="sourceLineNo">586</span>         op = new ObjectMap();<a name="line.586"></a>
 <span class="sourceLineNo">587</span>      op.put(XmlSerializerContext.XML_enableNamespaces, true);<a name="line.587"></a>
-<span class="sourceLineNo">588</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.588"></a>
+<span class="sourceLineNo">588</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html
@@ -839,8 +839,8 @@
 <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>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html
@@ -839,8 +839,8 @@
 <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>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
@@ -839,8 +839,8 @@
 <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>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html
@@ -839,8 +839,8 @@
 <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>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html
@@ -839,8 +839,8 @@
 <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>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html
@@ -839,8 +839,8 @@
 <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>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>
 


[17/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 519255b..8d17234 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
@@ -408,305 +408,331 @@
 <span class="sourceLineNo">400</span>      out.eTag(i, "table").nl();<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 void serializeBeanMap(HtmlSerializerSession session, HtmlWriter out, BeanMap&lt;?&gt; m, ClassMeta&lt;?&gt; eType, BeanPropertyMeta ppMeta) throws Exception {<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      int i = session.getIndent();<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span>      out.oTag(i, "table");<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span>      String typeName = m.getMeta().getDictionaryName();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      if (typeName != null &amp;&amp; eType != m.getClassMeta())<a name="line.409"></a>
-<span class="sourceLineNo">410</span>         out.attr(session.getBeanTypePropertyName(m.getClassMeta()), typeName);<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>      out.append('&gt;').nl();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      if (session.isAddKeyValueTableHeaders() &amp;&amp; ! (m.getClassMeta().getExtendedMeta(HtmlClassMeta.class).isNoTableHeaders() || (ppMeta != null &amp;&amp; ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isNoTableHeaders()))) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>         out.sTag(i+1, "tr").nl();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>         out.sTag(i+2, "th").append("key").eTag("th").nl();<a name="line.415"></a>
-<span class="sourceLineNo">416</span>         out.sTag(i+2, "th").append("value").eTag("th").nl();<a name="line.416"></a>
-<span class="sourceLineNo">417</span>         out.eTag(i+1, "tr").nl();<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>      for (BeanPropertyValue p : m.getValues(session.isTrimNulls())) {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>         BeanPropertyMeta pMeta = p.getMeta();<a name="line.421"></a>
-<span class="sourceLineNo">422</span>         ClassMeta&lt;?&gt; cMeta = p.getClassMeta();<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span>         String key = p.getName();<a name="line.424"></a>
-<span class="sourceLineNo">425</span>         Object value = p.getValue();<a name="line.425"></a>
-<span class="sourceLineNo">426</span>         Throwable t = p.getThrown();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>         if (t != null)<a name="line.427"></a>
-<span class="sourceLineNo">428</span>            session.addBeanGetterWarning(pMeta, t);<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span>         if (session.canIgnoreValue(cMeta, key, value))<a name="line.430"></a>
-<span class="sourceLineNo">431</span>            continue;<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>         out.sTag(i+1, "tr").nl();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>         out.sTag(i+2, "td").text(key).eTag("td").nl();<a name="line.434"></a>
-<span class="sourceLineNo">435</span>         out.sTag(i+2, "td");<a name="line.435"></a>
-<span class="sourceLineNo">436</span>         try {<a name="line.436"></a>
-<span class="sourceLineNo">437</span>            ContentResult cr = serializeAnything(session, out, value, cMeta, key, 2, pMeta, false);<a name="line.437"></a>
-<span class="sourceLineNo">438</span>            if (cr == CR_NORMAL)<a name="line.438"></a>
-<span class="sourceLineNo">439</span>               out.i(i+2);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>         } catch (SerializeException e) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>            throw e;<a name="line.441"></a>
-<span class="sourceLineNo">442</span>         } catch (Error e) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>            throw e;<a name="line.443"></a>
-<span class="sourceLineNo">444</span>         } catch (Throwable e) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span>            e.printStackTrace();<a name="line.445"></a>
-<span class="sourceLineNo">446</span>            session.addBeanGetterWarning(pMeta, e);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>         }<a name="line.447"></a>
-<span class="sourceLineNo">448</span>         out.eTag("td").nl();<a name="line.448"></a>
-<span class="sourceLineNo">449</span>         out.eTag(i+1, "tr").nl();<a name="line.449"></a>
-<span class="sourceLineNo">450</span>      }<a name="line.450"></a>
-<span class="sourceLineNo">451</span>      out.eTag(i, "table").nl();<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>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.454"></a>
-<span class="sourceLineNo">455</span>   private void serializeCollection(HtmlSerializerSession session, HtmlWriter out, Object in, ClassMeta&lt;?&gt; sType, ClassMeta&lt;?&gt; eType, String name, BeanPropertyMeta ppMeta) throws Exception {<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>      ClassMeta&lt;?&gt; seType = sType.getElementType();<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      if (seType == null)<a name="line.458"></a>
-<span class="sourceLineNo">459</span>         seType = session.object();<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span>      Collection c = (sType.isCollection() ? (Collection)in : toList(sType.getInnerClass(), in));<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>      int i = session.getIndent();<a name="line.463"></a>
-<span class="sourceLineNo">464</span>      if (c.isEmpty()) {<a name="line.464"></a>
-<span class="sourceLineNo">465</span>         out.appendln(i, "&lt;ul&gt;&lt;/ul&gt;");<a name="line.465"></a>
-<span class="sourceLineNo">466</span>         return;<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>      String type2 = null;<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      if (sType != eType)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>         type2 = sType.getDictionaryName();<a name="line.471"></a>
-<span class="sourceLineNo">472</span>      if (type2 == null)<a name="line.472"></a>
-<span class="sourceLineNo">473</span>         type2 = "array";<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span>      c = session.sort(c);<a name="line.475"></a>
-<span class="sourceLineNo">476</span><a name="line.476"></a>
-<span class="sourceLineNo">477</span>      HtmlBeanPropertyMeta hbpMeta = (ppMeta == null ? null : ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class));<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      String btpn = session.getBeanTypePropertyName(eType);<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span>      // Look at the objects to see how we're going to handle them.  Check the first object to see how we're going to handle this.<a name="line.480"></a>
-<span class="sourceLineNo">481</span>      // If it's a map or bean, then we'll create a table.<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      // Otherwise, we'll create a list.<a name="line.482"></a>
-<span class="sourceLineNo">483</span>      Object[] th = getTableHeaders(session, c, hbpMeta);<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>      if (th != null) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>         out.oTag(i, "table").attr(btpn, type2).append('&gt;').nl();<a name="line.487"></a>
-<span class="sourceLineNo">488</span>         out.sTag(i+1, "tr").nl();<a name="line.488"></a>
-<span class="sourceLineNo">489</span>         for (Object key : th) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>            out.sTag(i+2, "th");<a name="line.490"></a>
-<span class="sourceLineNo">491</span>            out.text(session.convertToType(key, String.class));<a name="line.491"></a>
-<span class="sourceLineNo">492</span>            out.eTag("th").nl();<a name="line.492"></a>
-<span class="sourceLineNo">493</span>         }<a name="line.493"></a>
-<span class="sourceLineNo">494</span>         out.eTag(i+1, "tr").nl();<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span>         for (Object o : c) {<a name="line.496"></a>
-<span class="sourceLineNo">497</span>            ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o);<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>            if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.499"></a>
-<span class="sourceLineNo">500</span>               PojoSwap f = cm.getPojoSwap();<a name="line.500"></a>
-<span class="sourceLineNo">501</span>               o = f.swap(session, o);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>               cm = cm.getSerializedClassMeta();<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>            out.oTag(i+1, "tr");<a name="line.505"></a>
-<span class="sourceLineNo">506</span>            String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.506"></a>
-<span class="sourceLineNo">507</span>            String typeProperty = session.getBeanTypePropertyName(cm);<a name="line.507"></a>
+<span class="sourceLineNo">403</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.403"></a>
+<span class="sourceLineNo">404</span>   private void serializeBeanMap(HtmlSerializerSession session, HtmlWriter out, BeanMap&lt;?&gt; m, ClassMeta&lt;?&gt; eType, BeanPropertyMeta ppMeta) throws Exception {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      int i = session.getIndent();<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>      out.oTag(i, "table");<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span>      String typeName = m.getMeta().getDictionaryName();<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      if (typeName != null &amp;&amp; eType != m.getClassMeta())<a name="line.410"></a>
+<span class="sourceLineNo">411</span>         out.attr(session.getBeanTypePropertyName(m.getClassMeta()), typeName);<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span>      out.append('&gt;').nl();<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      if (session.isAddKeyValueTableHeaders() &amp;&amp; ! (m.getClassMeta().getExtendedMeta(HtmlClassMeta.class).isNoTableHeaders() || (ppMeta != null &amp;&amp; ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isNoTableHeaders()))) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>         out.sTag(i+1, "tr").nl();<a name="line.415"></a>
+<span class="sourceLineNo">416</span>         out.sTag(i+2, "th").append("key").eTag("th").nl();<a name="line.416"></a>
+<span class="sourceLineNo">417</span>         out.sTag(i+2, "th").append("value").eTag("th").nl();<a name="line.417"></a>
+<span class="sourceLineNo">418</span>         out.eTag(i+1, "tr").nl();<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>      for (BeanPropertyValue p : m.getValues(session.isTrimNulls())) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>         BeanPropertyMeta pMeta = p.getMeta();<a name="line.422"></a>
+<span class="sourceLineNo">423</span>         ClassMeta&lt;?&gt; cMeta = p.getClassMeta();<a name="line.423"></a>
+<span class="sourceLineNo">424</span>         HtmlBeanPropertyMeta hbpMeta = pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>         String link = hbpMeta.getLink();<a name="line.425"></a>
+<span class="sourceLineNo">426</span>         HtmlRender render = hbpMeta.getRender();<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span>         String key = p.getName();<a name="line.428"></a>
+<span class="sourceLineNo">429</span>         Object value = p.getValue();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>         Throwable t = p.getThrown();<a name="line.430"></a>
+<span class="sourceLineNo">431</span>         if (t != null)<a name="line.431"></a>
+<span class="sourceLineNo">432</span>            session.addBeanGetterWarning(pMeta, t);<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>         if (session.canIgnoreValue(cMeta, key, value))<a name="line.434"></a>
+<span class="sourceLineNo">435</span>            continue;<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span>         out.sTag(i+1, "tr").nl();<a name="line.437"></a>
+<span class="sourceLineNo">438</span>         out.sTag(i+2, "td").text(key).eTag("td").nl();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>         out.oTag(i+2, "td");<a name="line.439"></a>
+<span class="sourceLineNo">440</span>         String style = render.getStyle(session, value);<a name="line.440"></a>
+<span class="sourceLineNo">441</span>         if (style != null)<a name="line.441"></a>
+<span class="sourceLineNo">442</span>            out.attr("style", style);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>         out.cTag();<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span>         try {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>            if (link != null) <a name="line.446"></a>
+<span class="sourceLineNo">447</span>               out.oTag(i+3, "a").attrUri("href", m.resolveVars(link)).cTag();<a name="line.447"></a>
+<span class="sourceLineNo">448</span>            ContentResult cr = serializeAnything(session, out, render.getContent(session, value), cMeta, key, 2, pMeta, false);<a name="line.448"></a>
+<span class="sourceLineNo">449</span>            if (cr == CR_NORMAL)<a name="line.449"></a>
+<span class="sourceLineNo">450</span>               out.i(i+2);<a name="line.450"></a>
+<span class="sourceLineNo">451</span>            if (link != null) <a name="line.451"></a>
+<span class="sourceLineNo">452</span>               out.eTag("a");<a name="line.452"></a>
+<span class="sourceLineNo">453</span>         } catch (SerializeException e) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>            throw e;<a name="line.454"></a>
+<span class="sourceLineNo">455</span>         } catch (Error e) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>            throw e;<a name="line.456"></a>
+<span class="sourceLineNo">457</span>         } catch (Throwable e) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>            e.printStackTrace();<a name="line.458"></a>
+<span class="sourceLineNo">459</span>            session.addBeanGetterWarning(pMeta, e);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>         }<a name="line.460"></a>
+<span class="sourceLineNo">461</span>         out.eTag("td").nl();<a name="line.461"></a>
+<span class="sourceLineNo">462</span>         out.eTag(i+1, "tr").nl();<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      }<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      out.eTag(i, "table").nl();<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>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.467"></a>
+<span class="sourceLineNo">468</span>   private void serializeCollection(HtmlSerializerSession session, HtmlWriter out, Object in, ClassMeta&lt;?&gt; sType, ClassMeta&lt;?&gt; eType, String name, BeanPropertyMeta ppMeta) throws Exception {<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span>      ClassMeta&lt;?&gt; seType = sType.getElementType();<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      if (seType == null)<a name="line.471"></a>
+<span class="sourceLineNo">472</span>         seType = session.object();<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span>      Collection c = (sType.isCollection() ? (Collection)in : toList(sType.getInnerClass(), in));<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span>      int i = session.getIndent();<a name="line.476"></a>
+<span class="sourceLineNo">477</span>      if (c.isEmpty()) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span>         out.appendln(i, "&lt;ul&gt;&lt;/ul&gt;");<a name="line.478"></a>
+<span class="sourceLineNo">479</span>         return;<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>      String type2 = null;<a name="line.482"></a>
+<span class="sourceLineNo">483</span>      if (sType != eType)<a name="line.483"></a>
+<span class="sourceLineNo">484</span>         type2 = sType.getDictionaryName();<a name="line.484"></a>
+<span class="sourceLineNo">485</span>      if (type2 == null)<a name="line.485"></a>
+<span class="sourceLineNo">486</span>         type2 = "array";<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span>      c = session.sort(c);<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span>      HtmlBeanPropertyMeta hbpMeta = (ppMeta == null ? null : ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class));<a name="line.490"></a>
+<span class="sourceLineNo">491</span>      String btpn = session.getBeanTypePropertyName(eType);<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span>      // Look at the objects to see how we're going to handle them.  Check the first object to see how we're going to handle this.<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      // If it's a map or bean, then we'll create a table.<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      // Otherwise, we'll create a list.<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      Object[] th = getTableHeaders(session, c, hbpMeta);<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span>      if (th != null) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span>         out.oTag(i, "table").attr(btpn, type2).append('&gt;').nl();<a name="line.500"></a>
+<span class="sourceLineNo">501</span>         out.sTag(i+1, "tr").nl();<a name="line.501"></a>
+<span class="sourceLineNo">502</span>         for (Object key : th) {<a name="line.502"></a>
+<span class="sourceLineNo">503</span>            out.sTag(i+2, "th");<a name="line.503"></a>
+<span class="sourceLineNo">504</span>            out.text(session.convertToType(key, String.class));<a name="line.504"></a>
+<span class="sourceLineNo">505</span>            out.eTag("th").nl();<a name="line.505"></a>
+<span class="sourceLineNo">506</span>         }<a name="line.506"></a>
+<span class="sourceLineNo">507</span>         out.eTag(i+1, "tr").nl();<a name="line.507"></a>
 <span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span>            if (typeName != null &amp;&amp; eType.getElementType() != cm)<a name="line.509"></a>
-<span class="sourceLineNo">510</span>               out.attr(typeProperty, typeName);<a name="line.510"></a>
-<span class="sourceLineNo">511</span>            out.cTag().nl();<a name="line.511"></a>
-<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span>            if (cm == null) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>               serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span>            } else if (cm.isMap() &amp;&amp; ! (cm.isBeanMap())) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span>               Map m2 = session.sort((Map)o);<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span>               for (Object k : th) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>                  out.sTag(i+2, "td");<a name="line.520"></a>
-<span class="sourceLineNo">521</span>                  ContentResult cr = serializeAnything(session, out, m2.get(k), eType.getElementType(), session.toString(k), 2, null, false);<a name="line.521"></a>
-<span class="sourceLineNo">522</span>                  if (cr == CR_NORMAL)<a name="line.522"></a>
-<span class="sourceLineNo">523</span>                     out.i(i+2);<a name="line.523"></a>
-<span class="sourceLineNo">524</span>                  out.eTag("td").nl();<a name="line.524"></a>
-<span class="sourceLineNo">525</span>               }<a name="line.525"></a>
-<span class="sourceLineNo">526</span>            } else {<a name="line.526"></a>
-<span class="sourceLineNo">527</span>               BeanMap m2 = null;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>               if (o instanceof BeanMap)<a name="line.528"></a>
-<span class="sourceLineNo">529</span>                  m2 = (BeanMap)o;<a name="line.529"></a>
-<span class="sourceLineNo">530</span>               else<a name="line.530"></a>
-<span class="sourceLineNo">531</span>                  m2 = session.toBeanMap(o);<a name="line.531"></a>
-<span class="sourceLineNo">532</span><a name="line.532"></a>
-<span class="sourceLineNo">533</span>               for (Object k : th) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>                  BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.534"></a>
-<span class="sourceLineNo">535</span>                  BeanPropertyMeta pMeta = p.getMeta();<a name="line.535"></a>
-<span class="sourceLineNo">536</span>                  out.sTag(i+2, "td");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>                  ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>                  if (cr == CR_NORMAL)<a name="line.538"></a>
-<span class="sourceLineNo">539</span>                     out.i(i+2);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>                  out.eTag("td").nl();<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>            out.eTag(i+1, "tr").nl();<a name="line.543"></a>
-<span class="sourceLineNo">544</span>         }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>         out.eTag(i, "table").nl();<a name="line.545"></a>
-<span class="sourceLineNo">546</span><a name="line.546"></a>
-<span class="sourceLineNo">547</span>      } else {<a name="line.547"></a>
-<span class="sourceLineNo">548</span>         out.oTag(i, "ul");<a name="line.548"></a>
-<span class="sourceLineNo">549</span>         if (! type2.equals("array"))<a name="line.549"></a>
-<span class="sourceLineNo">550</span>            out.attr(btpn, type2);<a name="line.550"></a>
-<span class="sourceLineNo">551</span>         out.append('&gt;').nl();<a name="line.551"></a>
-<span class="sourceLineNo">552</span>         for (Object o : c) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span>            out.sTag(i+1, "li");<a name="line.553"></a>
-<span class="sourceLineNo">554</span>            ContentResult cr = serializeAnything(session, out, o, eType.getElementType(), name, 1, null, false);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>            if (cr == CR_NORMAL)<a name="line.555"></a>
-<span class="sourceLineNo">556</span>               out.i(i+1);<a name="line.556"></a>
-<span class="sourceLineNo">557</span>            out.eTag("li").nl();<a name="line.557"></a>
-<span class="sourceLineNo">558</span>         }<a name="line.558"></a>
-<span class="sourceLineNo">559</span>         out.eTag(i, "ul").nl();<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>   /*<a name="line.563"></a>
-<span class="sourceLineNo">564</span>    * Returns the table column headers for the specified collection of objects.<a name="line.564"></a>
-<span class="sourceLineNo">565</span>    * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    */<a name="line.567"></a>
-<span class="sourceLineNo">568</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.568"></a>
-<span class="sourceLineNo">569</span>   private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      if (c.size() == 0)<a name="line.570"></a>
-<span class="sourceLineNo">571</span>         return null;<a name="line.571"></a>
-<span class="sourceLineNo">572</span>      c = session.sort(c);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>      Object[] th;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      Set&lt;ClassMeta&gt; prevC = new HashSet&lt;ClassMeta&gt;();<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      Object o1 = null;<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      for (Object o : c)<a name="line.576"></a>
-<span class="sourceLineNo">577</span>         if (o != null) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>            o1 = o;<a name="line.578"></a>
-<span class="sourceLineNo">579</span>            break;<a name="line.579"></a>
-<span class="sourceLineNo">580</span>         }<a name="line.580"></a>
-<span class="sourceLineNo">581</span>      if (o1 == null)<a name="line.581"></a>
-<span class="sourceLineNo">582</span>         return null;<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o1);<a name="line.583"></a>
-<span class="sourceLineNo">584</span>      if (cm.getPojoSwap() != null) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span>         PojoSwap f = cm.getPojoSwap();<a name="line.585"></a>
-<span class="sourceLineNo">586</span>         o1 = f.swap(session, o1);<a name="line.586"></a>
-<span class="sourceLineNo">587</span>         cm = cm.getSerializedClassMeta();<a name="line.587"></a>
-<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
-<span class="sourceLineNo">589</span>      if (cm == null || ! cm.isMapOrBean())<a name="line.589"></a>
-<span class="sourceLineNo">590</span>         return null;<a name="line.590"></a>
-<span class="sourceLineNo">591</span>      if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.591"></a>
-<span class="sourceLineNo">592</span>         return null;<a name="line.592"></a>
-<span class="sourceLineNo">593</span>      HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.593"></a>
-<span class="sourceLineNo">594</span>      if (h.isNoTables() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTables()))<a name="line.594"></a>
-<span class="sourceLineNo">595</span>         return null;<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      if (h.isNoTableHeaders() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTableHeaders()))<a name="line.596"></a>
-<span class="sourceLineNo">597</span>         return new Object[0];<a name="line.597"></a>
-<span class="sourceLineNo">598</span>      if (session.canIgnoreValue(cm, null, o1))<a name="line.598"></a>
-<span class="sourceLineNo">599</span>         return null;<a name="line.599"></a>
-<span class="sourceLineNo">600</span>      if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.601"></a>
-<span class="sourceLineNo">602</span>         for (Object o : c) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span>               if (! cm.isInstance(o))<a name="line.604"></a>
-<span class="sourceLineNo">605</span>                  return null;<a name="line.605"></a>
-<span class="sourceLineNo">606</span>               Map m = session.sort((Map)o);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>               for (Map.Entry e : (Set&lt;Map.Entry&gt;)m.entrySet()) {<a name="line.607"></a>
-<span class="sourceLineNo">608</span>                  if (e.getValue() != null)<a name="line.608"></a>
-<span class="sourceLineNo">609</span>                     set.add(e.getKey() == null ? null : e.getKey());<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>         }<a name="line.612"></a>
-<span class="sourceLineNo">613</span>         th = set.toArray(new Object[set.size()]);<a name="line.613"></a>
-<span class="sourceLineNo">614</span>      } else {<a name="line.614"></a>
-<span class="sourceLineNo">615</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.615"></a>
-<span class="sourceLineNo">616</span>         for (Object o : c) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>               if (! cm.isInstance(o))<a name="line.618"></a>
-<span class="sourceLineNo">619</span>                  return null;<a name="line.619"></a>
-<span class="sourceLineNo">620</span>               BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.620"></a>
-<span class="sourceLineNo">621</span>               for (Map.Entry&lt;String,Object&gt; e : bm.entrySet()) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>                  if (e.getValue() != null)<a name="line.622"></a>
-<span class="sourceLineNo">623</span>                     set.add(e.getKey());<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>         }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>         th = set.toArray(new Object[set.size()]);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>      }<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      prevC.add(cm);<a name="line.629"></a>
-<span class="sourceLineNo">630</span>      boolean isSortable = true;<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      for (Object o : th)<a name="line.631"></a>
-<span class="sourceLineNo">632</span>         isSortable &amp;= (o instanceof Comparable);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      Set&lt;Object&gt; s = (isSortable ? new TreeSet&lt;Object&gt;() : new LinkedHashSet&lt;Object&gt;());<a name="line.633"></a>
-<span class="sourceLineNo">634</span>      s.addAll(Arrays.asList(th));<a name="line.634"></a>
-<span class="sourceLineNo">635</span><a name="line.635"></a>
-<span class="sourceLineNo">636</span>      for (Object o : c) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span>         if (o == null)<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            continue;<a name="line.638"></a>
-<span class="sourceLineNo">639</span>         cm = session.getClassMetaForObject(o);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>         if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            PojoSwap f = cm.getPojoSwap();<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            o = f.swap(session, o);<a name="line.642"></a>
-<span class="sourceLineNo">643</span>            cm = cm.getSerializedClassMeta();<a name="line.643"></a>
-<span class="sourceLineNo">644</span>         }<a name="line.644"></a>
-<span class="sourceLineNo">645</span>         if (prevC.contains(cm))<a name="line.645"></a>
-<span class="sourceLineNo">646</span>            continue;<a name="line.646"></a>
-<span class="sourceLineNo">647</span>         if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.647"></a>
-<span class="sourceLineNo">648</span>            return null;<a name="line.648"></a>
-<span class="sourceLineNo">649</span>         if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.649"></a>
-<span class="sourceLineNo">650</span>            return null;<a name="line.650"></a>
-<span class="sourceLineNo">651</span>         if (session.canIgnoreValue(cm, null, o))<a name="line.651"></a>
-<span class="sourceLineNo">652</span>            return null;<a name="line.652"></a>
-<span class="sourceLineNo">653</span>         if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>            Map m = (Map)o;<a name="line.654"></a>
-<span class="sourceLineNo">655</span>            if (th.length != m.keySet().size())<a name="line.655"></a>
-<span class="sourceLineNo">656</span>               return null;<a name="line.656"></a>
-<span class="sourceLineNo">657</span>            for (Object k : m.keySet())<a name="line.657"></a>
-<span class="sourceLineNo">658</span>               if (! s.contains(k.toString()))<a name="line.658"></a>
-<span class="sourceLineNo">659</span>                  return null;<a name="line.659"></a>
-<span class="sourceLineNo">660</span>         } else {<a name="line.660"></a>
-<span class="sourceLineNo">661</span>            BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            int l = 0;<a name="line.662"></a>
-<span class="sourceLineNo">663</span>            for (String k : bm.keySet()) {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>               if (! s.contains(k))<a name="line.664"></a>
-<span class="sourceLineNo">665</span>                  return null;<a name="line.665"></a>
-<span class="sourceLineNo">666</span>               l++;<a name="line.666"></a>
-<span class="sourceLineNo">667</span>            }<a name="line.667"></a>
-<span class="sourceLineNo">668</span>            if (s.size() != l)<a name="line.668"></a>
-<span class="sourceLineNo">669</span>               return null;<a name="line.669"></a>
+<span class="sourceLineNo">509</span>         for (Object o : c) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>            ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o);<a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span>            if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span>               PojoSwap f = cm.getPojoSwap();<a name="line.513"></a>
+<span class="sourceLineNo">514</span>               o = f.swap(session, o);<a name="line.514"></a>
+<span class="sourceLineNo">515</span>               cm = cm.getSerializedClassMeta();<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>            out.oTag(i+1, "tr");<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            String typeName = (cm == null ? null : cm.getDictionaryName());<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            String typeProperty = session.getBeanTypePropertyName(cm);<a name="line.520"></a>
+<span class="sourceLineNo">521</span><a name="line.521"></a>
+<span class="sourceLineNo">522</span>            if (typeName != null &amp;&amp; eType.getElementType() != cm)<a name="line.522"></a>
+<span class="sourceLineNo">523</span>               out.attr(typeProperty, typeName);<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            out.cTag().nl();<a name="line.524"></a>
+<span class="sourceLineNo">525</span><a name="line.525"></a>
+<span class="sourceLineNo">526</span>            if (cm == null) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>               serializeAnything(session, out, o, null, null, 1, null, false);<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span>            } else if (cm.isMap() &amp;&amp; ! (cm.isBeanMap())) {<a name="line.529"></a>
+<span class="sourceLineNo">530</span>               Map m2 = session.sort((Map)o);<a name="line.530"></a>
+<span class="sourceLineNo">531</span><a name="line.531"></a>
+<span class="sourceLineNo">532</span>               for (Object k : th) {<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, m2.get(k), eType.getElementType(), session.toString(k), 2, null, 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>            } else {<a name="line.539"></a>
+<span class="sourceLineNo">540</span>               BeanMap m2 = null;<a name="line.540"></a>
+<span class="sourceLineNo">541</span>               if (o instanceof BeanMap)<a name="line.541"></a>
+<span class="sourceLineNo">542</span>                  m2 = (BeanMap)o;<a name="line.542"></a>
+<span class="sourceLineNo">543</span>               else<a name="line.543"></a>
+<span class="sourceLineNo">544</span>                  m2 = session.toBeanMap(o);<a name="line.544"></a>
+<span class="sourceLineNo">545</span><a name="line.545"></a>
+<span class="sourceLineNo">546</span>               for (Object k : th) {<a name="line.546"></a>
+<span class="sourceLineNo">547</span>                  BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.547"></a>
+<span class="sourceLineNo">548</span>                  BeanPropertyMeta pMeta = p.getMeta();<a name="line.548"></a>
+<span class="sourceLineNo">549</span>                  HtmlBeanPropertyMeta hpMeta = pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class);<a name="line.549"></a>
+<span class="sourceLineNo">550</span>                  String link = hpMeta.getLink();<a name="line.550"></a>
+<span class="sourceLineNo">551</span>                  HtmlRender render = hpMeta.getRender();<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span>                  Object value = p.getValue();<a name="line.553"></a>
+<span class="sourceLineNo">554</span>                  out.oTag(i+2, "td");<a name="line.554"></a>
+<span class="sourceLineNo">555</span>                  String style = render.getStyle(session, value);<a name="line.555"></a>
+<span class="sourceLineNo">556</span>                  if (style != null)<a name="line.556"></a>
+<span class="sourceLineNo">557</span>                     out.attr("style", style);<a name="line.557"></a>
+<span class="sourceLineNo">558</span>                  out.cTag();<a name="line.558"></a>
+<span class="sourceLineNo">559</span>                  if (link != null) <a name="line.559"></a>
+<span class="sourceLineNo">560</span>                     out.oTag(i+3, "a").attrUri("href", m2.resolveVars(link)).cTag();<a name="line.560"></a>
+<span class="sourceLineNo">561</span>                  ContentResult cr = serializeAnything(session, out, render.getContent(session, value), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.561"></a>
+<span class="sourceLineNo">562</span>                  if (cr == CR_NORMAL)<a name="line.562"></a>
+<span class="sourceLineNo">563</span>                     out.i(i+2);<a name="line.563"></a>
+<span class="sourceLineNo">564</span>                  if (link != null) <a name="line.564"></a>
+<span class="sourceLineNo">565</span>                     out.eTag("a");<a name="line.565"></a>
+<span class="sourceLineNo">566</span>                  out.eTag("td").nl();<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>            out.eTag(i+1, "tr").nl();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>         }<a name="line.570"></a>
+<span class="sourceLineNo">571</span>         out.eTag(i, "table").nl();<a name="line.571"></a>
+<span class="sourceLineNo">572</span><a name="line.572"></a>
+<span class="sourceLineNo">573</span>      } else {<a name="line.573"></a>
+<span class="sourceLineNo">574</span>         out.oTag(i, "ul");<a name="line.574"></a>
+<span class="sourceLineNo">575</span>         if (! type2.equals("array"))<a name="line.575"></a>
+<span class="sourceLineNo">576</span>            out.attr(btpn, type2);<a name="line.576"></a>
+<span class="sourceLineNo">577</span>         out.append('&gt;').nl();<a name="line.577"></a>
+<span class="sourceLineNo">578</span>         for (Object o : c) {<a name="line.578"></a>
+<span class="sourceLineNo">579</span>            out.sTag(i+1, "li");<a name="line.579"></a>
+<span class="sourceLineNo">580</span>            ContentResult cr = serializeAnything(session, out, o, eType.getElementType(), name, 1, null, false);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>            if (cr == CR_NORMAL)<a name="line.581"></a>
+<span class="sourceLineNo">582</span>               out.i(i+1);<a name="line.582"></a>
+<span class="sourceLineNo">583</span>            out.eTag("li").nl();<a name="line.583"></a>
+<span class="sourceLineNo">584</span>         }<a name="line.584"></a>
+<span class="sourceLineNo">585</span>         out.eTag(i, "ul").nl();<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>   /*<a name="line.589"></a>
+<span class="sourceLineNo">590</span>    * Returns the table column headers for the specified collection of objects.<a name="line.590"></a>
+<span class="sourceLineNo">591</span>    * Returns null if collection should not be serialized as a 2-dimensional table.<a name="line.591"></a>
+<span class="sourceLineNo">592</span>    * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.592"></a>
+<span class="sourceLineNo">593</span>    */<a name="line.593"></a>
+<span class="sourceLineNo">594</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.594"></a>
+<span class="sourceLineNo">595</span>   private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.595"></a>
+<span class="sourceLineNo">596</span>      if (c.size() == 0)<a name="line.596"></a>
+<span class="sourceLineNo">597</span>         return null;<a name="line.597"></a>
+<span class="sourceLineNo">598</span>      c = session.sort(c);<a name="line.598"></a>
+<span class="sourceLineNo">599</span>      Object[] th;<a name="line.599"></a>
+<span class="sourceLineNo">600</span>      Set&lt;ClassMeta&gt; prevC = new HashSet&lt;ClassMeta&gt;();<a name="line.600"></a>
+<span class="sourceLineNo">601</span>      Object o1 = null;<a name="line.601"></a>
+<span class="sourceLineNo">602</span>      for (Object o : c)<a name="line.602"></a>
+<span class="sourceLineNo">603</span>         if (o != null) {<a name="line.603"></a>
+<span class="sourceLineNo">604</span>            o1 = o;<a name="line.604"></a>
+<span class="sourceLineNo">605</span>            break;<a name="line.605"></a>
+<span class="sourceLineNo">606</span>         }<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      if (o1 == null)<a name="line.607"></a>
+<span class="sourceLineNo">608</span>         return null;<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      ClassMeta&lt;?&gt; cm = session.getClassMetaForObject(o1);<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      if (cm.getPojoSwap() != null) {<a name="line.610"></a>
+<span class="sourceLineNo">611</span>         PojoSwap f = cm.getPojoSwap();<a name="line.611"></a>
+<span class="sourceLineNo">612</span>         o1 = f.swap(session, o1);<a name="line.612"></a>
+<span class="sourceLineNo">613</span>         cm = cm.getSerializedClassMeta();<a name="line.613"></a>
+<span class="sourceLineNo">614</span>      }<a name="line.614"></a>
+<span class="sourceLineNo">615</span>      if (cm == null || ! cm.isMapOrBean())<a name="line.615"></a>
+<span class="sourceLineNo">616</span>         return null;<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.617"></a>
+<span class="sourceLineNo">618</span>         return null;<a name="line.618"></a>
+<span class="sourceLineNo">619</span>      HtmlClassMeta h = cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.619"></a>
+<span class="sourceLineNo">620</span>      if (h.isNoTables() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTables()))<a name="line.620"></a>
+<span class="sourceLineNo">621</span>         return null;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>      if (h.isNoTableHeaders() || (hbpMeta != null &amp;&amp; hbpMeta.isNoTableHeaders()))<a name="line.622"></a>
+<span class="sourceLineNo">623</span>         return new Object[0];<a name="line.623"></a>
+<span class="sourceLineNo">624</span>      if (session.canIgnoreValue(cm, null, o1))<a name="line.624"></a>
+<span class="sourceLineNo">625</span>         return null;<a name="line.625"></a>
+<span class="sourceLineNo">626</span>      if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.626"></a>
+<span class="sourceLineNo">627</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.627"></a>
+<span class="sourceLineNo">628</span>         for (Object o : c) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.629"></a>
+<span class="sourceLineNo">630</span>               if (! cm.isInstance(o))<a name="line.630"></a>
+<span class="sourceLineNo">631</span>                  return null;<a name="line.631"></a>
+<span class="sourceLineNo">632</span>               Map m = session.sort((Map)o);<a name="line.632"></a>
+<span class="sourceLineNo">633</span>               for (Map.Entry e : (Set&lt;Map.Entry&gt;)m.entrySet()) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>                  if (e.getValue() != null)<a name="line.634"></a>
+<span class="sourceLineNo">635</span>                     set.add(e.getKey() == null ? null : e.getKey());<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>         th = set.toArray(new Object[set.size()]);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>      } else {<a name="line.640"></a>
+<span class="sourceLineNo">641</span>         Set&lt;Object&gt; set = new LinkedHashSet&lt;Object&gt;();<a name="line.641"></a>
+<span class="sourceLineNo">642</span>         for (Object o : c) {<a name="line.642"></a>
+<span class="sourceLineNo">643</span>            if (! session.canIgnoreValue(cm, null, o)) {<a name="line.643"></a>
+<span class="sourceLineNo">644</span>               if (! cm.isInstance(o))<a name="line.644"></a>
+<span class="sourceLineNo">645</span>                  return null;<a name="line.645"></a>
+<span class="sourceLineNo">646</span>               BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.646"></a>
+<span class="sourceLineNo">647</span>               for (Map.Entry&lt;String,Object&gt; e : bm.entrySet()) {<a name="line.647"></a>
+<span class="sourceLineNo">648</span>                  if (e.getValue() != null)<a name="line.648"></a>
+<span class="sourceLineNo">649</span>                     set.add(e.getKey());<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>         th = set.toArray(new Object[set.size()]);<a name="line.653"></a>
+<span class="sourceLineNo">654</span>      }<a name="line.654"></a>
+<span class="sourceLineNo">655</span>      prevC.add(cm);<a name="line.655"></a>
+<span class="sourceLineNo">656</span>      boolean isSortable = true;<a name="line.656"></a>
+<span class="sourceLineNo">657</span>      for (Object o : th)<a name="line.657"></a>
+<span class="sourceLineNo">658</span>         isSortable &amp;= (o instanceof Comparable);<a name="line.658"></a>
+<span class="sourceLineNo">659</span>      Set&lt;Object&gt; s = (isSortable ? new TreeSet&lt;Object&gt;() : new LinkedHashSet&lt;Object&gt;());<a name="line.659"></a>
+<span class="sourceLineNo">660</span>      s.addAll(Arrays.asList(th));<a name="line.660"></a>
+<span class="sourceLineNo">661</span><a name="line.661"></a>
+<span class="sourceLineNo">662</span>      for (Object o : c) {<a name="line.662"></a>
+<span class="sourceLineNo">663</span>         if (o == null)<a name="line.663"></a>
+<span class="sourceLineNo">664</span>            continue;<a name="line.664"></a>
+<span class="sourceLineNo">665</span>         cm = session.getClassMetaForObject(o);<a name="line.665"></a>
+<span class="sourceLineNo">666</span>         if (cm != null &amp;&amp; cm.getPojoSwap() != null) {<a name="line.666"></a>
+<span class="sourceLineNo">667</span>            PojoSwap f = cm.getPojoSwap();<a name="line.667"></a>
+<span class="sourceLineNo">668</span>            o = f.swap(session, o);<a name="line.668"></a>
+<span class="sourceLineNo">669</span>            cm = cm.getSerializedClassMeta();<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>      return th;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>   }<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>    * Returns the schema serializer based on the settings of this serializer.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    * @return The schema serializer.<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    */<a name="line.678"></a>
-<span class="sourceLineNo">679</span>   @Override /* XmlSerializer */<a name="line.679"></a>
-<span class="sourceLineNo">680</span>   public HtmlSerializer getSchemaSerializer() {<a name="line.680"></a>
-<span class="sourceLineNo">681</span>      if (schemaSerializer == null)<a name="line.681"></a>
-<span class="sourceLineNo">682</span>         schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.682"></a>
-<span class="sourceLineNo">683</span>      return schemaSerializer;<a name="line.683"></a>
-<span class="sourceLineNo">684</span>   }<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>   //--------------------------------------------------------------------------------<a name="line.687"></a>
-<span class="sourceLineNo">688</span>   // Entry point methods<a name="line.688"></a>
-<span class="sourceLineNo">689</span>   //--------------------------------------------------------------------------------<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span>   @Override /* Serializer */<a name="line.691"></a>
-<span class="sourceLineNo">692</span>   public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.692"></a>
-<span class="sourceLineNo">693</span>      return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<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>   @Override /* Serializer */<a name="line.696"></a>
-<span class="sourceLineNo">697</span>   protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.697"></a>
-<span class="sourceLineNo">698</span>      HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.698"></a>
-<span class="sourceLineNo">699</span>      doSerialize(s, o, s.getWriter());<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">671</span>         if (prevC.contains(cm))<a name="line.671"></a>
+<span class="sourceLineNo">672</span>            continue;<a name="line.672"></a>
+<span class="sourceLineNo">673</span>         if (cm == null || ! (cm.isMap() || cm.isBean()))<a name="line.673"></a>
+<span class="sourceLineNo">674</span>            return null;<a name="line.674"></a>
+<span class="sourceLineNo">675</span>         if (cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.675"></a>
+<span class="sourceLineNo">676</span>            return null;<a name="line.676"></a>
+<span class="sourceLineNo">677</span>         if (session.canIgnoreValue(cm, null, o))<a name="line.677"></a>
+<span class="sourceLineNo">678</span>            return null;<a name="line.678"></a>
+<span class="sourceLineNo">679</span>         if (cm.isMap() &amp;&amp; ! cm.isBeanMap()) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>            Map m = (Map)o;<a name="line.680"></a>
+<span class="sourceLineNo">681</span>            if (th.length != m.keySet().size())<a name="line.681"></a>
+<span class="sourceLineNo">682</span>               return null;<a name="line.682"></a>
+<span class="sourceLineNo">683</span>            for (Object k : m.keySet())<a name="line.683"></a>
+<span class="sourceLineNo">684</span>               if (! s.contains(k.toString()))<a name="line.684"></a>
+<span class="sourceLineNo">685</span>                  return null;<a name="line.685"></a>
+<span class="sourceLineNo">686</span>         } else {<a name="line.686"></a>
+<span class="sourceLineNo">687</span>            BeanMap&lt;?&gt; bm = (o instanceof BeanMap ? (BeanMap)o : session.toBeanMap(o));<a name="line.687"></a>
+<span class="sourceLineNo">688</span>            int l = 0;<a name="line.688"></a>
+<span class="sourceLineNo">689</span>            for (String k : bm.keySet()) {<a name="line.689"></a>
+<span class="sourceLineNo">690</span>               if (! s.contains(k))<a name="line.690"></a>
+<span class="sourceLineNo">691</span>                  return null;<a name="line.691"></a>
+<span class="sourceLineNo">692</span>               l++;<a name="line.692"></a>
+<span class="sourceLineNo">693</span>            }<a name="line.693"></a>
+<span class="sourceLineNo">694</span>            if (s.size() != l)<a name="line.694"></a>
+<span class="sourceLineNo">695</span>               return null;<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>      return th;<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>    * Returns the schema serializer based on the settings of this serializer.<a name="line.702"></a>
+<span class="sourceLineNo">703</span>    * @return The schema serializer.<a name="line.703"></a>
+<span class="sourceLineNo">704</span>    */<a name="line.704"></a>
+<span class="sourceLineNo">705</span>   @Override /* XmlSerializer */<a name="line.705"></a>
+<span class="sourceLineNo">706</span>   public HtmlSerializer getSchemaSerializer() {<a name="line.706"></a>
+<span class="sourceLineNo">707</span>      if (schemaSerializer == null)<a name="line.707"></a>
+<span class="sourceLineNo">708</span>         schemaSerializer = new HtmlSchemaDocSerializer(propertyStore, getOverrideProperties());<a name="line.708"></a>
+<span class="sourceLineNo">709</span>      return schemaSerializer;<a name="line.709"></a>
+<span class="sourceLineNo">710</span>   }<a name="line.710"></a>
+<span class="sourceLineNo">711</span><a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>   //--------------------------------------------------------------------------------<a name="line.713"></a>
+<span class="sourceLineNo">714</span>   // Entry point methods<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>   @Override /* Serializer */<a name="line.717"></a>
+<span class="sourceLineNo">718</span>   public HtmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span>      return new HtmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.719"></a>
+<span class="sourceLineNo">720</span>   }<a name="line.720"></a>
+<span class="sourceLineNo">721</span><a name="line.721"></a>
+<span class="sourceLineNo">722</span>   @Override /* Serializer */<a name="line.722"></a>
+<span class="sourceLineNo">723</span>   protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.723"></a>
+<span class="sourceLineNo">724</span>      HtmlSerializerSession s = (HtmlSerializerSession)session;<a name="line.724"></a>
+<span class="sourceLineNo">725</span>      doSerialize(s, o, s.getWriter());<a name="line.725"></a>
+<span class="sourceLineNo">726</span>   }<a name="line.726"></a>
+<span class="sourceLineNo">727</span>}<a name="line.727"></a>
 
 
 


[08/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 becd8f8..da7fafc 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
@@ -180,1667 +180,1751 @@
 <span class="sourceLineNo">172</span>    * Adds a query parameter to the URI query.<a name="line.172"></a>
 <span class="sourceLineNo">173</span>    *<a name="line.173"></a>
 <span class="sourceLineNo">174</span>    * @param name The parameter name.<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    * Can be null/blank if the value is a {@link Map} or {@link String}.<a name="line.175"></a>
+<span class="sourceLineNo">175</span>    *    Can be null/blank/* if the value is a {@link Map}, {@link String}, {@link NameValuePairs}, or bean.<a name="line.175"></a>
 <span class="sourceLineNo">176</span>    * @param value The parameter value converted to a string using UON notation.<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    * Can also be a {@link Map} or {@link String} if the name is null/blank.<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    * If a {@link String} and the name is null/blank, then calls {@link URIBuilder#setCustomQuery(String)}.<a name="line.178"></a>
+<span class="sourceLineNo">177</span>    *    Can also be {@link Map}, {@link String}, {@link NameValuePairs}, or bean if the name is null/blank/*.<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    *    If a {@link String} and the name is null/blank/*, then calls {@link URIBuilder#setCustomQuery(String)}.<a name="line.178"></a>
 <span class="sourceLineNo">179</span>    * @param skipIfEmpty Don't add the pair if the value is empty.<a name="line.179"></a>
 <span class="sourceLineNo">180</span>    * @return This object (for method chaining).<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    */<a name="line.181"></a>
-<span class="sourceLineNo">182</span>   @SuppressWarnings("unchecked")<a name="line.182"></a>
-<span class="sourceLineNo">183</span>   public RestCall query(String name, Object value, boolean skipIfEmpty) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      if (! isEmpty(name)) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>         if (! (isEmpty(value) &amp;&amp; skipIfEmpty))<a name="line.185"></a>
-<span class="sourceLineNo">186</span>            uriBuilder.addParameter(name, client.getUrlEncodingSerializer().serializePart(value, false, null));<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      } else {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>         if (value instanceof String) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>            String s = value.toString();<a name="line.189"></a>
-<span class="sourceLineNo">190</span>            if (! isEmpty(s))<a name="line.190"></a>
-<span class="sourceLineNo">191</span>               uriBuilder.setCustomQuery(s);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>         } else if (value instanceof Map) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>            for (Map.Entry&lt;String,Object&gt; p : ((Map&lt;String,Object&gt;) value).entrySet())<a name="line.193"></a>
-<span class="sourceLineNo">194</span>               query(p.getKey(), p.getValue(), skipIfEmpty);<a name="line.194"></a>
-<span class="sourceLineNo">195</span>         } else {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>            throw new RuntimeException("Invalid name passed to query(name,value,skipIfEmpty).");<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>      return this;<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>   /**<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    * Adds a query parameter to the URI query.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    *<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    * @param name The parameter name.<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    * @param value The parameter value converted to a string using UON notation.<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>    * @throws RestCallException<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   public RestCall query(String name, Object value) throws RestCallException {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      return query(name, value, false);<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>   /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    * Adds query parameters to the URI query.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    *<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    * @param params The parameters.  Values are converted to a string using UON notation.<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    * @return This object (for method chaining).<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    * @throws RestCallException<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    */<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   public RestCall query(Map&lt;String,Object&gt; params) throws RestCallException {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      return query(null, params);<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>    * Adds a query parameter to the URI query if the parameter value is not &lt;jk&gt;null&lt;/jk&gt; or an empty string.<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    * &lt;p&gt;<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    * NE = "not empty"<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    *<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    * @param name The parameter name.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    * @param value The parameter value converted to a string using UON notation.<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    * @return This object (for method chaining).<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    * @throws RestCallException<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    */<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   public RestCall queryIfNE(String name, Object value) throws RestCallException {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      return query(name, value, true);<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>   /**<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    * Adds query parameters to the URI for any parameters that aren't null/empty.<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    * &lt;p&gt;<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    * NE = "not empty"<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    *<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    * @param params The parameters.  Values are converted to a string using UON notation.<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    * @return This object (for method chaining).<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    * @throws RestCallException<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    */<a name="line.247"></a>
-<span class="sourceLineNo">248</span>   public RestCall queryIfNE(Map&lt;String,Object&gt; params) throws RestCallException {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      return query(null, params, true);<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>   /**<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    * Sets a custom URI query.<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    *<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    * @param query The new URI query string.<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    * @return This object (for method chaining).<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    */<a name="line.257"></a>
-<span class="sourceLineNo">258</span>   public RestCall query(String query) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      uriBuilder.setCustomQuery(query);<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      return this;<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>   /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    * Adds a form data pair to this request to perform a URL-encoded form post.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    *<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    * @param name The parameter name.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    * Can be null/blank if the value is a {@link Map} or {@link NameValuePairs}.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    * @param value The parameter value converted to a string using UON notation.<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    * Can also be a {@link Map} or {@link NameValuePairs}.<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    * @param skipIfEmpty Don't add the pair if the value is empty.<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    * @return This object (for method chaining).<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    */<a name="line.272"></a>
-<span class="sourceLineNo">273</span>   @SuppressWarnings("unchecked")<a name="line.273"></a>
-<span class="sourceLineNo">274</span>   public RestCall formData(String name, Object value, boolean skipIfEmpty) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      if (formData == null)<a name="line.275"></a>
-<span class="sourceLineNo">276</span>         formData = new NameValuePairs();<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      if (! isEmpty(name)) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>         if (! (isEmpty(value) &amp;&amp; skipIfEmpty))<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            formData.add(new SerializedNameValuePair(name, value, client.getUrlEncodingSerializer()));<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      } else {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>         if (value instanceof NameValuePairs) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            formData.addAll((NameValuePairs)value);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>         } else if (value instanceof Map) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            for (Map.Entry&lt;String,Object&gt; p : ((Map&lt;String,Object&gt;) value).entrySet())<a name="line.284"></a>
-<span class="sourceLineNo">285</span>               formData(p.getKey(), p.getValue(), skipIfEmpty);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>         } else {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>            throw new RuntimeException("Invalid name passed to formData(name,value,skipIfEmpty).");<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>      return this;<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>    * Adds a form data pair to this request to perform a URL-encoded form post.<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    *<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    * @param name The parameter name.<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    * Can be null/blank if the value is a {@link Map} or {@link NameValuePairs}.<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    * @param value The parameter value converted to a string using UON notation.<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    * Can also be a {@link Map} or {@link NameValuePairs}.<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    * @return This object (for method chaining).<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    * @throws RestCallException If name was null/blank and value wasn't a {@link Map} or {@link NameValuePairs}.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>   public RestCall formData(String name, Object value) throws RestCallException {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      return formData(name, value, false);<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>   /**<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    * Adds form data pairs to this request to perform a URL-encoded form post.<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    *<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    * @param nameValuePairs The name-value pairs of the request.<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>    * @throws RestCallException<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    */<a name="line.313"></a>
-<span class="sourceLineNo">314</span>   public RestCall formData(NameValuePairs nameValuePairs) throws RestCallException {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      return formData(null, nameValuePairs);<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>    * Adds form data pairs to this request to perform a URL-encoded form post.<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    *<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    * @param params The parameters.  Values are converted to a string using UON notation.<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    * @return This object (for method chaining).<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    * @throws RestCallException If name was null/blank and value wasn't a {@link Map} or {@link NameValuePairs}.<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    */<a name="line.324"></a>
-<span class="sourceLineNo">325</span>   public RestCall formData(Map&lt;String,Object&gt; params) throws RestCallException {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      return formData(null, params);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   }<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>    * Adds a form data pair to the request if the parameter value is not &lt;jk&gt;null&lt;/jk&gt; or an empty string.<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    * &lt;p&gt;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    * NE = "not empty"<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    *<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    * @param name The parameter name.<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    * @param value The parameter value converted to a string using UON notation.<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    * @return This object (for method chaining).<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    * @throws RestCallException<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    */<a name="line.338"></a>
-<span class="sourceLineNo">339</span>   public RestCall formDataIfNE(String name, Object value) throws RestCallException {<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      return formData(name, value, true);<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>   /**<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    * Adds form data parameters to the request for any parameters that aren't null/empty.<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    * &lt;p&gt;<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    * NE = "not empty"<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    *<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    * @param params The parameters.  Values are converted to a string using UON notation.<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>    * @throws RestCallException<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    */<a name="line.351"></a>
-<span class="sourceLineNo">352</span>   public RestCall formDataIfNE(Map&lt;String,Object&gt; params) throws RestCallException {<a name="line.352"></a>
-<span class="sourceLineNo">353</span>      return formData(null, params, true);<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>   /**<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    * Sets the URI user info.<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    *<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    * @param userInfo The new URI user info.<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    * @return This object (for method chaining).<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    */<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   public RestCall userInfo(String userInfo) {<a name="line.362"></a>
-<span class="sourceLineNo">363</span>      uriBuilder.setUserInfo(userInfo);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>      return this;<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>   /**<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    * Sets the URI user info.<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    *<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    * @param username The new URI username.<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    * @param password The new URI password.<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    * @return This object (for method chaining).<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    */<a name="line.373"></a>
-<span class="sourceLineNo">374</span>   public RestCall userInfo(String username, String password) {<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      uriBuilder.setUserInfo(username, password);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      return this;<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>   /**<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    * Sets the input for this REST call.<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    *<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    * @param input The input to be sent to the REST resource (only valid for PUT and POST) requests. &lt;br&gt;<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    * Can be of the following types:<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    * &lt;ul class='spaced-list'&gt;<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    *    &lt;li&gt;{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    *    &lt;li&gt;{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    *    &lt;li&gt;{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    *    &lt;li&gt;{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    *    &lt;li&gt;{@link NameValuePairs} - Converted to a URL-encoded FORM post.<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    * &lt;/ul&gt;<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>    * @throws RestCallException If a retry was attempted, but the entity was not repeatable.<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    */<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   public RestCall input(final Object input) throws RestCallException {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      this.input = input;<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      this.hasInput = true;<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      return this;<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>    * Specifies the serializer to use on this call.<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    * &lt;p&gt;<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    * Overrides the serializer specified on the {@link RestClient}.<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    *<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    * @param serializer The serializer used to serialize POJOs to the body of the HTTP request.<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    * @return This object (for method chaining).<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    */<a name="line.407"></a>
-<span class="sourceLineNo">408</span>   public RestCall serializer(Serializer serializer) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      this.serializer = serializer;<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      return this;<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>   /**<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    * Specifies the parser to use on this call.<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    * &lt;p&gt;<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    * Overrides the parser specified on the {@link RestClient}.<a name="line.416"></a>
+<span class="sourceLineNo">181</span>    * @throws RestCallException<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    */<a name="line.182"></a>
+<span class="sourceLineNo">183</span>   @SuppressWarnings("unchecked")<a name="line.183"></a>
+<span class="sourceLineNo">184</span>   public RestCall query(String name, Object value, boolean skipIfEmpty) throws RestCallException {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      if (! ("*".equals(name) || isEmpty(name))) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>         if (! (isEmpty(value) &amp;&amp; skipIfEmpty))<a name="line.186"></a>
+<span class="sourceLineNo">187</span>            uriBuilder.addParameter(name, client.getUrlEncodingSerializer().serializePart(value, false, null));<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      } else if (value instanceof NameValuePairs) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>         for (NameValuePair p : (NameValuePairs)value)<a name="line.189"></a>
+<span class="sourceLineNo">190</span>            query(p.getName(), p.getValue(), skipIfEmpty);<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      } else if (value instanceof String) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>         String s = value.toString();<a name="line.192"></a>
+<span class="sourceLineNo">193</span>         if (! isEmpty(s))<a name="line.193"></a>
+<span class="sourceLineNo">194</span>            uriBuilder.setCustomQuery(s);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      } else if (value instanceof Map) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span>         for (Map.Entry&lt;String,Object&gt; p : ((Map&lt;String,Object&gt;) value).entrySet())<a name="line.196"></a>
+<span class="sourceLineNo">197</span>            query(p.getKey(), p.getValue(), skipIfEmpty);<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      } else if (isBean(value)){<a name="line.198"></a>
+<span class="sourceLineNo">199</span>         return query(name, toBeanMap(value));<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      } else {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>         throw new RuntimeException("Invalid name passed to query(name,value,skipIfEmpty).");<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      }<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      return this;<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span>   /**<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    * Adds a query parameter to the URI query.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    *<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    * @param name The parameter name.<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    * @param value The parameter value converted to a string using UON notation.<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>    * @throws RestCallException<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    */<a name="line.213"></a>
+<span class="sourceLineNo">214</span>   public RestCall query(String name, Object value) throws RestCallException {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      return query(name, value, false);<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>    * Adds query parameters to the URI query.<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    *<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    * @param params The parameters.  Values are converted to a string using UON notation.<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    * @return This object (for method chaining).<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    * @throws RestCallException<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    */<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   public RestCall query(Map&lt;String,Object&gt; params) throws RestCallException {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      return query(null, params);<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>   /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    * Adds a query parameter to the URI query if the parameter value is not &lt;jk&gt;null&lt;/jk&gt; or an empty string.<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    * &lt;p&gt;<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    * NE = "not empty"<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    *<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    * @param name The parameter name.<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    * @param value The parameter value converted to a string using UON notation.<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    * @return This object (for method chaining).<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    * @throws RestCallException<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    */<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   public RestCall queryIfNE(String name, Object value) throws RestCallException {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      return query(name, value, true);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>   }<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>    * Adds query parameters to the URI for any parameters that aren't null/empty.<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    * &lt;p&gt;<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    * NE = "not empty"<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    *<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    * @param params The parameters.  Values are converted to a string using UON notation.<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    * @return This object (for method chaining).<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    * @throws RestCallException<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    */<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   public RestCall queryIfNE(Map&lt;String,Object&gt; params) throws RestCallException {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      return query(null, params, true);<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>   /**<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    * Sets a custom URI query.<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    *<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    * @param query The new URI query string.<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    * @return This object (for method chaining).<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    */<a name="line.261"></a>
+<span class="sourceLineNo">262</span>   public RestCall query(String query) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      uriBuilder.setCustomQuery(query);<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      return this;<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>   /**<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    * Adds a form data pair to this request to perform a URL-encoded form post.<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    *<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    * @param name The parameter name.<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    *    Can be null/blank/* if the value is a {@link Map}, {@link NameValuePairs}, or bean.<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    * @param value The parameter value converted to a string using UON notation.<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    *    Can also be {@link Map}, {@link NameValuePairs}, or bean if the name is null/blank/*.<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    * @param skipIfEmpty Don't add the pair if the value is empty.<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>    * @throws RestCallException<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    */<a name="line.277"></a>
+<span class="sourceLineNo">278</span>   @SuppressWarnings("unchecked")<a name="line.278"></a>
+<span class="sourceLineNo">279</span>   public RestCall formData(String name, Object value, boolean skipIfEmpty) throws RestCallException {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      if (formData == null)<a name="line.280"></a>
+<span class="sourceLineNo">281</span>         formData = new NameValuePairs();<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      if (! ("*".equals(name) || isEmpty(name))) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>         if (! (isEmpty(value) &amp;&amp; skipIfEmpty))<a name="line.283"></a>
+<span class="sourceLineNo">284</span>            formData.add(new SerializedNameValuePair(name, value, client.getUrlEncodingSerializer()));<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      } else if (value instanceof NameValuePairs) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>         formData.addAll((NameValuePairs)value);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      } else if (value instanceof Map) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span>         for (Map.Entry&lt;String,Object&gt; p : ((Map&lt;String,Object&gt;) value).entrySet())<a name="line.288"></a>
+<span class="sourceLineNo">289</span>            formData(p.getKey(), p.getValue(), skipIfEmpty);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      } else if (isBean(value)) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>         return formData(name, toBeanMap(value));<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      } else {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>         throw new RuntimeException("Invalid name passed to formData(name,value,skipIfEmpty).");<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      }<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      return this;<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>   /**<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    * Adds a form data pair to this request to perform a URL-encoded form post.<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    *<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    * @param name The parameter name.<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    * Can be null/blank if the value is a {@link Map} or {@link NameValuePairs}.<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    * @param value The parameter value converted to a string using UON notation.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    * Can also be a {@link Map} or {@link NameValuePairs}.<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    * @return This object (for method chaining).<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    * @throws RestCallException If name was null/blank and value wasn't a {@link Map} or {@link NameValuePairs}.<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    */<a name="line.307"></a>
+<span class="sourceLineNo">308</span>   public RestCall formData(String name, Object value) throws RestCallException {<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      return formData(name, value, false);<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>    * Adds form data pairs to this request to perform a URL-encoded form post.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    *<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    * @param nameValuePairs The name-value pairs of the request.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    * @return This object (for method chaining).<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    * @throws RestCallException<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    */<a name="line.318"></a>
+<span class="sourceLineNo">319</span>   public RestCall formData(NameValuePairs nameValuePairs) throws RestCallException {<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      return formData(null, nameValuePairs);<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>    * Adds form data pairs to this request to perform a URL-encoded form post.<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    *<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    * @param params The parameters.  Values are converted to a string using UON notation.<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>    * @throws RestCallException If name was null/blank and value wasn't a {@link Map} or {@link NameValuePairs}.<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    */<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   public RestCall formData(Map&lt;String,Object&gt; params) throws RestCallException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      return formData(null, params);<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>    * Adds a form data pair to the request if the parameter value is not &lt;jk&gt;null&lt;/jk&gt; or an empty string.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    * &lt;p&gt;<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    * NE = "not empty"<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    *<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    * @param name The parameter name.<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    * @param value The parameter value converted to a string using UON notation.<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>    * @throws RestCallException<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    */<a name="line.343"></a>
+<span class="sourceLineNo">344</span>   public RestCall formDataIfNE(String name, Object value) throws RestCallException {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      return formData(name, value, true);<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 form data parameters to the request for any parameters that aren't null/empty.<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    * &lt;p&gt;<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    * NE = "not empty"<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    *<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    * @param params The parameters.  Values are converted to a string using UON notation.<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>    * @throws RestCallException<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    */<a name="line.356"></a>
+<span class="sourceLineNo">357</span>   public RestCall formDataIfNE(Map&lt;String,Object&gt; params) throws RestCallException {<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      return formData(null, params, true);<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>   /**<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    * Replaces a variable of the form &lt;js&gt;"{name}"&lt;/js&gt; in the URL path with the specified value.<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    * @param name The path variable name.<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    * @param value The replacement value.<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    *<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>    * @throws RestCallException If variable could not be found in path.<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    */<a name="line.368"></a>
+<span class="sourceLineNo">369</span>   @SuppressWarnings("unchecked")<a name="line.369"></a>
+<span class="sourceLineNo">370</span>   public RestCall path(String name, Object value) throws RestCallException {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>      String path = uriBuilder.getPath();<a name="line.371"></a>
+<span class="sourceLineNo">372</span>      if (! ("*".equals(name) || isEmpty(name))) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span>         String var = "{" + name + "}";<a name="line.373"></a>
+<span class="sourceLineNo">374</span>         if (path.indexOf(var) == -1)<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            throw new RestCallException("Path variable {"+name+"} was not found in path.");<a name="line.375"></a>
+<span class="sourceLineNo">376</span>         String newPath = path.replace(var, client.getUrlEncodingSerializer().serializePart(value, false, null));<a name="line.376"></a>
+<span class="sourceLineNo">377</span>         uriBuilder.setPath(newPath);<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      } else if (value instanceof NameValuePairs) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>         for (NameValuePair p : (NameValuePairs)value)<a name="line.379"></a>
+<span class="sourceLineNo">380</span>            path(p.getName(), p.getValue());<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      } else if (value instanceof Map) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>         for (Map.Entry&lt;String,Object&gt; p : ((Map&lt;String,Object&gt;) value).entrySet())<a name="line.382"></a>
+<span class="sourceLineNo">383</span>            path(p.getKey(), p.getValue());<a name="line.383"></a>
+<span class="sourceLineNo">384</span>      } else if (isBean(value)) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>         return path(name, toBeanMap(value));<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      } else {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>         throw new RuntimeException("Invalid name passed to path(name,value).");<a name="line.387"></a>
+<span class="sourceLineNo">388</span>      }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      return this;<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 URI user info.<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    *<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    * @param userInfo The new URI user info.<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    * @return This object (for method chaining).<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    */<a name="line.397"></a>
+<span class="sourceLineNo">398</span>   public RestCall userInfo(String userInfo) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      uriBuilder.setUserInfo(userInfo);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      return this;<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>   /**<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    * Sets the URI user info.<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    *<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    * @param username The new URI username.<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    * @param password The new URI password.<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    * @return This object (for method chaining).<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    */<a name="line.409"></a>
+<span class="sourceLineNo">410</span>   public RestCall userInfo(String username, String password) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      uriBuilder.setUserInfo(username, password);<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      return this;<a name="line.412"></a>
+<span class="sourceLineNo">413</span>   }<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>    * Sets the input for this REST call.<a name="line.416"></a>
 <span class="sourceLineNo">417</span>    *<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    * @param parser The parser used to parse POJOs from the body of the HTTP response.<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    * @return This object (for method chaining).<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    */<a name="line.420"></a>
-<span class="sourceLineNo">421</span>   public RestCall parser(Parser parser) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      this.parser = parser;<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      return this;<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>   //--------------------------------------------------------------------------------<a name="line.427"></a>
-<span class="sourceLineNo">428</span>   // HTTP headers<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>    * Sets a header on the request.<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    *<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    * @param name The header name.<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    * The name can be null/empty if the value is a {@link Map}.<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    * @param value The header value.<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    * @param skipIfEmpty Don't add the header if the name is null/empty.<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    * @return This object (for method chaining).<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    */<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   @SuppressWarnings("unchecked")<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   public RestCall header(String name, Object value, boolean skipIfEmpty) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      if (! isEmpty(name)) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>         if (! (isEmpty(value) &amp;&amp; skipIfEmpty))<a name="line.443"></a>
-<span class="sourceLineNo">444</span>            request.setHeader(name, client.getUrlEncodingSerializer().serializePart(value, false, true));<a name="line.444"></a>
-<span class="sourceLineNo">445</span>      } else {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>         if (value instanceof Map) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span>            for (Map.Entry&lt;String,Object&gt; p : ((Map&lt;String,Object&gt;) value).entrySet())<a name="line.447"></a>
-<span class="sourceLineNo">448</span>               header(p.getKey(), p.getValue(), skipIfEmpty);<a name="line.448"></a>
-<span class="sourceLineNo">449</span>         } else {<a name="line.449"></a>
-<span class="sourceLineNo">450</span>            throw new RuntimeException("Invalid name passed to formData(name,value,skipIfEmpty).");<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>      return this;<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>   /**<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    * Sets a header on the request.<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    *<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    * @param name The header name.<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    * The name can be null/empty if the value is a {@link Map}.<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    * @param value The header value.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    * @return This object (for method chaining).<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    */<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   public RestCall header(String name, Object value) {<a name="line.465"></a>
-<span class="sourceLineNo">466</span>      return header(name, value, false);<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>    * Sets headers on the request.<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    *<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    * @param values The header values.<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    * @return This object (for method chaining).<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    */<a name="line.474"></a>
-<span class="sourceLineNo">475</span>   public RestCall headers(Map&lt;String,Object&gt; values) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      return header(null, values, false);<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>   /**<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    * Sets a header on the request if the value is not null/empty.<a name="line.480"></a>
-<span class="sourceLineNo">481</span>    * &lt;p&gt;<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    * NE = "not empty"<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    *<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    * @param name The header name.<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    * The name can be null/empty if the value is a {@link Map}.<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    * @param value The header value.<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    * @return This object (for method chaining).<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>   public RestCall headerIfNE(String name, Object value) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      return header(name, value, true);<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>    * Sets headers on the request if the values are not null/empty.<a name="line.494"></a>
-<span class="sourceLineNo">495</span>    * &lt;p&gt;<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    * NE = "not empty"<a name="line.496"></a>
-<span class="sourceLineNo">497</span>    *<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    * @param values The header values.<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 RestCall headersIfNE(Map&lt;String,Object&gt; values) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      return header(null, values, true);<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>    * Sets the value for the &lt;code&gt;Accept&lt;/code&gt; request header.<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    * &lt;p&gt;<a name="line.507"></a>
-<span class="sourceLineNo">508</span>    * This overrides the media type specified on the parser, but is overridden by calling &lt;code&gt;header(&lt;js&gt;"Accept"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    *<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    * @param value The new header value.<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 RestCall accept(Object value) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>      return header("Accept", value);<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>   /**<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    * Sets the value for the &lt;code&gt;Accept-Charset&lt;/code&gt; request header.<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    * &lt;p&gt;<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Accept-Charset"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    *<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    * @param value The new header value.<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    * @return This object (for method chaining).<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    */<a name="line.524"></a>
-<span class="sourceLineNo">525</span>   public RestCall acceptCharset(Object value) {<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      return header("Accept-Charset", value);<a name="line.526"></a>
-<span class="sourceLineNo">527</span>   }<a name="line.527"></a>
-<span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>   /**<a name="line.529"></a>
-<span class="sourceLineNo">530</span>    * Sets the value for the &lt;code&gt;Accept-Encoding&lt;/code&gt; request header.<a name="line.530"></a>
-<span class="sourceLineNo">531</span>    * &lt;p&gt;<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Accept-Encoding"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    *<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    * @param value The new header value.<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    * @return This object (for method chaining).<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    */<a name="line.536"></a>
-<span class="sourceLineNo">537</span>   public RestCall acceptEncoding(Object value) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>      return header("Accept-Encoding", value);<a name="line.538"></a>
-<span class="sourceLineNo">539</span>   }<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>    * Sets the value for the &lt;code&gt;Accept-Language&lt;/code&gt; request header.<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    * &lt;p&gt;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Accept-Language"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    *<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    * @param value The new header value.<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    * @return This object (for method chaining).<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    */<a name="line.548"></a>
-<span class="sourceLineNo">549</span>   public RestCall acceptLanguage(Object value) {<a name="line.549"></a>
-<span class="sourceLineNo">550</span>      return header("Accept-Language", value);<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>    * Sets the value for the &lt;code&gt;Authorization&lt;/code&gt; request header.<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    * &lt;p&gt;<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Authorization"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    *<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    * @param value The new header value.<a name="line.558"></a>
-<span class="sourceLineNo">559</span>    * @return This object (for method chaining).<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    */<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   public RestCall authorization(Object value) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>      return header("Authorization", value);<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>    * Sets the value for the &lt;code&gt;Cache-Control&lt;/code&gt; request header.<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    * &lt;p&gt;<a name="line.567"></a>
-<span class="sourceLineNo">568</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Cache-Control"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.568"></a>
-<span class="sourceLineNo">569</span>    *<a name="line.569"></a>
-<span class="sourceLineNo">570</span>    * @param value The new header value.<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 cacheControl(Object value) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      return header("Cache-Control", value);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>   }<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>    * Sets the value for the &lt;code&gt;Connection&lt;/code&gt; request header.<a name="line.578"></a>
-<span class="sourceLineNo">579</span>    * &lt;p&gt;<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Connection"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    *<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    * @param value The new header value.<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    * @return This object (for method chaining).<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    */<a name="line.584"></a>
-<span class="sourceLineNo">585</span>   public RestCall connection(Object value) {<a name="line.585"></a>
-<span class="sourceLineNo">586</span>      return header("Connection", value);<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>   /**<a name="line.589"></a>
-<span class="sourceLineNo">590</span>    * Sets the value for the &lt;code&gt;Content-Length&lt;/code&gt; request header.<a name="line.590"></a>
-<span class="sourceLineNo">591</span>    * &lt;p&gt;<a name="line.591"></a>
-<span class="sourceLineNo">592</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Content-Length"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    *<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    * @param value The new header value.<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    * @return This object (for method chaining).<a name="line.595"></a>
+<span class="sourceLineNo">418</span>    * @param input The input to be sent to the REST resource (only valid for PUT and POST) requests. &lt;br&gt;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    * Can be of the following types:<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    * &lt;ul class='spaced-list'&gt;<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    *    &lt;li&gt;{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    *    &lt;li&gt;{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    *    &lt;li&gt;{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    *    &lt;li&gt;{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    *    &lt;li&gt;{@link NameValuePairs} - Converted to a URL-encoded FORM post.<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    * &lt;/ul&gt;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    * @return This object (for method chaining).<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    * @throws RestCallException If a retry was attempted, but the entity was not repeatable.<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    */<a name="line.429"></a>
+<span class="sourceLineNo">430</span>   public RestCall input(final Object input) throws RestCallException {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      this.input = input;<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      this.hasInput = true;<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      return this;<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>    * Specifies the serializer to use on this call.<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    * &lt;p&gt;<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    * Overrides the serializer specified on the {@link RestClient}.<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    *<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    * @param serializer The serializer used to serialize POJOs to the body of the HTTP request.<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    * @return This object (for method chaining).<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    */<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   public RestCall serializer(Serializer serializer) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      this.serializer = serializer;<a name="line.445"></a>
+<span class="sourceLineNo">446</span>      return this;<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>    * Specifies the parser to use on this call.<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    * &lt;p&gt;<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    * Overrides the parser specified on the {@link RestClient}.<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    *<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    * @param parser The parser used to parse POJOs from the body of the HTTP response.<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    * @return This object (for method chaining).<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    */<a name="line.456"></a>
+<span class="sourceLineNo">457</span>   public RestCall parser(Parser parser) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>      this.parser = parser;<a name="line.458"></a>
+<span class="sourceLineNo">459</span>      return this;<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>   //--------------------------------------------------------------------------------<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   // HTTP headers<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>   /**<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    * Sets a header on the request.<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    *<a name="line.469"></a>
+<span class="sourceLineNo">470</span>    * @param name The header name.<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    * The name can be null/empty if the value is a {@link Map}.<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    * @param value The header value.<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    * @param skipIfEmpty Don't add the header if the name is null/empty.<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    * @return This object (for method chaining).<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    * @throws RestCallException<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    */<a name="line.476"></a>
+<span class="sourceLineNo">477</span>   @SuppressWarnings("unchecked")<a name="line.477"></a>
+<span class="sourceLineNo">478</span>   public RestCall header(String name, Object value, boolean skipIfEmpty) throws RestCallException {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      if (! ("*".equals(name) || isEmpty(name))) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span>         if (! (isEmpty(value) &amp;&amp; skipIfEmpty))<a name="line.480"></a>
+<span class="sourceLineNo">481</span>            request.setHeader(name, client.getUrlEncodingSerializer().serializePart(value, false, true));<a name="line.481"></a>
+<span class="sourceLineNo">482</span>      } else if (value instanceof NameValuePairs) {<a name="line.482"></a>
+<span class="sourceLineNo">483</span>         for (NameValuePair p : (NameValuePairs)value)<a name="line.483"></a>
+<span class="sourceLineNo">484</span>            header(p.getName(), p.getValue(), skipIfEmpty);<a name="line.484"></a>
+<span class="sourceLineNo">485</span>      } else if (value instanceof Map) {<a name="line.485"></a>
+<span class="sourceLineNo">486</span>         for (Map.Entry&lt;String,Object&gt; p : ((Map&lt;String,Object&gt;) value).entrySet())<a name="line.486"></a>
+<span class="sourceLineNo">487</span>            header(p.getKey(), p.getValue(), skipIfEmpty);<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      } else if (isBean(value)) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span>         return header(name, toBeanMap(value), skipIfEmpty);<a name="line.489"></a>
+<span class="sourceLineNo">490</span>      } else {<a name="line.490"></a>
+<span class="sourceLineNo">491</span>         throw new RuntimeException("Invalid name passed to header(name,value,skipIfEmpty).");<a name="line.491"></a>
+<span class="sourceLineNo">492</span>      }<a name="line.492"></a>
+<span class="sourceLineNo">493</span>      return this;<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><a name="line.496"></a>
+<span class="sourceLineNo">497</span>   /**<a name="line.497"></a>
+<span class="sourceLineNo">498</span>    * Sets a header on the request.<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    *<a name="line.499"></a>
+<span class="sourceLineNo">500</span>    * @param name The header name.<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    * The name can be null/empty if the value is a {@link Map}.<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    * @param value The header value.<a name="line.502"></a>
+<span class="sourceLineNo">503</span>    * @return This object (for method chaining).<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    * @throws RestCallException<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    */<a name="line.505"></a>
+<span class="sourceLineNo">506</span>   public RestCall header(String name, Object value) throws RestCallException {<a name="line.506"></a>
+<span class="sourceLineNo">507</span>      return header(name, value, false);<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>   /**<a name="line.510"></a>
+<span class="sourceLineNo">511</span>    * Sets headers on the request.<a name="line.511"></a>
+<span class="sourceLineNo">512</span>    *<a name="line.512"></a>
+<span class="sourceLineNo">513</span>    * @param values The header values.<a name="line.513"></a>
+<span class="sourceLineNo">514</span>    * @return This object (for method chaining).<a name="line.514"></a>
+<span class="sourceLineNo">515</span>    * @throws RestCallException<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    */<a name="line.516"></a>
+<span class="sourceLineNo">517</span>   public RestCall headers(Map&lt;String,Object&gt; values) throws RestCallException {<a name="line.517"></a>
+<span class="sourceLineNo">518</span>      return header(null, values, false);<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>    * Sets a header on the request if the value is not null/empty.<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    * &lt;p&gt;<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    * NE = "not empty"<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    *<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    * @param name The header name.<a name="line.526"></a>
+<span class="sourceLineNo">527</span>    * The name can be null/empty if the value is a {@link Map}.<a name="line.527"></a>
+<span class="sourceLineNo">528</span>    * @param value The header value.<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>    * @throws RestCallException<a name="line.530"></a>
+<span class="sourceLineNo">531</span>    */<a name="line.531"></a>
+<span class="sourceLineNo">532</span>   public RestCall headerIfNE(String name, Object value) throws RestCallException {<a name="line.532"></a>
+<span class="sourceLineNo">533</span>      return header(name, value, true);<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>    * Sets headers on the request if the values are not null/empty.<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    * &lt;p&gt;<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    * NE = "not empty"<a name="line.539"></a>
+<span class="sourceLineNo">540</span>    *<a name="line.540"></a>
+<span class="sourceLineNo">541</span>    * @param values The header values.<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<a name="line.543"></a>
+<span class="sourceLineNo">544</span>    */<a name="line.544"></a>
+<span class="sourceLineNo">545</span>   public RestCall headersIfNE(Map&lt;String,Object&gt; values) throws RestCallException {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>      return header(null, values, true);<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>   /**<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    * Sets the value for the &lt;code&gt;Accept&lt;/code&gt; request header.<a name="line.550"></a>
+<span class="sourceLineNo">551</span>    * &lt;p&gt;<a name="line.551"></a>
+<span class="sourceLineNo">552</span>    * This overrides the media type specified on the parser, but is overridden by calling &lt;code&gt;header(&lt;js&gt;"Accept"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.552"></a>
+<span class="sourceLineNo">553</span>    *<a name="line.553"></a>
+<span class="sourceLineNo">554</span>    * @param value The new header value.<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    * @return This object (for method chaining).<a name="line.555"></a>
+<span class="sourceLineNo">556</span>    * @throws RestCallException<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    */<a name="line.557"></a>
+<span class="sourceLineNo">558</span>   public RestCall accept(Object value) throws RestCallException {<a name="line.558"></a>
+<span class="sourceLineNo">559</span>      return header("Accept", value);<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>    * Sets the value for the &lt;code&gt;Accept-Charset&lt;/code&gt; request header.<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    * &lt;p&gt;<a name="line.564"></a>
+<span class="sourceLineNo">565</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Accept-Charset"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.565"></a>
+<span class="sourceLineNo">566</span>    *<a name="line.566"></a>
+<span class="sourceLineNo">567</span>    * @param value The new header value.<a name="line.567"></a>
+<span class="sourceLineNo">568</span>    * @return This object (for method chaining).<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    * @throws RestCallException<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    */<a name="line.570"></a>
+<span class="sourceLineNo">571</span>   public RestCall acceptCharset(Object value) throws RestCallException {<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      return header("Accept-Charset", value);<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>   /**<a name="line.575"></a>
+<span class="sourceLineNo">576</span>    * Sets the value for the &lt;code&gt;Accept-Encoding&lt;/code&gt; request header.<a name="line.576"></a>
+<span class="sourceLineNo">577</span>    * &lt;p&gt;<a name="line.577"></a>
+<span class="sourceLineNo">578</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Accept-Encoding"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    *<a name="line.579"></a>
+<span class="sourceLineNo">580</span>    * @param value The new header value.<a name="line.580"></a>
+<span class="sourceLineNo">581</span>    * @return This object (for method chaining).<a name="line.581"></a>
+<span class="sourceLineNo">582</span>    * @throws RestCallException<a name="line.582"></a>
+<span class="sourceLineNo">583</span>    */<a name="line.583"></a>
+<span class="sourceLineNo">584</span>   public RestCall acceptEncoding(Object value) throws RestCallException {<a name="line.584"></a>
+<span class="sourceLineNo">585</span>      return header("Accept-Encoding", value);<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>    * Sets the value for the &lt;code&gt;Accept-Language&lt;/code&gt; request header.<a name="line.589"></a>
+<span class="sourceLineNo">590</span>    * &lt;p&gt;<a name="line.590"></a>
+<span class="sourceLineNo">591</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Accept-Language"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.591"></a>
+<span class="sourceLineNo">592</span>    *<a name="line.592"></a>
+<span class="sourceLineNo">593</span>    * @param value The new header value.<a name="line.593"></a>
+<span class="sourceLineNo">594</span>    * @return This object (for method chaining).<a name="line.594"></a>
+<span class="sourceLineNo">595</span>    * @throws RestCallException<a name="line.595"></a>
 <span class="sourceLineNo">596</span>    */<a name="line.596"></a>
-<span class="sourceLineNo">597</span>   public RestCall contentLength(Object value) {<a name="line.597"></a>
-<span class="sourceLineNo">598</span>      return header("Content-Length", value);<a name="line.598"></a>
+<span class="sourceLineNo">597</span>   public RestCall acceptLanguage(Object value) throws RestCallException {<a name="line.597"></a>
+<span class="sourceLineNo">598</span>      return header("Accept-Language", value);<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>    * Sets the value for the &lt;code&gt;Content-Type&lt;/code&gt; request header.<a name="line.602"></a>
+<span class="sourceLineNo">602</span>    * Sets the value for the &lt;code&gt;Authorization&lt;/code&gt; request header.<a name="line.602"></a>
 <span class="sourceLineNo">603</span>    * &lt;p&gt;<a name="line.603"></a>
-<span class="sourceLineNo">604</span>    * This overrides the media type specified on the serializer, but is overridden by calling &lt;code&gt;header(&lt;js&gt;"Content-Type"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.604"></a>
+<span class="sourceLineNo">604</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Authorization"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.604"></a>
 <span class="sourceLineNo">605</span>    *<a name="line.605"></a>
 <span class="sourceLineNo">606</span>    * @param value The new header value.<a name="line.606"></a>
 <span class="sourceLineNo">607</span>    * @return This object (for method chaining).<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    */<a name="line.608"></a>
-<span class="sourceLineNo">609</span>   public RestCall contentType(Object value) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span>      return header("Content-Type", value);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>   }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span>   /**<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    * Sets the value for the &lt;code&gt;Date&lt;/code&gt; request header.<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    * &lt;p&gt;<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Date"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.616"></a>
-<span class="sourceLineNo">617</span>    *<a name="line.617"></a>
-<span class="sourceLineNo">618</span>    * @param value The new header value.<a name="line.618"></a>
-<span class="sourceLineNo">619</span>    * @return This object (for method chaining).<a name="line.619"></a>
-<span class="sourceLineNo">620</span>    */<a name="line.620"></a>
-<span class="sourceLineNo">621</span>   public RestCall date(Object value) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      return header("Date", value);<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>    * Sets the value for the &lt;code&gt;Expect&lt;/code&gt; request header.<a name="line.626"></a>
-<span class="sourceLineNo">627</span>    * &lt;p&gt;<a name="line.627"></a>
-<span class="sourceLineNo">628</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Expect"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.628"></a>
-<span class="sourceLineNo">629</span>    *<a name="line.629"></a>
-<span class="sourceLineNo">630</span>    * @param value The new header value.<a name="line.630"></a>
-<span class="sourceLineNo">631</span>    * @return This object (for method chaining).<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    */<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   public RestCall expect(Object value) {<a name="line.633"></a>
-<span class="sourceLineNo">634</span>      return header("Expect", value);<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>    * Sets the value for the &lt;code&gt;Forwarded&lt;/code&gt; request header.<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    * &lt;p&gt;<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    * This is a shortcut for calling &lt;code&gt;header(&lt;js&gt;"Forwarded"&lt;/js&gt;, value);&lt;/code&gt;<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    *<a name="line.641"></a>
-<span class="sourceLineNo">642</span>    * @param value The new header value.<a name="line.642"></a>
-<span class="sourceLineNo">643</span>    * @return This object (for method chaining).<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    */<a name="line.644"></a>
-<span class="sourceLineNo">645</span>   public RestCall forwarded(Object value) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span>      return header("Forwarded", value);<a name="line.646"></a>
-<span class="sourceLineNo">647</span>   }<a name="line.647"></a>
-<span class="sourceLineNo">648</span><a name="line.648"></a>
-<span class="sourceLineNo">649</span>   /**<a name="line.649"></a>
-<span class="sourceLineNo">650</span>    * Sets the value for the &lt;code&gt;From&lt;/code&gt; request header.<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    * &lt;p&gt;<a name="line.651"></a>
-<span class="sourceLineNo">652</

<TRUNCATED>


[26/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/serializer/SerializerGroupBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/SerializerGroupBuilder.html b/content/site/apidocs/org/apache/juneau/serializer/SerializerGroupBuilder.html
index 0c8d4e5..c431ee4 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/SerializerGroupBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/SerializerGroupBuilder.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};
+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};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -611,52 +611,64 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </tr>
 <tr id="i74" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html#sq--">sq</a></span>()</code>
+<div class="block">Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.</div>
+</td>
+</tr>
+<tr id="i75" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html#timeZone-java.util.TimeZone-">timeZone</a></span>(<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>&nbsp;value)</code>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_timeZone"><code>BeanContext.BEAN_timeZone</code></a> property on all serializers in this group.</div>
 </td>
 </tr>
-<tr id="i75" class="rowColor">
+<tr id="i76" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html#trimEmptyCollections-boolean-">trimEmptyCollections</a></span>(boolean&nbsp;value)</code>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyCollections"><code>SerializerContext.SERIALIZER_trimEmptyCollections</code></a> property on all serializers in this group.</div>
 </td>
 </tr>
-<tr id="i76" class="altColor">
+<tr id="i77" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html#trimEmptyMaps-boolean-">trimEmptyMaps</a></span>(boolean&nbsp;value)</code>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyMaps"><code>SerializerContext.SERIALIZER_trimEmptyMaps</code></a> property on all serializers in this group.</div>
 </td>
 </tr>
-<tr id="i77" class="rowColor">
+<tr id="i78" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html#trimNullProperties-boolean-">trimNullProperties</a></span>(boolean&nbsp;value)</code>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimNullProperties"><code>SerializerContext.SERIALIZER_trimNullProperties</code></a> property on all serializers in this group.</div>
 </td>
 </tr>
-<tr id="i78" class="altColor">
+<tr id="i79" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html#trimStrings-boolean-">trimStrings</a></span>(boolean&nbsp;value)</code>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings"><code>SerializerContext.SERIALIZER_trimStrings</code></a> property on all serializers in this group.</div>
 </td>
 </tr>
-<tr id="i79" class="rowColor">
+<tr id="i80" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html#useInterfaceProxies-boolean-">useInterfaceProxies</a></span>(boolean&nbsp;value)</code>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_useInterfaceProxies"><code>BeanContext.BEAN_useInterfaceProxies</code></a> property on all serializers in this group.</div>
 </td>
 </tr>
-<tr id="i80" class="altColor">
+<tr id="i81" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html#useJavaBeanIntrospector-boolean-">useJavaBeanIntrospector</a></span>(boolean&nbsp;value)</code>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_useJavaBeanIntrospector"><code>BeanContext.BEAN_useJavaBeanIntrospector</code></a> property on all serializers in this group.</div>
 </td>
 </tr>
-<tr id="i81" class="rowColor">
+<tr id="i82" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html#useWhitespace-boolean-">useWhitespace</a></span>(boolean&nbsp;value)</code>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_useWhitespace"><code>SerializerContext.SERIALIZER_useWhitespace</code></a> property on all serializers in this group.</div>
 </td>
 </tr>
+<tr id="i83" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html#ws--">ws</a></span>()</code>
+<div class="block">Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -1001,13 +1013,27 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="ws--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ws</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.270">ws</a>()</pre>
+<div class="block">Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
 <a name="addBeanTypeProperties-boolean-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addBeanTypeProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.272">addBeanTypeProperties</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.281">addBeanTypeProperties</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_addBeanTypeProperties"><code>SerializerContext.SERIALIZER_addBeanTypeProperties</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1025,7 +1051,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>quoteChar</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.283">quoteChar</a>(char&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.292">quoteChar</a>(char&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_quoteChar"><code>SerializerContext.SERIALIZER_quoteChar</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1037,13 +1063,27 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="sq--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>sq</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.301">sq</a>()</pre>
+<div class="block">Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
 <a name="trimNullProperties-boolean-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>trimNullProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.294">trimNullProperties</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.312">trimNullProperties</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimNullProperties"><code>SerializerContext.SERIALIZER_trimNullProperties</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1061,7 +1101,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>trimEmptyCollections</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.305">trimEmptyCollections</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.323">trimEmptyCollections</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyCollections"><code>SerializerContext.SERIALIZER_trimEmptyCollections</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1079,7 +1119,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>trimEmptyMaps</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.316">trimEmptyMaps</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.334">trimEmptyMaps</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyMaps"><code>SerializerContext.SERIALIZER_trimEmptyMaps</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1097,7 +1137,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>trimStrings</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.327">trimStrings</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.345">trimStrings</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings"><code>SerializerContext.SERIALIZER_trimStrings</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1115,7 +1155,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>relativeUriBase</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.338">relativeUriBase</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.356">relativeUriBase</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_relativeUriBase"><code>SerializerContext.SERIALIZER_relativeUriBase</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1133,7 +1173,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>absolutePathUriBase</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.349">absolutePathUriBase</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.367">absolutePathUriBase</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_absolutePathUriBase"><code>SerializerContext.SERIALIZER_absolutePathUriBase</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1151,7 +1191,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>sortCollections</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.360">sortCollections</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.378">sortCollections</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortCollections"><code>SerializerContext.SERIALIZER_sortCollections</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1169,7 +1209,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>sortMaps</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.371">sortMaps</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.389">sortMaps</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortMaps"><code>SerializerContext.SERIALIZER_sortMaps</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1187,7 +1227,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>parserKnowsRootType</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.382">parserKnowsRootType</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.400">parserKnowsRootType</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_abridged"><code>SerializerContext.SERIALIZER_abridged</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1205,7 +1245,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beansRequireDefaultConstructor</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.393">beansRequireDefaultConstructor</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.411">beansRequireDefaultConstructor</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beansRequireDefaultConstructor"><code>BeanContext.BEAN_beansRequireDefaultConstructor</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1223,7 +1263,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beansRequireSerializable</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.404">beansRequireSerializable</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.422">beansRequireSerializable</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beansRequireSerializable"><code>BeanContext.BEAN_beansRequireSerializable</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1241,7 +1281,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beansRequireSettersForGetters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.415">beansRequireSettersForGetters</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.433">beansRequireSettersForGetters</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beansRequireSettersForGetters"><code>BeanContext.BEAN_beansRequireSettersForGetters</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1259,7 +1299,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beansRequireSomeProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.426">beansRequireSomeProperties</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.444">beansRequireSomeProperties</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beansRequireSomeProperties"><code>BeanContext.BEAN_beansRequireSomeProperties</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1277,7 +1317,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beanMapPutReturnsOldValue</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.437">beanMapPutReturnsOldValue</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.455">beanMapPutReturnsOldValue</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanMapPutReturnsOldValue"><code>BeanContext.BEAN_beanMapPutReturnsOldValue</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1295,7 +1335,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beanConstructorVisibility</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.448">beanConstructorVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.466">beanConstructorVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanConstructorVisibility"><code>BeanContext.BEAN_beanConstructorVisibility</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1313,7 +1353,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beanClassVisibility</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.459">beanClassVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.477">beanClassVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanClassVisibility"><code>BeanContext.BEAN_beanClassVisibility</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1331,7 +1371,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beanFieldVisibility</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.470">beanFieldVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.488">beanFieldVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanFieldVisibility"><code>BeanContext.BEAN_beanFieldVisibility</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1349,7 +1389,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>methodVisibility</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.481">methodVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.499">methodVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_methodVisibility"><code>BeanContext.BEAN_methodVisibility</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1367,7 +1407,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>useJavaBeanIntrospector</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.492">useJavaBeanIntrospector</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.510">useJavaBeanIntrospector</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_useJavaBeanIntrospector"><code>BeanContext.BEAN_useJavaBeanIntrospector</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1385,7 +1425,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>useInterfaceProxies</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.503">useInterfaceProxies</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.521">useInterfaceProxies</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_useInterfaceProxies"><code>BeanContext.BEAN_useInterfaceProxies</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1403,7 +1443,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreUnknownBeanProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.514">ignoreUnknownBeanProperties</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.532">ignoreUnknownBeanProperties</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_ignoreUnknownBeanProperties"><code>BeanContext.BEAN_ignoreUnknownBeanProperties</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1421,7 +1461,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreUnknownNullBeanProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.525">ignoreUnknownNullBeanProperties</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.543">ignoreUnknownNullBeanProperties</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_ignoreUnknownNullBeanProperties"><code>BeanContext.BEAN_ignoreUnknownNullBeanProperties</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1439,7 +1479,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>ignorePropertiesWithoutSetters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.536">ignorePropertiesWithoutSetters</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.554">ignorePropertiesWithoutSetters</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_ignorePropertiesWithoutSetters"><code>BeanContext.BEAN_ignorePropertiesWithoutSetters</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1457,7 +1497,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreInvocationExceptionsOnGetters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.547">ignoreInvocationExceptionsOnGetters</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.565">ignoreInvocationExceptionsOnGetters</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_ignoreInvocationExceptionsOnGetters"><code>BeanContext.BEAN_ignoreInvocationExceptionsOnGetters</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1475,7 +1515,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreInvocationExceptionsOnSetters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.558">ignoreInvocationExceptionsOnSetters</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.576">ignoreInvocationExceptionsOnSetters</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_ignoreInvocationExceptionsOnSetters"><code>BeanContext.BEAN_ignoreInvocationExceptionsOnSetters</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1493,7 +1533,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>sortProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.569">sortProperties</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.587">sortProperties</a>(boolean&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_sortProperties"><code>BeanContext.BEAN_sortProperties</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1511,7 +1551,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>notBeanPackages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.580">notBeanPackages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.598">notBeanPackages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanPackages_add"><code>BeanContext.BEAN_notBeanPackages_add</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1529,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>notBeanPackages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.591">notBeanPackages</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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.609">notBeanPackages</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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;value)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanPackages_add"><code>BeanContext.BEAN_notBeanPackages_add</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1547,7 +1587,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setNotBeanPackages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.602">setNotBeanPackages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.620">setNotBeanPackages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanPackages"><code>BeanContext.BEAN_notBeanPackages</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1565,7 +1605,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setNotBeanPackages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.613">setNotBeanPackages</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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.631">setNotBeanPackages</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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanPackages"><code>BeanContext.BEAN_notBeanPackages</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1583,7 +1623,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>removeNotBeanPackages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.624">removeNotBeanPackages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.642">removeNotBeanPackages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanPackages_remove"><code>BeanContext.BEAN_notBeanPackages_remove</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1601,7 +1641,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>removeNotBeanPackages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.635">removeNotBeanPackages</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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.653">removeNotBeanPackages</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>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanPackages_remove"><code>BeanContext.BEAN_notBeanPackages_remove</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1619,7 +1659,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>notBeanClasses</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.646">notBeanClasses</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>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.664">notBeanClasses</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>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanClasses_add"><code>BeanContext.BEAN_notBeanClasses_add</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1637,7 +1677,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>notBeanClasses</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.657">notBeanClasses</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.675">notBeanClasses</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanClasses_add"><code>BeanContext.BEAN_notBeanClasses_add</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1655,7 +1695,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setNotBeanClasses</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.668">setNotBeanClasses</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>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.686">setNotBeanClasses</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>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanClasses"><code>BeanContext.BEAN_notBeanClasses</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1673,7 +1713,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setNotBeanClasses</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.679">setNotBeanClasses</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.697">setNotBeanClasses</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanClasses"><code>BeanContext.BEAN_notBeanClasses</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1691,7 +1731,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>removeNotBeanClasses</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.690">removeNotBeanClasses</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>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.708">removeNotBeanClasses</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>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanClasses_remove"><code>BeanContext.BEAN_notBeanClasses_remove</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1709,7 +1749,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>removeNotBeanClasses</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.701">removeNotBeanClasses</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.719">removeNotBeanClasses</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_notBeanClasses_remove"><code>BeanContext.BEAN_notBeanClasses_remove</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1727,7 +1767,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beanFilters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.712">beanFilters</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>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.730">beanFilters</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>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanFilters_add"><code>BeanContext.BEAN_beanFilters_add</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1745,7 +1785,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beanFilters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.723">beanFilters</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.741">beanFilters</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanFilters_add"><code>BeanContext.BEAN_beanFilters_add</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1763,7 +1803,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setBeanFilters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.734">setBeanFilters</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>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.752">setBeanFilters</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>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanFilters"><code>BeanContext.BEAN_beanFilters</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1781,7 +1821,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setBeanFilters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.745">setBeanFilters</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.763">setBeanFilters</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanFilters"><code>BeanContext.BEAN_beanFilters</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1799,7 +1839,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>removeBeanFilters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.756">removeBeanFilters</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>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.774">removeBeanFilters</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>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanFilters_remove"><code>BeanContext.BEAN_beanFilters_remove</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1817,7 +1857,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>removeBeanFilters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.767">removeBeanFilters</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.785">removeBeanFilters</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanFilters_remove"><code>BeanContext.BEAN_beanFilters_remove</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1835,7 +1875,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>pojoSwaps</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.778">pojoSwaps</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>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.796">pojoSwaps</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>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_pojoSwaps_add"><code>BeanContext.BEAN_pojoSwaps_add</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1853,7 +1893,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>pojoSwaps</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.789">pojoSwaps</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.807">pojoSwaps</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_pojoSwaps_add"><code>BeanContext.BEAN_pojoSwaps_add</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1871,7 +1911,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setPojoSwaps</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.800">setPojoSwaps</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>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.818">setPojoSwaps</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>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_pojoSwaps"><code>BeanContext.BEAN_pojoSwaps</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1889,7 +1929,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setPojoSwaps</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.811">setPojoSwaps</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.829">setPojoSwaps</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_pojoSwaps"><code>BeanContext.BEAN_pojoSwaps</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1907,7 +1947,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>removePojoSwaps</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.822">removePojoSwaps</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>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.840">removePojoSwaps</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>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_pojoSwaps_remove"><code>BeanContext.BEAN_pojoSwaps_remove</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1925,7 +1965,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>removePojoSwaps</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.833">removePojoSwaps</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.851">removePojoSwaps</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_pojoSwaps_remove"><code>BeanContext.BEAN_pojoSwaps_remove</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1943,7 +1983,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>implClasses</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.844">implClasses</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>&lt;<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>&lt;?&gt;,<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.862">implClasses</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>&lt;<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>&lt;?&gt;,<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_implClasses"><code>BeanContext.BEAN_implClasses</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1961,7 +2001,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>implClass</h4>
-<pre>public&nbsp;&lt;T&gt;&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.858">implClass</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>&lt;T&gt;&nbsp;interfaceClass,
+<pre>public&nbsp;&lt;T&gt;&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.876">implClass</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>&lt;T&gt;&nbsp;interfaceClass,
                                             <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>&lt;? extends T&gt;&nbsp;implClass)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_implClasses_put"><code>BeanContext.BEAN_implClasses_put</code></a> property on all serializers in this group.</div>
 <dl>
@@ -1984,7 +2024,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beanDictionary</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.869">beanDictionary</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>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.887">beanDictionary</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>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanDictionary_add"><code>BeanContext.BEAN_beanDictionary_add</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2002,7 +2042,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beanDictionary</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.880">beanDictionary</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.898">beanDictionary</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanDictionary_add"><code>BeanContext.BEAN_beanDictionary_add</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2020,7 +2060,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setBeanDictionary</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.891">setBeanDictionary</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>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.909">setBeanDictionary</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>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanDictionary"><code>BeanContext.BEAN_beanDictionary</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2038,7 +2078,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setBeanDictionary</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.902">setBeanDictionary</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/serializer/SerializerGroupBuilder.html#line.920">setBeanDictionary</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>&lt;<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>&lt;?&gt;&gt;&nbsp;values)</pre>
 <div class="block">Sets the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanDictionary"><code>BeanContext.BEAN_beanDictionary</code></a> property on all serializers in this group.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2056,7 +2096,7 

<TRUNCATED>


[09/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 01718a4..6177163 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
@@ -89,929 +89,946 @@
 <span class="sourceLineNo">081</span>   private Map&lt;String,String&gt; defFormData;<a name="line.81"></a>
 <span class="sourceLineNo">082</span>   private RequestPathMatch pathParams;<a name="line.82"></a>
 <span class="sourceLineNo">083</span>   private boolean isPost;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   private String servletURI, relativeServletURI;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   private String charset, defaultCharset;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   private RequestHeaders headers;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   private ConfigFile cf;<a name="line.87"></a>
-<span class="sourceLineNo">088</span>   private Swagger swagger, fileSwagger;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   private String pageTitle, pageText, pageLinks;<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>    * Constructor.<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    */<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   RestRequest(RestContext context, HttpServletRequest req) throws ServletException {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      super(req);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      this.context = context;<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>      try {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>         isPost = req.getMethod().equalsIgnoreCase("POST");<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>         // If this is a POST, we want to parse the query parameters ourselves to prevent<a name="line.101"></a>
-<span class="sourceLineNo">102</span>         // the servlet code from processing the HTTP body as URL-Encoded parameters.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>         queryParams = new RequestQuery();<a name="line.103"></a>
-<span class="sourceLineNo">104</span>         if (isPost)<a name="line.104"></a>
-<span class="sourceLineNo">105</span>            context.getUrlEncodingParser().parseIntoSimpleMap(getQueryString(), queryParams);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>         else<a name="line.106"></a>
-<span class="sourceLineNo">107</span>            queryParams.putAll(req.getParameterMap());<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">084</span>   private UriContext uriContext;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   private String servletURI, relativeServletURI;<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   private String charset, defaultCharset;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   private RequestHeaders headers;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   private ConfigFile cf;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   private Swagger swagger, fileSwagger;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   private String pageTitle, pageText, pageLinks;<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>    * Constructor.<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    */<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   RestRequest(RestContext context, HttpServletRequest req) throws ServletException {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      super(req);<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      this.context = context;<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>      try {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>         isPost = req.getMethod().equalsIgnoreCase("POST");<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>         // If this is a POST, we want to parse the query parameters ourselves to prevent<a name="line.102"></a>
+<span class="sourceLineNo">103</span>         // the servlet code from processing the HTTP body as URL-Encoded parameters.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>         queryParams = new RequestQuery();<a name="line.104"></a>
+<span class="sourceLineNo">105</span>         if (isPost)<a name="line.105"></a>
+<span class="sourceLineNo">106</span>            context.getUrlEncodingParser().parseIntoSimpleMap(getQueryString(), queryParams);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>         else<a name="line.107"></a>
+<span class="sourceLineNo">108</span>            queryParams.putAll(req.getParameterMap());<a name="line.108"></a>
 <span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>         // Get the HTTP method.<a name="line.110"></a>
-<span class="sourceLineNo">111</span>         // Can be overridden through a "method" GET attribute.<a name="line.111"></a>
-<span class="sourceLineNo">112</span>         String _method = super.getMethod();<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>         String m = getQuery().getFirst("method");<a name="line.114"></a>
-<span class="sourceLineNo">115</span>         if (context.allowMethodParam(m))<a name="line.115"></a>
-<span class="sourceLineNo">116</span>            _method = m;<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>         method = _method;<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>         headers = new RequestHeaders();<a name="line.120"></a>
-<span class="sourceLineNo">121</span>         for (Enumeration&lt;String&gt; e = getHeaderNames(); e.hasMoreElements();) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>            String name = e.nextElement();<a name="line.122"></a>
-<span class="sourceLineNo">123</span>            headers.put(name, super.getHeaders(name));<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>         body = new RequestBody(this);<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>         if (context.isAllowBodyParam()) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>            String b = getQuery().getFirst("body");<a name="line.129"></a>
-<span class="sourceLineNo">130</span>            if (b != null) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>               headers.put("Content-Type", UonSerializer.DEFAULT.getResponseContentType());<a name="line.131"></a>
-<span class="sourceLineNo">132</span>               body.load(b.getBytes(IOUtils.UTF8));<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><a name="line.135"></a>
-<span class="sourceLineNo">136</span>         if (context.isAllowHeaderParams())<a name="line.136"></a>
-<span class="sourceLineNo">137</span>            headers.setQueryParams(queryParams);<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>         debug = "true".equals(getQuery().getFirst("debug", "false")) || "true".equals(getHeaders().getFirst("Debug", "false"));<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>         this.pathParams = new RequestPathMatch();<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>      } catch (RestException e) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>         throw e;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      } catch (Exception e) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>         throw new ServletException(e);<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>   /*<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    */<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   @SuppressWarnings("hiding")<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   final void init(Method javaMethod, ObjectMap properties, Map&lt;String,String&gt; defHeader,<a name="line.154"></a>
-<span class="sourceLineNo">155</span>         Map&lt;String,String&gt; defQuery, Map&lt;String,String&gt; defFormData, String defaultCharset,<a name="line.155"></a>
-<span class="sourceLineNo">156</span>         SerializerGroup mSerializers, ParserGroup mParsers, UrlEncodingParser mUrlEncodingParser,<a name="line.156"></a>
-<span class="sourceLineNo">157</span>         EncoderGroup encoders, String pageTitle, String pageText, String pageLinks) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      this.javaMethod = javaMethod;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      this.properties = properties;<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      this.urlEncodingParser = mUrlEncodingParser;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      this.beanSession = urlEncodingParser.getBeanContext().createSession();<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      this.pathParams<a name="line.162"></a>
-<span class="sourceLineNo">163</span>         .setParser(urlEncodingParser)<a name="line.163"></a>
-<span class="sourceLineNo">164</span>         .setBeanSession(beanSession);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      this.queryParams<a name="line.165"></a>
-<span class="sourceLineNo">166</span>         .addDefault(defQuery)<a name="line.166"></a>
-<span class="sourceLineNo">167</span>         .setParser(urlEncodingParser)<a name="line.167"></a>
-<span class="sourceLineNo">168</span>         .setBeanSession(beanSession);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      this.headers<a name="line.169"></a>
-<span class="sourceLineNo">170</span>         .addDefault(defHeader)<a name="line.170"></a>
-<span class="sourceLineNo">171</span>         .addDefault(context.getDefaultRequestHeaders())<a name="line.171"></a>
-<span class="sourceLineNo">172</span>         .setParser(urlEncodingParser)<a name="line.172"></a>
-<span class="sourceLineNo">173</span>         .setBeanSession(beanSession);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      this.body<a name="line.174"></a>
-<span class="sourceLineNo">175</span>         .setEncoders(encoders)<a name="line.175"></a>
-<span class="sourceLineNo">176</span>         .setParsers(mParsers)<a name="line.176"></a>
-<span class="sourceLineNo">177</span>         .setHeaders(headers)<a name="line.177"></a>
-<span class="sourceLineNo">178</span>         .setBeanSession(beanSession)<a name="line.178"></a>
-<span class="sourceLineNo">179</span>         .setUrlEncodingParser(mUrlEncodingParser);<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      this.serializerGroup = mSerializers;<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      this.parserGroup = mParsers;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      this.defaultCharset = defaultCharset;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      this.pageTitle = pageTitle;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      this.pageText = pageText;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      this.pageLinks = pageLinks;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      this.defFormData = defFormData;<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>      if (debug) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>         String msg = ""<a name="line.189"></a>
-<span class="sourceLineNo">190</span>            + "\n=== HTTP Request (incoming) ===================================================="<a name="line.190"></a>
-<span class="sourceLineNo">191</span>            + toString()<a name="line.191"></a>
-<span class="sourceLineNo">192</span>            + "\n=== END ========================================================================";<a name="line.192"></a>
-<span class="sourceLineNo">193</span>         context.getLogger().log(Level.WARNING, msg);<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><a name="line.196"></a>
-<span class="sourceLineNo">197</span>   /**<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    * Returns a string of the form &lt;js&gt;"HTTP method-name full-url"&lt;/js&gt;<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    *<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    * @return A description of the request.<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    */<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   public String getDescription() {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      String qs = getQueryString();<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      return "HTTP " + getMethod() + " " + getRequestURI() + (qs == null ? "" : "?" + qs);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></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 = getQuery().getFirst("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>         headers = new RequestHeaders();<a name="line.121"></a>
+<span class="sourceLineNo">122</span>         for (Enumeration&lt;String&gt; e = getHeaderNames(); e.hasMoreElements();) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>            String name = e.nextElement();<a name="line.123"></a>
+<span class="sourceLineNo">124</span>            headers.put(name, super.getHeaders(name));<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>         body = new RequestBody(this);<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>         if (context.isAllowBodyParam()) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>            String b = getQuery().getFirst("body");<a name="line.130"></a>
+<span class="sourceLineNo">131</span>            if (b != null) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>               headers.put("Content-Type", UonSerializer.DEFAULT.getResponseContentType());<a name="line.132"></a>
+<span class="sourceLineNo">133</span>               body.load(b.getBytes(IOUtils.UTF8));<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>         if (context.isAllowHeaderParams())<a name="line.137"></a>
+<span class="sourceLineNo">138</span>            headers.setQueryParams(queryParams);<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>         debug = "true".equals(getQuery().getFirst("debug", "false")) || "true".equals(getHeaders().getFirst("Debug", "false"));<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>         this.pathParams = new RequestPathMatch();<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>      } catch (RestException e) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>         throw e;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      } catch (Exception e) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>         throw new ServletException(e);<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><a name="line.150"></a>
+<span class="sourceLineNo">151</span>   /*<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    */<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   @SuppressWarnings("hiding")<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   final void init(Method javaMethod, ObjectMap properties, Map&lt;String,String&gt; defHeader,<a name="line.155"></a>
+<span class="sourceLineNo">156</span>         Map&lt;String,String&gt; defQuery, Map&lt;String,String&gt; defFormData, String defaultCharset,<a name="line.156"></a>
+<span class="sourceLineNo">157</span>         SerializerGroup mSerializers, ParserGroup mParsers, UrlEncodingParser mUrlEncodingParser,<a name="line.157"></a>
+<span class="sourceLineNo">158</span>         EncoderGroup encoders, String pageTitle, String pageText, String pageLinks) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      this.javaMethod = javaMethod;<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      this.properties = properties;<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      this.urlEncodingParser = mUrlEncodingParser;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      this.beanSession = urlEncodingParser.getBeanContext().createSession();<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      this.pathParams<a name="line.163"></a>
+<span class="sourceLineNo">164</span>         .setParser(urlEncodingParser)<a name="line.164"></a>
+<span class="sourceLineNo">165</span>         .setBeanSession(beanSession);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      this.queryParams<a name="line.166"></a>
+<span class="sourceLineNo">167</span>         .addDefault(defQuery)<a name="line.167"></a>
+<span class="sourceLineNo">168</span>         .setParser(urlEncodingParser)<a name="line.168"></a>
+<span class="sourceLineNo">169</span>         .setBeanSession(beanSession);<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      this.headers<a name="line.170"></a>
+<span class="sourceLineNo">171</span>         .addDefault(defHeader)<a name="line.171"></a>
+<span class="sourceLineNo">172</span>         .addDefault(context.getDefaultRequestHeaders())<a name="line.172"></a>
+<span class="sourceLineNo">173</span>         .setParser(urlEncodingParser)<a name="line.173"></a>
+<span class="sourceLineNo">174</span>         .setBeanSession(beanSession);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      this.body<a name="line.175"></a>
+<span class="sourceLineNo">176</span>         .setEncoders(encoders)<a name="line.176"></a>
+<span class="sourceLineNo">177</span>         .setParsers(mParsers)<a name="line.177"></a>
+<span class="sourceLineNo">178</span>         .setHeaders(headers)<a name="line.178"></a>
+<span class="sourceLineNo">179</span>         .setBeanSession(beanSession)<a name="line.179"></a>
+<span class="sourceLineNo">180</span>         .setUrlEncodingParser(mUrlEncodingParser);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      this.serializerGroup = mSerializers;<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      this.parserGroup = mParsers;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      this.defaultCharset = defaultCharset;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      this.pageTitle = pageTitle;<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      this.pageText = pageText;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      this.pageLinks = pageLinks;<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      this.defFormData = defFormData;<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span>      if (debug) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>         String msg = ""<a name="line.190"></a>
+<span class="sourceLineNo">191</span>            + "\n=== HTTP Request (incoming) ===================================================="<a name="line.191"></a>
+<span class="sourceLineNo">192</span>            + toString()<a name="line.192"></a>
+<span class="sourceLineNo">193</span>            + "\n=== END ========================================================================";<a name="line.193"></a>
+<span class="sourceLineNo">194</span>         context.getLogger().log(Level.WARNING, msg);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      }<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>    * Returns a string of the form &lt;js&gt;"HTTP method-name full-url"&lt;/js&gt;<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    *<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    * @return A description of the request.<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    */<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   public String getDescription() {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      String qs = getQueryString();<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      return "HTTP " + getMethod() + " " + getRequestURI() + (qs == null ? "" : "?" + qs);<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>   // Properties<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>    * Servlet calls this method to initialize the properties.<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    */<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   RestRequest setProperties(ObjectMap properties) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      this.properties = properties;<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      return this;<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>    * Retrieve the properties active for this request.<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    * &lt;p&gt;<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    * These properties can be modified by the request.<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    *<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    * @return The properties active for this request.<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    */<a name="line.226"></a>
-<span class="sourceLineNo">227</span>   public ObjectMap getProperties() {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      return this.properties;<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">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span>   //--------------------------------------------------------------------------------<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   // Properties<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>    * Servlet calls this method to initialize the properties.<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    */<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   RestRequest setProperties(ObjectMap properties) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      this.properties = properties;<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      return this;<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>    * Retrieve the properties active for this request.<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    * &lt;p&gt;<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    * These properties can be modified by the request.<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    *<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    * @return The properties active for this request.<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   public ObjectMap getProperties() {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      return this.properties;<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>   //--------------------------------------------------------------------------------<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   // Headers<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>    * Returns the headers on this request.<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    *<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    * @return The headers on this request.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    */<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   public RequestHeaders getHeaders() {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      return headers;<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>   @Override /* ServletRequest */<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   public String getHeader(String name) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      return getHeaders().getFirst(name);<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>   @Override /* ServletRequest */<a name="line.250"></a>
-<span class="sourceLineNo">251</span>   public Enumeration&lt;String&gt; getHeaders(String name) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      String[] v = headers.get(name);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      if (v == null || v.length == 0)<a name="line.253"></a>
-<span class="sourceLineNo">254</span>         return Collections.enumeration(Collections.EMPTY_LIST);<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      return Collections.enumeration(Arrays.asList(v));<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 media types that are valid for &lt;code&gt;Content-Type&lt;/code&gt; headers on the request.<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    *<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    * @return The set of media types registered in the parser group of this request.<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    */<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   public List&lt;MediaType&gt; getSupportedMediaTypes() {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      return parserGroup.getSupportedMediaTypes();<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>   /**<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    * Sets the charset to expect on the request body.<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    */<a name="line.269"></a>
-<span class="sourceLineNo">270</span>   @Override /* ServletRequest */<a name="line.270"></a>
-<span class="sourceLineNo">271</span>   public void setCharacterEncoding(String charset) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      this.charset = charset;<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>   /**<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    * Returns the charset specified on the &lt;code&gt;Content-Type&lt;/code&gt; header, or &lt;js&gt;"UTF-8"&lt;/js&gt; if not specified.<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    */<a name="line.277"></a>
-<span class="sourceLineNo">278</span>   @Override /* ServletRequest */<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   public String getCharacterEncoding() {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      if (charset == null) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>         // Determine charset<a name="line.281"></a>
-<span class="sourceLineNo">282</span>         // NOTE:  Don't use super.getCharacterEncoding() because the spec is implemented inconsistently.<a name="line.282"></a>
-<span class="sourceLineNo">283</span>         // Jetty returns the default charset instead of null if the character is not specified on the request.<a name="line.283"></a>
-<span class="sourceLineNo">284</span>         String h = getHeader("Content-Type");<a name="line.284"></a>
-<span class="sourceLineNo">285</span>         if (h != null) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>            int i = h.indexOf(";charset=");<a name="line.286"></a>
-<span class="sourceLineNo">287</span>            if (i &gt; 0)<a name="line.287"></a>
-<span class="sourceLineNo">288</span>               charset = h.substring(i+9).trim();<a name="line.288"></a>
-<span class="sourceLineNo">289</span>         }<a name="line.289"></a>
-<span class="sourceLineNo">290</span>         if (charset == null)<a name="line.290"></a>
-<span class="sourceLineNo">291</span>            charset = defaultCharset;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>         if (! Charset.isSupported(charset))<a name="line.292"></a>
-<span class="sourceLineNo">293</span>            throw new RestException(SC_UNSUPPORTED_MEDIA_TYPE, "Unsupported charset in header ''Content-Type'': ''{0}''", h);<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      }<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      return charset;<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>   @Override /* ServletRequest */<a name="line.298"></a>
-<span class="sourceLineNo">299</span>   public Locale getLocale() {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      String h = headers.getFirst("Accept-Language");<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      if (h != null) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>         MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>         if (mr.length &gt; 0)<a name="line.303"></a>
-<span class="sourceLineNo">304</span>            return toLocale(mr[0].getMediaType().getType());<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      return super.getLocale();<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>   @Override /* ServletRequest */<a name="line.309"></a>
-<span class="sourceLineNo">310</span>   public Enumeration&lt;Locale&gt; getLocales() {<a name="line.310"></a>
-<span class="sourceLineNo">311</span>      String h = headers.getFirst("Accept-Language");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      if (h != null) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>         MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>         if (mr.length &gt; 0) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>            List&lt;Locale&gt; l = new ArrayList&lt;Locale&gt;(mr.length);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>            for (MediaTypeRange r : mr)<a name="line.316"></a>
-<span class="sourceLineNo">317</span>               l.add(toLocale(r.getMediaType().getType()));<a name="line.317"></a>
-<span class="sourceLineNo">318</span>            return enumeration(l);<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>      return super.getLocales();<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">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span>   //--------------------------------------------------------------------------------<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   // Headers<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>    * Returns the headers on this request.<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    *<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    * @return The headers on this request.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    */<a name="line.241"></a>
+<span class="sourceLineNo">242</span>   public RequestHeaders getHeaders() {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      return headers;<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>   @Override /* ServletRequest */<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   public String getHeader(String name) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      return getHeaders().getFirst(name);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>   @Override /* ServletRequest */<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   public Enumeration&lt;String&gt; getHeaders(String name) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      String[] v = headers.get(name);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      if (v == null || v.length == 0)<a name="line.254"></a>
+<span class="sourceLineNo">255</span>         return Collections.enumeration(Collections.EMPTY_LIST);<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      return Collections.enumeration(Arrays.asList(v));<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>   /**<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    * Returns the media types that are valid for &lt;code&gt;Content-Type&lt;/code&gt; headers on the request.<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    *<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    * @return The set of media types registered in the parser group of this request.<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    */<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   public List&lt;MediaType&gt; getSupportedMediaTypes() {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      return parserGroup.getSupportedMediaTypes();<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>    * Sets the charset to expect on the request body.<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    */<a name="line.270"></a>
+<span class="sourceLineNo">271</span>   @Override /* ServletRequest */<a name="line.271"></a>
+<span class="sourceLineNo">272</span>   public void setCharacterEncoding(String charset) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      this.charset = charset;<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>    * Returns the charset specified on the &lt;code&gt;Content-Type&lt;/code&gt; header, or &lt;js&gt;"UTF-8"&lt;/js&gt; if not specified.<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    */<a name="line.278"></a>
+<span class="sourceLineNo">279</span>   @Override /* ServletRequest */<a name="line.279"></a>
+<span class="sourceLineNo">280</span>   public String getCharacterEncoding() {<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      if (charset == null) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>         // Determine charset<a name="line.282"></a>
+<span class="sourceLineNo">283</span>         // NOTE:  Don't use super.getCharacterEncoding() because the spec is implemented inconsistently.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>         // Jetty returns the default charset instead of null if the character is not specified on the request.<a name="line.284"></a>
+<span class="sourceLineNo">285</span>         String h = getHeader("Content-Type");<a name="line.285"></a>
+<span class="sourceLineNo">286</span>         if (h != null) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span>            int i = h.indexOf(";charset=");<a name="line.287"></a>
+<span class="sourceLineNo">288</span>            if (i &gt; 0)<a name="line.288"></a>
+<span class="sourceLineNo">289</span>               charset = h.substring(i+9).trim();<a name="line.289"></a>
+<span class="sourceLineNo">290</span>         }<a name="line.290"></a>
+<span class="sourceLineNo">291</span>         if (charset == null)<a name="line.291"></a>
+<span class="sourceLineNo">292</span>            charset = defaultCharset;<a name="line.292"></a>
+<span class="sourceLineNo">293</span>         if (! Charset.isSupported(charset))<a name="line.293"></a>
+<span class="sourceLineNo">294</span>            throw new RestException(SC_UNSUPPORTED_MEDIA_TYPE, "Unsupported charset in header ''Content-Type'': ''{0}''", h);<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      }<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      return charset;<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>   @Override /* ServletRequest */<a name="line.299"></a>
+<span class="sourceLineNo">300</span>   public Locale getLocale() {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      String h = headers.getFirst("Accept-Language");<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      if (h != null) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>         MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>         if (mr.length &gt; 0)<a name="line.304"></a>
+<span class="sourceLineNo">305</span>            return toLocale(mr[0].getMediaType().getType());<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      }<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      return super.getLocale();<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>   @Override /* ServletRequest */<a name="line.310"></a>
+<span class="sourceLineNo">311</span>   public Enumeration&lt;Locale&gt; getLocales() {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      String h = headers.getFirst("Accept-Language");<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      if (h != null) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>         MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>         if (mr.length &gt; 0) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span>            List&lt;Locale&gt; l = new ArrayList&lt;Locale&gt;(mr.length);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>            for (MediaTypeRange r : mr)<a name="line.317"></a>
+<span class="sourceLineNo">318</span>               l.add(toLocale(r.getMediaType().getType()));<a name="line.318"></a>
+<span class="sourceLineNo">319</span>            return enumeration(l);<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>      return super.getLocales();<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>   // Query parameters<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   //--------------------------------------------------------------------------------<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>    * Equivalent to {@link #getParameterMap()}, but only looks for query parameters in the URL, not form posts.<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    * &lt;p&gt;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    * This method can be used to retrieve query parameters without triggering the underlying servlet API to load and parse the request body.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    * &lt;p&gt;<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    * This object is modifiable.<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    *<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    * @return The query parameters as a modifiable map.<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    */<a name="line.337"></a>
-<span class="sourceLineNo">338</span>   public RequestQuery getQuery() {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      return queryParams;<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   }<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>    * Shortcut for calling &lt;code&gt;getQuery().getFirst(name)&lt;/code&gt;.<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    * @param name The query parameter name.<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    * @return The query parameter value, or &lt;jk&gt;null&lt;jk&gt; if not found.<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    */<a name="line.346"></a>
-<span class="sourceLineNo">347</span>   public String getQuery(String name) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      return getQuery().getFirst(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">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>   //--------------------------------------------------------------------------------<a name="line.326"></a>
+<span class="sourceLineNo">327</span>   // Query parameters<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>    * Equivalent to {@link #getParameterMap()}, but only looks for query parameters in the URL, not form posts.<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    * &lt;p&gt;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    * This method can be used to retrieve query parameters without triggering the underlying servlet API to load and parse the request body.<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    * &lt;p&gt;<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    * This object is modifiable.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    *<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    * @return The query parameters as a modifiable map.<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    */<a name="line.338"></a>
+<span class="sourceLineNo">339</span>   public RequestQuery getQuery() {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      return queryParams;<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>   /**<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    * Shortcut for calling &lt;code&gt;getQuery().getFirst(name)&lt;/code&gt;.<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    * @param name The query parameter name.<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    * @return The query parameter value, or &lt;jk&gt;null&lt;jk&gt; if not found.<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    */<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   public String getQuery(String name) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      return getQuery().getFirst(name);<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>   //--------------------------------------------------------------------------------<a name="line.352"></a>
-<span class="sourceLineNo">353</span>   // Form data parameters<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>   /**<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    * Retrieves the URL-encoded form data from the request if the body has already been cached locally.<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    *<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    * @return The URL-encoded form data from the request.<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    */<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   public RequestFormData getFormData() {<a name="line.361"></a>
-<span class="sourceLineNo">362</span>      try {<a name="line.362"></a>
-<span class="sourceLineNo">363</span>         if (formData == null) {<a name="line.363"></a>
-<span class="sourceLineNo">364</span>            formData = new RequestFormData();<a name="line.364"></a>
-<span class="sourceLineNo">365</span>            formData.setParser(urlEncodingParser).setBeanSession(beanSession);<a name="line.365"></a>
-<span class="sourceLineNo">366</span>            if (! body.isLoaded()) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>               formData.putAll(getParameterMap());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>            } else {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>               Map&lt;String,String&gt; m = urlEncodingParser.parse(body.getReader(), Map.class, String.class, String.class);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>               for (Map.Entry&lt;String,String&gt; e : m.entrySet()) {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>                  formData.put(e.getKey(), e.getValue());<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>         formData.addDefault(defFormData);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>         return formData;<a name="line.376"></a>
-<span class="sourceLineNo">377</span>      } catch (Exception e) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<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>   /**<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    * Shortcut for calling &lt;code&gt;getFormData().getFirst(name)&lt;/code&gt;.<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    * @param name The form data parameter name.<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    * @return The form data parameter value, or &lt;jk&gt;null&lt;jk&gt; if not found.<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    */<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   public String getFormData(String name) {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>      return getFormData().getFirst(name);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   }<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></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>   // Form data parameters<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>    * Retrieves the URL-encoded form data from the request if the body has already been cached locally.<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    *<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    * @return The URL-encoded form data from the request.<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    */<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   public RequestFormData getFormData() {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      try {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>         if (formData == null) {<a name="line.364"></a>
+<span class="sourceLineNo">365</span>            formData = new RequestFormData();<a name="line.365"></a>
+<span class="sourceLineNo">366</span>            formData.setParser(urlEncodingParser).setBeanSession(beanSession);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>            if (! body.isLoaded()) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>               formData.putAll(getParameterMap());<a name="line.368"></a>
+<span class="sourceLineNo">369</span>            } else {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>               Map&lt;String,String&gt; m = urlEncodingParser.parse(body.getReader(), Map.class, String.class, String.class);<a name="line.370"></a>
+<span class="sourceLineNo">371</span>               for (Map.Entry&lt;String,String&gt; e : m.entrySet()) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>                  formData.put(e.getKey(), e.getValue());<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>         }<a name="line.375"></a>
+<span class="sourceLineNo">376</span>         formData.addDefault(defFormData);<a name="line.376"></a>
+<span class="sourceLineNo">377</span>         return formData;<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      } catch (Exception e) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<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><a name="line.382"></a>
+<span class="sourceLineNo">383</span>   /**<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    * Shortcut for calling &lt;code&gt;getFormData().getFirst(name)&lt;/code&gt;.<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    * @param name The form data parameter name.<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    * @return The form data parameter value, or &lt;jk&gt;null&lt;jk&gt; if not found.<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    */<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   public String getFormData(String name) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      return getFormData().getFirst(name);<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>   // Path parameters<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>    * Retrieves the URL-encoded form data from the request if the body has already been cached locally.<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    *<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    * @return The URL-encoded form data from the request.<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    */<a name="line.400"></a>
-<span class="sourceLineNo">401</span>   public RequestPathMatch getPathMatch() {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      return pathParams;<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">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span>   //--------------------------------------------------------------------------------<a name="line.393"></a>
+<span class="sourceLineNo">394</span>   // Path parameters<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>    * Retrieves the URL-encoded form data from the request if the body has already been cached locally.<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    *<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    * @return The URL-encoded form data from the request.<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    */<a name="line.401"></a>
+<span class="sourceLineNo">402</span>   public RequestPathMatch getPathMatch() {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      return pathParams;<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>   //--------------------------------------------------------------------------------<a name="line.406"></a>
-<span class="sourceLineNo">407</span>   // Body methods<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>    * Returns the body of this HTTP request.<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    *<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    * @return The body of this HTTP request.<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    */<a name="line.414"></a>
-<span class="sourceLineNo">415</span>   public RequestBody getBody() {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      return body;<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>    * Returns the HTTP body content as a {@link Reader}.<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    * &lt;p&gt;<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    * If {@code allowHeaderParams} init parameter is true, then first looks for {@code &amp;body=xxx} in the URL query string.<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    * &lt;p&gt;<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    * Automatically handles GZipped input streams.<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    */<a name="line.425"></a>
-<span class="sourceLineNo">426</span>   @Override /* ServletRequest */<a name="line.426"></a>
-<span class="sourceLineNo">427</span>   public BufferedReader getReader() throws IOException {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      return getBody().getReader();<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>    * Returns the HTTP body content as an {@link InputStream}.<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    * &lt;p&gt;<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    * Automatically handles GZipped input streams.<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    *<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    * @return The negotiated input stream.<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    * @throws IOException If any error occurred while trying to get the input stream or wrap it<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    *    in the GZIP wrapper.<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    */<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   @Override /* ServletRequest */<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   public ServletInputStream getInputStream() throws IOException {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      return getBody().getInputStream();<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>   ServletInputStream getRawInputStream() throws IOException {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      return super.getInputStream();<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">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>   //--------------------------------------------------------------------------------<a name="line.407"></a>
+<span class="sourceLineNo">408</span>   // Body methods<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>    * Returns the body of this HTTP request.<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    *<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    * @return The body of this HTTP request.<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    */<a name="line.415"></a>
+<span class="sourceLineNo">416</span>   public RequestBody getBody() {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>      return body;<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>    * Returns the HTTP body content as a {@link Reader}.<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    * &lt;p&gt;<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    * If {@code allowHeaderParams} init parameter is true, then first looks for {@code &amp;body=xxx} in the URL query string.<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    * &lt;p&gt;<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    * Automatically handles GZipped input streams.<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 BufferedReader getReader() throws IOException {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      return getBody().getReader();<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>   /**<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    * Returns the HTTP body content as an {@link InputStream}.<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    * &lt;p&gt;<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    * Automatically handles GZipped input streams.<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    *<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    * @return The negotiated input stream.<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    * @throws IOException If any error occurred while trying to get the input stream or wrap it<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    *    in the GZIP wrapper.<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    */<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   @Override /* ServletRequest */<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   public ServletInputStream getInputStream() throws IOException {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      return getBody().getInputStream();<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>   ServletInputStream getRawInputStream() throws IOException {<a name="line.446"></a>
+<span class="sourceLineNo">447</span>      return super.getInputStream();<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>   // URI-related methods<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>    * Same as {@link HttpServletRequest#getPathInfo()} except returns the path undecoded.<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    *<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    * @return The undecoded portion of the URL after the resource URL path pattern match.<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    */<a name="line.458"></a>
-<span class="sourceLineNo">459</span>   public String getPathInfoUndecoded() {<a name="line.459"></a>
-<span class="sourceLineNo">460</span>      return RestUtils.getPathInfoUndecoded(this);<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>   /**<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    * Returns the value {@link #getPathInfo()} split on the &lt;js&gt;'/'&lt;/js&gt; character.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    * &lt;p&gt;<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    * If path info is &lt;jk&gt;null&lt;/jk&gt;, returns an empty list.<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    * &lt;p&gt;<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    * URL-encoded characters in segments are automatically decoded by this method.<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    *<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    * @return The decoded segments, or an empty list if path info is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    */<a name="line.471"></a>
-<span class="sourceLineNo">472</span>   public String[] getPathInfoParts() {<a name="line.472"></a>
-<span class="sourceLineNo">473</span>      String s = getPathInfoUndecoded();<a name="line.473"></a>
-<span class="sourceLineNo">474</span>      if (s == null || s.isEmpty() || s.equals("/"))<a name="line.474"></a>
-<span class="sourceLineNo">475</span>         return new String[0];<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      s = s.substring(1);<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      if (s.endsWith("/"))<a name="line.477"></a>
-<span class="sourceLineNo">478</span>         s = s.substring(0, s.length()-1);<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      boolean needsDecode = (s.indexOf('%') != -1 || s.indexOf('+') != -1);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>      String[] l = s.split("/", Integer.MAX_VALUE);<a name="line.480"></a>
-<span class="sourceLineNo">481</span>      try {<a name="line.481"></a>
-<span class="sourceLineNo">482</span>         if (needsDecode)<a name="line.482"></a>
-<span class="sourceLineNo">483</span>            for (int i = 0; i &lt; l.length; i++)<a name="line.483"></a>
-<span class="sourceLineNo">484</span>               l[i] = URLDecoder.decode(l[i], "UTF-8");<a name="line.484"></a>
-<span class="sourceLineNo">485</span>      } catch (UnsupportedEncodingException e) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>         e.printStackTrace();  // Won't happen.<a name="line.486"></a>
-<span class="sourceLineNo">487</span>      }<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      return l;<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>    * Returns a resolved URL.<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    * &lt;p&gt;<a name="line.493"></a>
-<span class="sourceLineNo">494</span>    * &lt;ul class='spaced-list'&gt;<a name="line.494"></a>
-<span class="sourceLineNo">495</span>    *    &lt;li&gt;Fully-qualified absolute URLs (e.g. &lt;js&gt;"http://..."&lt;/js&gt;, &lt;js&gt;"https://"&lt;/js&gt;) are simply converted to a URL.<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    *    &lt;li&gt;Absolute URLs (e.g. &lt;js&gt;"/foo/..."&lt;/js&gt;) are interpreted as relative to the server hostname.<a name="line.496"></a>
-<span class="sourceLineNo">497</span>    *    &lt;li&gt;Relative URLs (e.g. &lt;js&gt;"foo/..."&lt;/js&gt;) are interpreted as relative to this servlet path.<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    * &lt;/ul&gt;<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    *<a name="line.499"></a>
-<span class="sourceLineNo">500</span>    * @param path The URL path to resolve.<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    * @return The resolved URL.<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    * @throws MalformedURLException If path is not a valid URL component.<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    */<a name="line.503"></a>
-<span class="sourceLineNo">504</span>   public URL getURL(String path) throws MalformedURLException {<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      if (path.startsWith("http://") || path.startsWith("https://"))<a name="line.505"></a>
-<span class="sourceLineNo">506</span>         return new URL(path);<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      if (startsWith(path, '/'))<a name="line.507"></a>
-<span class="sourceLineNo">508</span>         return new URL(getScheme(), getLocalName(), getLocalPort(), path);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      return new URL(getScheme(), getLocalName(), getLocalPort(), getContextPath() + getServletPath() + (isEmpty(path) ? "" : ('/' + path)));<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>    * Returns the URI of the parent of this servlet.<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    *<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    * @return The URI of the parent of this servlet.<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    */<a name="line.516"></a>
-<span class="sourceLineNo">517</span>   public String getServletParentURI() {<a name="line.517"></a>
-<span class="sourceLineNo">518</span>      String s = getServletURI();<a name="line.518"></a>
-<span class="sourceLineNo">519</span>      return s.substring(0, s.lastIndexOf('/'));<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>    * Returns the URI of the parent resource.<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    * &lt;p&gt;<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    * Trailing slashes in the path are ignored by this method.<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    * &lt;p&gt;<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    * The behavior is shown below:<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    * &lt;table class='styled'&gt;<a name="line.528"></a>
-<span class="sourceLineNo">529</span>    *    &lt;tr&gt;<a name="line.529"></a>
-<span class="sourceLineNo">530</span>    *       &lt;th&gt;getRequestURI&lt;/th&gt;<a name="line.530"></a>
-<span class="sourceLineNo">531</span>    *       &lt;th&gt;getRequestParentURI&lt;/th&gt;<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    *    &lt;/tr&gt;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    *    &lt;tr&gt;<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    *       &lt;td&gt;&lt;code&gt;/foo/bar&lt;/code&gt;&lt;/td&gt;<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    *       &lt;td&gt;&lt;code&gt;/foo&lt;/code&gt;&lt;/td&gt;<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    *    &lt;/tr&gt;<a name="line.536"></a>
-<span class="sourceLineNo">537</span>    *    &lt;tr&gt;<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    *       &lt;td&gt;&lt;code&gt;/foo/bar?baz=bing&lt;/code&gt;&lt;/td&gt;<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    *       &lt;td&gt;&lt;code&gt;/foo&lt;/code&gt;&lt;/td&gt;<a name="line.539"></a>
-<span class="sourceLineNo">540</span>    *    &lt;/tr&gt;<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    *    &lt;tr&gt;<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    *       &lt;td&gt;&lt;code&gt;/foo/bar/&lt;/code&gt;&lt;/td&gt;<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    *       &lt;td&gt;&lt;code&gt;/foo&lt;/code&gt;&lt;/td&gt;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    *    &lt;/tr&gt;<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    *    &lt;tr&gt;<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    *       &lt;td&gt;&lt;code&gt;/foo/bar//&lt;/code&gt;&lt;/td&gt;<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    *       &lt;td&gt;&lt;code&gt;/foo&lt;/code&gt;&lt;/td&gt;<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    *    &lt;/tr&gt;<a name="line.548"></a>
-<span class="sourceLineNo">549</span>    *    &lt;tr&gt;<a name="line.549"></a>
-<span class="sourceLineNo">550</span>    *       &lt;td&gt;&lt;code&gt;/foo//bar//&lt;/code&gt;&lt;/td&gt;<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    *       &lt;td&gt;&lt;code&gt;/foo/&lt;/code&gt;&lt;/td&gt;<a name="line.551"></a>
-<span class="sourceLineNo">552</span>    *    &lt;/tr&gt;<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    *    &lt;tr&gt;<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    *       &lt;td&gt;&lt;code&gt;/foo&lt;/code&gt;&lt;/td&gt;<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    *       &lt;td&gt;/&lt;/td&gt;<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    *    &lt;/tr&gt;<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    * &lt;/table&gt;<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    *<a name="line.558"></a>
-<span class="sourceLineNo">559</span>    * @return The request parent URI.<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    */<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   public String getRequestParentURI() {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>      String uri = getRequestURI();<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      while (endsWith(uri, '/'))<a name="line.563"></a>
-<span class="sourceLineNo">564</span>         uri = uri.substring(0, uri.length()-1);<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      int i = uri.lastIndexOf('/');<a name="line.565"></a>
-<span class="sourceLineNo">566</span>      if (i &lt;= 0)<a name="line.566"></a>
-<span class="sourceLineNo">567</span>         return "/";<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      return uri.substring(0, i);<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>    * Same as {@link #getRequestURI()} but trims trailing slashes from the result.<a name="line.572"></a>
-<span class="sourceLineNo">573</span>    *<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    * @return The trimmed request URI.<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    */<a name="line.575"></a>
-<span class="sourceLineNo">576</span>   public String getTrimmedRequestURI() {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>      return trimTrailingSlashes(getRequestURI());<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>    * Same as {@link #getRequestURL()} but trims trailing slashes from the result.<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    *<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    * @return The trimmed request URL.<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    */<a name="line.584"></a>
-<span class="sourceLineNo">585</span>   public StringBuffer getTrimmedRequestURL() {<a name="line.585"></a>
-<span class="sourceLineNo">586</span>      return trimTrailingSlashes(getRequestURL());<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>   /**<a name="line.589"></a>
-<span class="sourceLineNo">590</span>    * Gets the URI of the servlet (e.g. &lt;js&gt;"https://localhost:9080/contextPath/servletPath"&lt;/js&gt;).<a name="line.590"></a>
-<span class="sourceLineNo">591</span>    *<a name="line.591"></a>
-<span class="sourceLineNo">592</span>    * @return The servlet URI.<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    */<a name="line.593"></a>
-<span class="sourceLineNo">594</span>   public String getServletURI() {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>      if (servletURI == null) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>         // Note that we can't use getPathInfo() to calculate this since it replaces<a name="line.596"></a>
-<span class="sourceLineNo">597</span>         // URL-encoded chars (e.g. %2F) which throws off the length calculation<a name="line.597"></a>
-<span class="sourceLineNo">598</span>         // because getRequestURL() does not replace those chars.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>         servletURI = getServletURIBuilder().toString();<a name="line.599"></a>
-<span class="sourceLineNo">600</span>      }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>      return servletURI;<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   }<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>   /**<a name="line.604"></a>
-<span class="sourceLineNo">605</span>    * Gets the path-absolute relative URI of the servlet (e.g. &lt;js&gt;"/contextPath/servletPath"&lt;/js&gt;).<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    *<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    * @return The relative servlet URI.<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    */<a name="line.608"></a>
-<span class="sourceLineNo">609</span>   public String getRelativeServletURI() {<a name="line.609"></a>
-<span class="sourceLineNo">610</span>      if (relativeServletURI == null)<a name="line.610"></a>
-<span class="sourceLineNo">611</span>         relativeServletURI = getContextPath() + getServletPath();<a name="line.611"></a>
-<span class="sourceLineNo">612</span>      return relativeServletURI;<a name="line.612"></a>
-<span class="sourceLineNo">613</span>   }<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>   /**<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    * Returns a &lt;code&gt;StringBuffer&lt;/code&gt; prefilled with the string &lt;code&gt;&lt;js&gt;"/[contextPath]/[servletPath]"&lt;/js&gt;&lt;/code&gt;.<a name="line.616"></a>
-<span class="sourceLineNo">617</span>    *<a name="line.617"></a>
-<span class="sourceLineNo">618</span>    * @return The servlet URI string builder.<a name="line.618"></a>
-<span class="sourceLineNo">619</span>    */<a name="line.619"></a>
-<span class="sourceLineNo">620</span>   public StringBuffer getServletURIBuilder() {<a name="line.620"></a>
-<span class="sourceLineNo">621</span>      return RestUtils.trimPathInfo(getRequestURL(), getContextPath(), getServletPath());<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>   //--------------------------------------------------------------------------------<a name="line.625"></a>
-<span class="sourceLineNo">626</span>   // Labels<a name="line.626"></a>
-<span class="sourceLineNo">627</span>   //--------------------------------------------------------------------------------<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>   /**<a name="line.629"></a>
-<span class="sourceLineNo">630</span>    * Returns the localized servlet title.<a name="line.630"></a>
-<span class="sourceLineNo">631</span>    * &lt;p&gt;<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    * Equivalent to calling {@link RestInfoProvider#getTitle(RestRequest)} with this object.<a name="line.632"></a>
-<span class="sourceLineNo">633</span>    *<a name="line.633"></a>
-<span class="sourceLineNo">634</span>    * @return The localized servlet label.<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    */<a name="line.635"></a>
-<span class="sourceLineNo">636</span>   public String getServletTitle() {<a name="line.636"></a>
-<span class="sourceLineNo">637</span>      return context.getInfoProvider().getTitle(this);<a name="line.637"></a>
-<span class="sourceLineNo">638</span>   }<a name="line.638"></a>
-<span class="sourceLineNo">639</span><a name="line.639"></a>
-<span class="sourceLineNo">640</span>   /**<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    * Returns the localized servlet description.<a name="line.641"></a>
-<span class="sourceLineNo">642</span>    * &lt;p&gt;<a name="line.642"></a>
-<span class="sourceLineNo">643</span>    * Equivalent to calling {@link RestInfoProvider#getDescription(RestRequest)} with this object.<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    *<a name="line.644"></a>
-<span class="sourceLineNo">645</span>    * @return The localized servlet description.<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    */<a name="line.646"></a>
-<span class="sourceLineNo">647</span>   public String getServletDescription() {<a name="line.647"></a>
-<span class="sourceLineNo">648</span>      return context.getInfoProvider().getDescription(this);<a name="line.648"></a>
-<span clas

<TRUNCATED>


[33/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/SimpleHtmlWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/SimpleHtmlWriter.html b/content/site/apidocs/org/apache/juneau/html/SimpleHtmlWriter.html
index b698e80..0e91611 100644
--- a/content/site/apidocs/org/apache/juneau/html/SimpleHtmlWriter.html
+++ b/content/site/apidocs/org/apache/juneau/html/SimpleHtmlWriter.html
@@ -157,7 +157,7 @@ extends <a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="clas
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#absolutePathUriBase">absolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#out">out</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#quoteChar">quoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#relativeUriBase">relativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#trimStrings">trimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#useWhitespace">useWhitespace</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#absolutePathUriBase">absolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#out">out</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#quoteChar">quoteChar</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#relativeUriBase">relativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#trimStrings">trimStrings</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#uriContext">uriContext</a>, <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#useWhitespace">useWhitespace</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="fields.inherited.from.class.java.io.Writer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/annotation/Html.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/annotation/Html.html b/content/site/apidocs/org/apache/juneau/html/annotation/Html.html
index 032b441..ba081ba 100644
--- a/content/site/apidocs/org/apache/juneau/html/annotation/Html.html
+++ b/content/site/apidocs/org/apache/juneau/html/annotation/Html.html
@@ -130,17 +130,29 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/html/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/html/annotation/Html.html#link--">link</a></span></code>
+<div class="block">Adds a hyperlink to a bean property when rendered as HTML.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/html/annotation/Html.html#noTableHeaders--">noTableHeaders</a></span></code>
 <div class="block">When <jk>true</jk>, don't add headers to tables.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/html/annotation/Html.html#noTables--">noTables</a></span></code>
 <div class="block">When <jk>true</jk>, collections of beans should be rendered as trees instead of tables.</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>&lt;? extends <a href="../../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html">HtmlRender</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/html/annotation/Html.html#render--">render</a></span></code>
+<div class="block">Associates an <a href="../../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html"><code>HtmlRender</code></a> with a bean property for custom HTML rendering of the property.</div>
+</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -214,7 +226,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/html/annota
 <li class="blockList"><a name="noTableHeaders--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>noTableHeaders</h4>
 <pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/juneau/html/annotation/Html.html#line.55">noTableHeaders</a></pre>
@@ -228,6 +240,64 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/html/annota
 </ul>
 </li>
 </ul>
+<ul class="blockList">
+<li class="blockList"><a name="render--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>render</h4>
+<pre>public abstract&nbsp;<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>&lt;? extends <a href="../../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html">HtmlRender</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/juneau/html/annotation/Html.html#line.63">render</a></pre>
+<div class="block">Associates an <a href="../../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html"><code>HtmlRender</code></a> with a bean property for custom HTML rendering of the property.
+ <p>
+ This annotation applies to bean properties only.</div>
+<dl>
+<dt>Default:</dt>
+<dd>org.apache.juneau.html.HtmlRender.class</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="link--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>link</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/html/annotation/Html.html#line.90">link</a></pre>
+<div class="block">Adds a hyperlink to a bean property when rendered as HTML.
+ <p>
+ The text can contain any bean property values resolved through variables of the form <js>"{property-name}"</js>.
+ <p>
+ The URLs can be any of the following forms:
+ <ul>
+   <li>Absolute - e.g. <js>"http://host:123/myContext/myServlet/myPath"</js>
+   <li>Context-root-relative - e.g. <js>"/myContext/myServlet/myPath"</js>
+   <li>Context-relative - e.g. <js>"context:/myServlet/myPath"</js>
+   <li>Servlet-relative - e.g. <js>"servlet:/myPath"</js>
+   <li>Path-info-relative - e.g. <js>"myPath"</js>
+ </ul>
+
+ <h6 class='figure'>Example:</h6>
+ <p class='bcode'>
+   <jk>public class</jk> FileSpace {
+
+      <ja>@Html</ja>(link=<js>"servlet:/drive/{drive}"</js>)
+      <jk>public</jk> String getDrive() {
+         ...;
+      }
+   }
+ </p></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
 </li>
 </ul>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/doc-files/HtmlRender_1.png
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/doc-files/HtmlRender_1.png b/content/site/apidocs/org/apache/juneau/html/doc-files/HtmlRender_1.png
new file mode 100644
index 0000000..f070aea
Binary files /dev/null and b/content/site/apidocs/org/apache/juneau/html/doc-files/HtmlRender_1.png differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/package-frame.html b/content/site/apidocs/org/apache/juneau/html/package-frame.html
index f5c5c52..144e1d4 100644
--- a/content/site/apidocs/org/apache/juneau/html/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/html/package-frame.html
@@ -22,6 +22,7 @@
 <li><a href="HtmlParserBuilder.html" title="class in org.apache.juneau.html" target="classFrame">HtmlParserBuilder</a></li>
 <li><a href="HtmlParserContext.html" title="class in org.apache.juneau.html" target="classFrame">HtmlParserContext</a></li>
 <li><a href="HtmlParserSession.html" title="class in org.apache.juneau.html" target="classFrame">HtmlParserSession</a></li>
+<li><a href="HtmlRender.html" title="class in org.apache.juneau.html" target="classFrame">HtmlRender</a></li>
 <li><a href="HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html" target="classFrame">HtmlSchemaDocSerializer</a></li>
 <li><a href="HtmlSerializer.html" title="class in org.apache.juneau.html" target="classFrame">HtmlSerializer</a></li>
 <li><a href="HtmlSerializer.Sq.html" title="class in org.apache.juneau.html" target="classFrame">HtmlSerializer.Sq</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/package-summary.html b/content/site/apidocs/org/apache/juneau/html/package-summary.html
index c3231b1..24055fc 100644
--- a/content/site/apidocs/org/apache/juneau/html/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/html/package-summary.html
@@ -140,60 +140,66 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html">HtmlRender</a>&lt;T&gt;</td>
+<td class="colLast">
+<div class="block">Allows custom rendering of bean property values when serialized as HTML.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html">HtmlSchemaDocSerializer</a></td>
 <td class="colLast">
 <div class="block">Serializes POJO metamodels to HTML.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a></td>
 <td class="colLast">
 <div class="block">Serializes POJO models to HTML.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/html/HtmlSerializer.Sq.html" title="class in org.apache.juneau.html">HtmlSerializer.Sq</a></td>
 <td class="colLast">
 <div class="block">Default serializer, single quotes.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/html/HtmlSerializer.SqReadable.html" title="class in org.apache.juneau.html">HtmlSerializer.SqReadable</a></td>
 <td class="colLast">
 <div class="block">Default serializer, single quotes, whitespace added.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/html/HtmlSerializerBuilder.html" title="class in org.apache.juneau.html">HtmlSerializerBuilder</a></td>
 <td class="colLast">
 <div class="block">Builder class for building instances of HTML serializers.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/html/HtmlSerializerContext.html" title="class in org.apache.juneau.html">HtmlSerializerContext</a></td>
 <td class="colLast">
 <div class="block">Configurable properties on the <a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html"><code>HtmlSerializer</code></a> class.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html" title="class in org.apache.juneau.html">HtmlSerializerSession</a></td>
 <td class="colLast">
 <div class="block">Session object that lives for the duration of a single use of <a href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html"><code>HtmlSerializer</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.html" title="class in org.apache.juneau.html">HtmlStrippedDocSerializer</a></td>
 <td class="colLast">
 <div class="block">Serializes POJOs to HTTP responses as stripped HTML.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/html/HtmlWriter.html" title="class in org.apache.juneau.html">HtmlWriter</a></td>
 <td class="colLast">
 <div class="block">Specialized writer for serializing HTML.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/html/SimpleHtmlWriter.html" title="class in org.apache.juneau.html">SimpleHtmlWriter</a></td>
 <td class="colLast">
 <div class="block">Utility class for creating custom HTML.</div>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/html/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/package-tree.html b/content/site/apidocs/org/apache/juneau/html/package-tree.html
index b5baf26..443a9ba 100644
--- a/content/site/apidocs/org/apache/juneau/html/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/html/package-tree.html
@@ -186,6 +186,7 @@
 </li>
 </ul>
 </li>
+<li type="circle">org.apache.juneau.html.<a href="../../../../org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html"><span class="typeNameLink">HtmlRender</span></a>&lt;T&gt;</li>
 <li type="circle">org.apache.juneau.<a href="../../../../org/apache/juneau/Session.html" title="class in org.apache.juneau"><span class="typeNameLink">Session</span></a>
 <ul>
 <li type="circle">org.apache.juneau.<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau"><span class="typeNameLink">BeanSession</span></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/internal/DelegateBeanMap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/internal/DelegateBeanMap.html b/content/site/apidocs/org/apache/juneau/internal/DelegateBeanMap.html
index 448db14..7ca75d7 100644
--- a/content/site/apidocs/org/apache/juneau/internal/DelegateBeanMap.html
+++ b/content/site/apidocs/org/apache/juneau/internal/DelegateBeanMap.html
@@ -267,7 +267,7 @@ extends <a href="../../../../org/apache/juneau/BeanMap.html" title="class in org
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanMap.html" title="class in org.apache.juneau">BeanMap</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanMap.html#add-java.lang.String-java.lang.Object-">add</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getBean--">getBean</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getBean-boolean-">getBean</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getBeanSession--">getBeanSession</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getClassMeta--">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getProperty-java.lang.String-">getProperty</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getPropertyMeta-java.lang.String-">getPropertyMeta</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getValues-boolean-org.apache.juneau.BeanPropertyValue...-">getValues</a>, <a href="../../../../org/apache/juneau/BeanMap.html#load-java.util.Map-">load</a>, <a href="../../../../org/apache/juneau/BeanMap.html#load-java.io.Reader-org.apache.juneau.parser.ReaderParser-">load</a>, <a href="../../.
 ./../org/apache/juneau/BeanMap.html#load-java.lang.String-">load</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanMap.html#add-java.lang.String-java.lang.Object-">add</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getBean--">getBean</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getBean-boolean-">getBean</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getBeanSession--">getBeanSession</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getClassMeta--">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getProperty-java.lang.String-">getProperty</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getPropertyMeta-java.lang.String-">getPropertyMeta</a>, <a href="../../../../org/apache/juneau/BeanMap.html#getValues-boolean-org.apache.juneau.BeanPropertyValue...-">getValues</a>, <a href="../../../../org/apache/juneau/BeanMap.html#load-java.util.Map-">load</a>, <a href="../../../../org/apache/juneau/BeanMap.html#load-java.io.Reader-org.apache.juneau.parser.ReaderParser-">load</a>, <a href="../../.
 ./../org/apache/juneau/BeanMap.html#load-java.lang.String-">load</a>, <a href="../../../../org/apache/juneau/BeanMap.html#resolveVars-java.lang.String-">resolveVars</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.util.AbstractMap">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/internal/StringUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/internal/StringUtils.html b/content/site/apidocs/org/apache/juneau/internal/StringUtils.html
index d4b3e82..68c0fb6 100644
--- a/content/site/apidocs/org/apache/juneau/internal/StringUtils.html
+++ b/content/site/apidocs/org/apache/juneau/internal/StringUtils.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9,"i35":9,"i36":9,"i37":9,"i38":9,"i39":9,"i40":9,"i41":9,"i42":9,"i43":9,"i44":9,"i45":9,"i46":9,"i47":9,"i48":9,"i49":9,"i50":9,"i51":9,"i52":9,"i53":9,"i54":9,"i55":9,"i56":9};
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9,"i35":9,"i36":9,"i37":9,"i38":9,"i39":9,"i40":9,"i41":9,"i42":9,"i43":9,"i44":9,"i45":9,"i46":9,"i47":9,"i48":9,"i49":9,"i50":9,"i51":9,"i52":9,"i53":9,"i54":9,"i55":9,"i56":9,"i57":9,"i58":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -217,13 +217,19 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </tr>
 <tr id="i11" 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/internal/StringUtils.html#getAuthorityUri-java.lang.String-">getAuthorityUri</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>&nbsp;s)</code>
+<div class="block">Given an absolute URI, returns just the authority portion (e.g.</div>
+</td>
+</tr>
+<tr id="i12" 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/internal/StringUtils.html#getField-int-java.lang.String-char-">getField</a></span>(int&nbsp;fieldNum,
         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
         char&nbsp;delim)</code>
 <div class="block">Returns the specified field in a delimited string without splitting the string.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" 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/internal/StringUtils.html#getField-int-java.lang.String-char-java.lang.String-">getField</a></span>(int&nbsp;fieldNum,
         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
@@ -232,77 +238,83 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#getField-int-java.lang.String-char-"><code>getField(int, String, char)</code></a> except allows you to specify the default value.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" 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/internal/StringUtils.html#getStackTrace-java.lang.Throwable-">getStackTrace</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>&nbsp;t)</code>
 <div class="block">Convenience method for getting a stack trace as a string.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#isAbsoluteUri-java.lang.String-">isAbsoluteUri</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>&nbsp;s)</code>
+<div class="block">Efficiently determines whether a URL is of the pattern "xxx://xxx"</div>
+</td>
+</tr>
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#isDecimal-java.lang.String-">isDecimal</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>&nbsp;s)</code>
 <div class="block">Returns <jk>true</jk> if the specified string is numeric.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#isEmpty-java.lang.Object-">isEmpty</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>&nbsp;s)</code>
 <div class="block">Returns <jk>true</jk> if specified string is <jk>null</jk> or it's <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> method returns an empty string.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#isEmpty-java.lang.String-">isEmpty</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>&nbsp;s)</code>
 <div class="block">Returns <jk>true</jk> if specified string is <jk>null</jk> or empty.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#isEquals-java.lang.String-java.lang.String-">isEquals</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>&nbsp;s1,
         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s2)</code>
 <div class="block">Tests two strings for equality, but gracefully handles nulls.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#isFirstNumberChar-char-">isFirstNumberChar</a></span>(char&nbsp;c)</code>
 <div class="block">Returns <jk>true</jk> if the specified character is a valid first character for a number.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#isFloat-java.lang.String-">isFloat</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>&nbsp;s)</code>
 <div class="block">Returns <jk>true</jk> if the specified string is a floating point number.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#isNumeric-java.lang.String-">isNumeric</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>&nbsp;s)</code>
 <div class="block">Returns <jk>true</jk> if this string can be parsed by <a href="../../../../org/apache/juneau/internal/StringUtils.html#parseNumber-java.lang.String-java.lang.Class-"><code>parseNumber(String, Class)</code></a>.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#isOneOf-java.lang.String-java.lang.String...-">isOneOf</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>&nbsp;s,
        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</code>
 <div class="block">Returns <jk>true</jk> if the specified string is one of the specified values.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i24" 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/internal/StringUtils.html#join-java.util.Collection-char-">join</a></span>(<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>&lt;?&gt;&nbsp;tokens,
     char&nbsp;d)</code>
 <div class="block">Join the specified tokens into a delimited string.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i25" 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/internal/StringUtils.html#join-java.util.Collection-java.lang.String-">join</a></span>(<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>&lt;?&gt;&nbsp;tokens,
     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;d)</code>
 <div class="block">Join the specified tokens into a delimited string.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>static <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/internal/StringUtils.html#join-java.util.Collection-java.lang.String-java.lang.StringBuilder-">join</a></span>(<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>&lt;?&gt;&nbsp;tokens,
     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;d,
@@ -310,28 +322,28 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="block">Joins the specified tokens into a delimited string and writes the output to the specified string builder.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i27" 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/internal/StringUtils.html#join-int:A-char-">join</a></span>(int[]&nbsp;tokens,
     char&nbsp;d)</code>
 <div class="block">Join the specified tokens into a delimited string.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i28" 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/internal/StringUtils.html#join-int:A-java.lang.String-">join</a></span>(int[]&nbsp;tokens,
     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;d)</code>
 <div class="block">Join the specified tokens into a delimited string.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i29" 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/internal/StringUtils.html#join-java.lang.Object:A-char-">join</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>[]&nbsp;tokens,
     char&nbsp;d)</code>
 <div class="block">Joins the specified tokens into a delimited string.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>static <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/internal/StringUtils.html#join-java.lang.Object:A-char-java.lang.StringBuilder-">join</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>[]&nbsp;tokens,
     char&nbsp;d,
@@ -339,73 +351,73 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="block">Join the specified tokens into a delimited string and writes the output to the specified string builder.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i31" 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/internal/StringUtils.html#join-java.lang.Object:A-java.lang.String-">join</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>[]&nbsp;tokens,
     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;separator)</code>
 <div class="block">Join the specified tokens into a delimited string.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i32" 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/internal/StringUtils.html#nullIfEmpty-java.lang.String-">nullIfEmpty</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>&nbsp;s)</code>
 <div class="block">Returns <jk>null</jk> if the specified string is <jk>null</jk> or empty.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code>static <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></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#parseISO8601Date-java.lang.String-">parseISO8601Date</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>&nbsp;date)</code>
 <div class="block">Parses an ISO8601 string into a date.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code>static <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/internal/StringUtils.html#parseNumber-org.apache.juneau.parser.ParserReader-java.lang.Class-">parseNumber</a></span>(<a href="../../../../org/apache/juneau/parser/ParserReader.html" title="class in org.apache.juneau.parser">ParserReader</a>&nbsp;r,
            <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>&lt;? 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>&gt;&nbsp;type)</code>
 <div class="block">Parses a number from the specified reader stream.</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code>static <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/internal/StringUtils.html#parseNumber-java.lang.String-java.lang.Class-">parseNumber</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>&nbsp;s,
            <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>&lt;? 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>&gt;&nbsp;type)</code>
 <div class="block">Parses a number from the specified string.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i36" 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/internal/StringUtils.html#parseNumberString-org.apache.juneau.parser.ParserReader-">parseNumberString</a></span>(<a href="../../../../org/apache/juneau/parser/ParserReader.html" title="class in org.apache.juneau.parser">ParserReader</a>&nbsp;r)</code>
 <div class="block">Reads a numeric string from the specified reader.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr id="i37" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#pathStartsWith-java.lang.String-java.lang.String-">pathStartsWith</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>&nbsp;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>&nbsp;pathPrefix)</code>
 <div class="block">Returns <jk>true</jk> if the specified path string is prefixed with the specified prefix.</div>
 </td>
 </tr>
-<tr id="i36" class="altColor">
+<tr id="i38" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#pathStartsWith-java.lang.String-java.lang.String:A-">pathStartsWith</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>&nbsp;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>[]&nbsp;pathPrefixes)</code>
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#pathStartsWith-java.lang.String-java.lang.String-"><code>pathStartsWith(String, String)</code></a> but returns <jk>true</jk> if at least one prefix matches.</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr id="i39" 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/internal/StringUtils.html#repeat-int-java.lang.String-">repeat</a></span>(int&nbsp;count,
       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pattern)</code>
 <div class="block">Creates a repeated pattern.</div>
 </td>
 </tr>
-<tr id="i38" class="altColor">
+<tr id="i40" 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/internal/StringUtils.html#replaceUnicodeSequences-java.lang.String-">replaceUnicodeSequences</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>&nbsp;s)</code>
 <div class="block">Replaces <js>"\\uXXXX"</js> character sequences with their unicode characters.</div>
 </td>
 </tr>
-<tr id="i39" class="rowColor">
+<tr id="i41" 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/internal/StringUtils.html#replaceVars-java.lang.String-java.util.Map-">replaceVars</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>&nbsp;s,
            <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>&lt;<a href="http://docs.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>&gt;&nbsp;m)</code>
@@ -413,21 +425,21 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
    in the specified map.</div>
 </td>
 </tr>
-<tr id="i40" class="altColor">
+<tr id="i42" 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/internal/StringUtils.html#split-java.lang.String:A-char-">split</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>[]&nbsp;s,
      char&nbsp;c)</code>
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#split-java.lang.String-char-"><code>split(String, char)</code></a> except splits all strings in the input and returns a single result.</div>
 </td>
 </tr>
-<tr id="i41" class="rowColor">
+<tr id="i43" 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/internal/StringUtils.html#split-java.lang.String-char-">split</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>&nbsp;s,
      char&nbsp;c)</code>
 <div class="block">Splits a character-delimited string into a string array.</div>
 </td>
 </tr>
-<tr id="i42" class="altColor">
+<tr id="i44" class="altColor">
 <td class="colFirst"><code>static <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>&lt;<a href="http://docs.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>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#splitMap-java.lang.String-char-char-boolean-">splitMap</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>&nbsp;s,
         char&nbsp;delim,
@@ -436,75 +448,75 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="block">Splits a list of key-value pairs into an ordered map.</div>
 </td>
 </tr>
-<tr id="i43" class="rowColor">
+<tr id="i45" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#startsWith-java.lang.String-char-">startsWith</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>&nbsp;s,
           char&nbsp;c)</code>
 <div class="block">An efficient method for checking if a string starts with a character.</div>
 </td>
 </tr>
-<tr id="i44" class="altColor">
+<tr id="i46" 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/internal/StringUtils.html#toHex-byte:A-">toHex</a></span>(byte[]&nbsp;bytes)</code>
 <div class="block">Converts a byte array into a simple hexadecimal character string.</div>
 </td>
 </tr>
-<tr id="i45" class="rowColor">
+<tr id="i47" class="rowColor">
 <td class="colFirst"><code>static char[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#toHex-int-">toHex</a></span>(int&nbsp;num)</code>
 <div class="block">Converts the specified number into a 4 hexadecimal characters.</div>
 </td>
 </tr>
-<tr id="i46" class="altColor">
+<tr id="i48" 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/internal/StringUtils.html#toString-java.lang.Object-">toString</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>&nbsp;o)</code>
 <div class="block">Calls <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> on the specified object if it's not null.</div>
 </td>
 </tr>
-<tr id="i47" class="rowColor">
+<tr id="i49" 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/internal/StringUtils.html#trim-java.lang.String-">trim</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>&nbsp;s)</code>
 <div class="block">Same as <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true#trim--" title="class or interface in java.lang"><code>String.trim()</code></a> but prevents <code>NullPointerExceptions</code>.</div>
 </td>
 </tr>
-<tr id="i48" class="altColor">
+<tr id="i50" 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/internal/StringUtils.html#trimEnd-java.lang.String-">trimEnd</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>&nbsp;s)</code>
 <div class="block">Trims whitespace characters from the end of the specified string.</div>
 </td>
 </tr>
-<tr id="i49" class="rowColor">
+<tr id="i51" 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/internal/StringUtils.html#trimSlashes-java.lang.String-">trimSlashes</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>&nbsp;s)</code>
 <div class="block">Trims <js>'/'</js> characters from both the start and end of the specified string.</div>
 </td>
 </tr>
-<tr id="i50" class="altColor">
+<tr id="i52" 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/internal/StringUtils.html#trimStart-java.lang.String-">trimStart</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>&nbsp;s)</code>
 <div class="block">Trims whitespace characters from the beginning of the specified string.</div>
 </td>
 </tr>
-<tr id="i51" class="rowColor">
+<tr id="i53" 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/internal/StringUtils.html#trimTrailingSlashes-java.lang.String-">trimTrailingSlashes</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>&nbsp;s)</code>
 <div class="block">Trims <js>'/'</js> characters from the end of the specified string.</div>
 </td>
 </tr>
-<tr id="i52" class="altColor">
+<tr id="i54" class="altColor">
 <td class="colFirst"><code>static <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/internal/StringUtils.html#trimTrailingSlashes-java.lang.StringBuffer-">trimTrailingSlashes</a></span>(<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>&nbsp;s)</code>
 <div class="block">Trims <js>'/'</js> characters from the end of the specified string.</div>
 </td>
 </tr>
-<tr id="i53" class="rowColor">
+<tr id="i55" 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/internal/StringUtils.html#unEscapeChars-java.lang.String-char:A-">unEscapeChars</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>&nbsp;s,
              char[]&nbsp;toEscape)</code>
 <div class="block">Removes escape characters (\) from the specified characters.</div>
 </td>
 </tr>
-<tr id="i54" class="altColor">
+<tr id="i56" 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/internal/StringUtils.html#unEscapeChars-java.lang.String-char:A-char-">unEscapeChars</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>&nbsp;s,
              char[]&nbsp;toEscape,
@@ -512,13 +524,13 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="block">Removes escape characters (specified by escapeChar) from the specified characters.</div>
 </td>
 </tr>
-<tr id="i55" class="rowColor">
+<tr id="i57" 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/internal/StringUtils.html#urlDecode-java.lang.String-">urlDecode</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>&nbsp;s)</code>
 <div class="block">Decodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.</div>
 </td>
 </tr>
-<tr id="i56" class="altColor">
+<tr id="i58" 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/internal/StringUtils.html#urlEncode-java.lang.String-">urlEncode</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>&nbsp;s)</code>
 <div class="block">Encodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.</div>
@@ -1618,7 +1630,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <a name="charAt-java.lang.String-int-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>charAt</h4>
 <pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1328">charAt</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
@@ -1634,6 +1646,38 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="isAbsoluteUri-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isAbsoluteUri</h4>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1342">isAbsoluteUri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<div class="block">Efficiently determines whether a URL is of the pattern "xxx://xxx"</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>s</code> - The string to test.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if it's an absolute path.</dd>
+</dl>
+</li>
+</ul>
+<a name="getAuthorityUri-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getAuthorityUri</h4>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1391">getAuthorityUri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<div class="block">Given an absolute URI, returns just the authority portion (e.g. <js>"http://hostname:port"</js>)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>s</code> - The URI string.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Just the authority portion of the URI.</dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/jena/RdfParserContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfParserContext.html b/content/site/apidocs/org/apache/juneau/jena/RdfParserContext.html
index 7e26ce5..a068ddf 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfParserContext.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfParserContext.html
@@ -238,7 +238,7 @@ implements <a href="../../../../org/apache/juneau/jena/RdfCommonContext.html" ti
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.N3.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.N3.html b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.N3.html
index 961b19f..53b86f1 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.N3.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.N3.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="c
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.jena.<a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena">RdfSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code></li>
+<code><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.NTriple.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.NTriple.html b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.NTriple.html
index 8fcd709..4ee29eb 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.NTriple.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.NTriple.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="c
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.jena.<a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena">RdfSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code></li>
+<code><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.Turtle.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.Turtle.html b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.Turtle.html
index d5d930c..0e82120 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.Turtle.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.Turtle.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="c
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.jena.<a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena">RdfSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code></li>
+<code><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.Xml.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.Xml.html b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.Xml.html
index 66f2d46..be3e274 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.Xml.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.Xml.html
@@ -223,7 +223,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="c
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.jena.<a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena">RdfSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code></li>
+<code><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html
index 8ffc923..ef8f13e 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html
@@ -224,7 +224,7 @@ extends <a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="c
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.jena.<a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena">RdfSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code></li>
+<code><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/jena/RdfSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.html b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.html
index 5e8710e..51ba317 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfSerializer.html
@@ -295,12 +295,13 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/jena/RdfSerializerSession.html" title="class in org.apache.juneau.jena">RdfSerializerSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</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>&nbsp;output,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/jena/RdfSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</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>&nbsp;output,
              <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;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>&nbsp;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>&nbsp;locale,
              <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>&nbsp;timeZone,
-             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</code>
+             <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+             <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</code>
 <div class="block">Create the session object that will be passed in to the serialize method.</div>
 </td>
 </tr>
@@ -469,7 +470,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)</code></a>.<br>
+<dd><code>session</code> - The serializer session object return by <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-"><code>Serializer.createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)</code></a>.<br>
  If <jk>null</jk>, session is created using <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-"><code>Serializer.createSession(Object)</code></a>.</dd>
 <dd><code>o</code> - The object to serialize.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -477,7 +478,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 </dl>
 </li>
 </ul>
-<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">
+<a name="createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -488,15 +489,16 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
                                           <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>&nbsp;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>&nbsp;locale,
                                           <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>&nbsp;timeZone,
-                                          <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">Serializer</a></code></span></div>
+                                          <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType,
+                                          <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;uriContext)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">Serializer</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the serialize method.
  <p>
  It's up to implementers to decide what the session object looks like, although typically
    it's going to be a subclass of <a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer"><code>SerializerSession</code></a>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>output</code> - The output object.
    <br>Character-based serializers can handle the following output class types:
@@ -519,6 +521,8 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <dd><code>timeZone</code> - The session timezone.
  If <jk>null</jk>, then the timezone defined on the context is used.</dd>
 <dd><code>mediaType</code> - The session media type (e.g. <js>"application/json"</js>).</dd>
+<dd><code>uriContext</code> - The URI context.
+   Identifies the current request URI used for resolution of URIs to absolute or root-relative form.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The new session.</dd>
 </dl>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/org/apache/juneau/jena/RdfSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/jena/RdfSerializerContext.html b/content/site/apidocs/org/apache/juneau/jena/RdfSerializerContext.html
index 882128e..f3cb57e 100644
--- a/content/site/apidocs/org/apache/juneau/jena/RdfSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/jena/RdfSerializerContext.html
@@ -262,7 +262,7 @@ implements <a href="../../../../org/apache/juneau/jena/RdfCommonContext.html" ti
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--
 ">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.ObjectMap-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/a
 pache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Type-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.uti
 l.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">


[39/39] 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/37ddf434
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/tree/37ddf434
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/diff/37ddf434

Branch: refs/heads/asf-site
Commit: 37ddf434369ee893f91fa670d11b1adeb6c2e9a9
Parents: e53bcce
Author: JamesBognar <ja...@apache.org>
Authored: Sun May 21 05:02:41 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Sun May 21 05:02:41 2017 -0400

----------------------------------------------------------------------
 content/site/apidocs/allclasses-frame.html      |    5 +
 content/site/apidocs/allclasses-noframe.html    |    5 +
 content/site/apidocs/doc-files/HtmlRender_1.png |  Bin 0 -> 60161 bytes
 content/site/apidocs/index-all.html             |  227 +-
 .../apidocs/org/apache/juneau/BeanContext.html  |   60 +-
 .../site/apidocs/org/apache/juneau/BeanMap.html |   30 +-
 .../juneau/BeanProxyInvocationHandler.html      |    6 +-
 .../apidocs/org/apache/juneau/Streamable.html   |    4 +-
 .../apidocs/org/apache/juneau/UriContext.html   |  643 ++++
 .../org/apache/juneau/UriRelativity.html        |  347 ++
 .../org/apache/juneau/UriResolution.html        |  362 ++
 .../apidocs/org/apache/juneau/Visibility.html   |    4 +-
 .../org/apache/juneau/csv/CsvParserContext.html |    2 +-
 .../org/apache/juneau/csv/CsvSerializer.html    |    4 +-
 .../apache/juneau/csv/CsvSerializerContext.html |    2 +-
 .../apache/juneau/csv/CsvSerializerSession.html |   24 +-
 .../juneau/html/HtmlBeanPropertyMeta.html       |   69 +-
 .../apache/juneau/html/HtmlDocSerializer.html   |   18 +-
 .../juneau/html/HtmlDocSerializerContext.html   |    2 +-
 .../juneau/html/HtmlDocSerializerSession.html   |   38 +-
 .../apache/juneau/html/HtmlParserContext.html   |    2 +-
 .../apache/juneau/html/HtmlParserSession.html   |    4 +-
 .../org/apache/juneau/html/HtmlRender.html      |  420 +++
 .../juneau/html/HtmlSchemaDocSerializer.html    |   22 +-
 .../apache/juneau/html/HtmlSerializer.Sq.html   |    2 +-
 .../juneau/html/HtmlSerializer.SqReadable.html  |    2 +-
 .../org/apache/juneau/html/HtmlSerializer.html  |   24 +-
 .../juneau/html/HtmlSerializerContext.html      |    2 +-
 .../juneau/html/HtmlSerializerSession.html      |   36 +-
 .../juneau/html/HtmlStrippedDocSerializer.html  |    4 +-
 .../org/apache/juneau/html/HtmlWriter.html      |  104 +-
 .../apache/juneau/html/SimpleHtmlWriter.html    |    2 +-
 .../org/apache/juneau/html/annotation/Html.html |   74 +-
 .../juneau/html/doc-files/HtmlRender_1.png      |  Bin 0 -> 60161 bytes
 .../org/apache/juneau/html/package-frame.html   |    1 +
 .../org/apache/juneau/html/package-summary.html |   24 +-
 .../org/apache/juneau/html/package-tree.html    |    1 +
 .../apache/juneau/internal/DelegateBeanMap.html |    2 +-
 .../org/apache/juneau/internal/StringUtils.html |  138 +-
 .../apache/juneau/jena/RdfParserContext.html    |    2 +-
 .../apache/juneau/jena/RdfSerializer.N3.html    |    2 +-
 .../juneau/jena/RdfSerializer.NTriple.html      |    2 +-
 .../juneau/jena/RdfSerializer.Turtle.html       |    2 +-
 .../apache/juneau/jena/RdfSerializer.Xml.html   |    2 +-
 .../juneau/jena/RdfSerializer.XmlAbbrev.html    |    2 +-
 .../org/apache/juneau/jena/RdfSerializer.html   |   18 +-
 .../juneau/jena/RdfSerializerContext.html       |    2 +-
 .../juneau/jena/RdfSerializerSession.html       |   60 +-
 .../org/apache/juneau/jso/JsoSerializer.html    |    4 +-
 .../apache/juneau/json/JsonParserContext.html   |    2 +-
 .../juneau/json/JsonSchemaSerializer.html       |   18 +-
 .../juneau/json/JsonSerializer.Readable.html    |    2 +-
 .../juneau/json/JsonSerializer.Simple.html      |    2 +-
 .../json/JsonSerializer.SimpleReadable.html     |    2 +-
 .../json/JsonSerializer.SimpleReadableSafe.html |    2 +-
 .../org/apache/juneau/json/JsonSerializer.html  |   18 +-
 .../juneau/json/JsonSerializerContext.html      |    2 +-
 .../juneau/json/JsonSerializerSession.html      |   32 +-
 .../org/apache/juneau/json/JsonWriter.html      |   50 +-
 .../juneau/msgpack/MsgPackParserContext.html    |    2 +-
 .../juneau/msgpack/MsgPackSerializer.html       |   18 +-
 .../msgpack/MsgPackSerializerContext.html       |    2 +-
 .../msgpack/MsgPackSerializerSession.html       |   28 +-
 .../org/apache/juneau/package-frame.html        |    3 +
 .../org/apache/juneau/package-summary.html      |   18 +
 .../apidocs/org/apache/juneau/package-tree.html |    3 +
 .../org/apache/juneau/parser/ParserContext.html |    2 +-
 .../juneau/plaintext/PlainTextSerializer.html   |    4 +-
 .../org/apache/juneau/remoteable/FormData.html  |   17 +-
 .../apache/juneau/remoteable/FormDataIfNE.html  |   13 +-
 .../org/apache/juneau/remoteable/Header.html    |   18 +-
 .../apache/juneau/remoteable/HeaderIfNE.html    |   39 +-
 .../org/apache/juneau/remoteable/Path.html      |  250 ++
 .../org/apache/juneau/remoteable/Query.html     |   23 +-
 .../org/apache/juneau/remoteable/QueryIfNE.html |   36 +-
 .../juneau/remoteable/RemoteableMethodMeta.html |   38 +-
 .../apache/juneau/remoteable/package-frame.html |    1 +
 .../juneau/remoteable/package-summary.html      |   12 +-
 .../apache/juneau/remoteable/package-tree.html  |    1 +
 .../org/apache/juneau/rest/RestRequest.html     |  145 +-
 .../org/apache/juneau/rest/client/RestCall.html |  427 ++-
 .../apache/juneau/rest/client/RestClient.html   |    2 +-
 .../juneau/rest/client/RestClientBuilder.html   |   14 +-
 .../serializer/OutputStreamSerializer.html      |    2 +-
 .../apache/juneau/serializer/Serializer.html    |   30 +-
 .../juneau/serializer/SerializerContext.html    |    2 +-
 .../serializer/SerializerGroupBuilder.html      |  190 +-
 .../juneau/serializer/SerializerSession.html    |  184 +-
 .../juneau/serializer/SerializerWriter.html     |   89 +-
 .../juneau/serializer/WriterSerializer.html     |    4 +-
 .../apache/juneau/soap/SoapXmlSerializer.html   |    4 +-
 .../org/apache/juneau/uon/UonParserContext.html |    2 +-
 .../juneau/uon/UonSerializer.Encoding.html      |    2 +-
 .../juneau/uon/UonSerializer.Readable.html      |    2 +-
 .../org/apache/juneau/uon/UonSerializer.html    |   18 +-
 .../apache/juneau/uon/UonSerializerContext.html |    2 +-
 .../apache/juneau/uon/UonSerializerSession.html |   30 +-
 .../org/apache/juneau/uon/UonWriter.html        |   52 +-
 .../urlencoding/UrlEncodingParserContext.html   |    2 +-
 .../UrlEncodingSerializer.Expanded.html         |    2 +-
 .../UrlEncodingSerializer.Readable.html         |    2 +-
 .../urlencoding/UrlEncodingSerializer.html      |   18 +-
 .../UrlEncodingSerializerContext.html           |    2 +-
 .../UrlEncodingSerializerSession.html           |   30 +-
 .../apache/juneau/xml/XmlDocSerializer.Ns.html  |    2 +-
 .../org/apache/juneau/xml/XmlDocSerializer.html |    4 +-
 .../org/apache/juneau/xml/XmlParserContext.html |    2 +-
 .../juneau/xml/XmlSchemaDocSerializer.html      |    4 +-
 .../apache/juneau/xml/XmlSchemaSerializer.html  |   20 +-
 .../org/apache/juneau/xml/XmlSerializer.Ns.html |    2 +-
 .../apache/juneau/xml/XmlSerializer.NsSq.html   |    2 +-
 .../juneau/xml/XmlSerializer.NsSqReadable.html  |    2 +-
 .../org/apache/juneau/xml/XmlSerializer.Sq.html |    2 +-
 .../juneau/xml/XmlSerializer.SqReadable.html    |    2 +-
 .../org/apache/juneau/xml/XmlSerializer.html    |   18 +-
 .../apache/juneau/xml/XmlSerializerContext.html |    2 +-
 .../apache/juneau/xml/XmlSerializerSession.html |   44 +-
 .../org/apache/juneau/xml/XmlWriter.html        |  116 +-
 content/site/apidocs/overview-summary.html      |    9 +
 content/site/apidocs/overview-tree.html         |    5 +
 .../src-html/org/apache/juneau/BeanContext.html | 1082 +++---
 .../src-html/org/apache/juneau/BeanMap.html     |  177 +-
 .../juneau/BeanProxyInvocationHandler.html      |  130 +-
 .../src-html/org/apache/juneau/UriContext.html  |  493 +++
 .../org/apache/juneau/UriRelativity.html        |  101 +
 .../org/apache/juneau/UriResolution.html        |  106 +
 .../apache/juneau/csv/CsvSerializerSession.html |   20 +-
 .../juneau/html/HtmlBeanPropertyMeta.html       |  180 +-
 .../apache/juneau/html/HtmlDocSerializer.html   |    4 +-
 .../juneau/html/HtmlDocSerializerSession.html   |  176 +-
 .../org/apache/juneau/html/HtmlRender.html      |  221 ++
 .../juneau/html/HtmlSchemaDocSerializer.html    |    4 +-
 .../apache/juneau/html/HtmlSerializer.Sq.html   |  620 ++--
 .../juneau/html/HtmlSerializer.SqReadable.html  |  620 ++--
 .../org/apache/juneau/html/HtmlSerializer.html  |  620 ++--
 .../juneau/html/HtmlSerializerSession.html      |  258 +-
 .../org/apache/juneau/html/HtmlWriter.html      |  667 ++--
 .../apache/juneau/html/SimpleHtmlWriter.html    |    2 +-
 .../org/apache/juneau/html/annotation/Html.html |   37 +-
 .../org/apache/juneau/internal/StringUtils.html |  104 +-
 .../apache/juneau/jena/RdfSerializer.N3.html    |    4 +-
 .../juneau/jena/RdfSerializer.NTriple.html      |    4 +-
 .../juneau/jena/RdfSerializer.Turtle.html       |    4 +-
 .../apache/juneau/jena/RdfSerializer.Xml.html   |    4 +-
 .../juneau/jena/RdfSerializer.XmlAbbrev.html    |    4 +-
 .../org/apache/juneau/jena/RdfSerializer.html   |    4 +-
 .../juneau/jena/RdfSerializerSession.html       |  462 +--
 .../juneau/json/JsonSchemaSerializer.html       |    4 +-
 .../juneau/json/JsonSerializer.Readable.html    |    4 +-
 .../juneau/json/JsonSerializer.Simple.html      |    4 +-
 .../json/JsonSerializer.SimpleReadable.html     |    4 +-
 .../json/JsonSerializer.SimpleReadableSafe.html |    4 +-
 .../org/apache/juneau/json/JsonSerializer.html  |    4 +-
 .../juneau/json/JsonSerializerSession.html      |  110 +-
 .../org/apache/juneau/json/JsonWriter.html      |  475 +--
 .../juneau/msgpack/MsgPackSerializer.html       |    4 +-
 .../msgpack/MsgPackSerializerSession.html       |   66 +-
 .../org/apache/juneau/remoteable/FormData.html  |   37 +-
 .../apache/juneau/remoteable/FormDataIfNE.html  |   15 +-
 .../org/apache/juneau/remoteable/Header.html    |   44 +-
 .../apache/juneau/remoteable/HeaderIfNE.html    |   15 +-
 .../org/apache/juneau/remoteable/Path.html      |  135 +
 .../org/apache/juneau/remoteable/Query.html     |   47 +-
 .../org/apache/juneau/remoteable/QueryIfNE.html |   16 +-
 .../juneau/remoteable/RemoteableMethodMeta.html |  277 +-
 .../org/apache/juneau/rest/RestRequest.html     | 1821 +++++-----
 .../org/apache/juneau/rest/client/RestCall.html | 3334 +++++++++---------
 .../apache/juneau/rest/client/RestClient.html   |  173 +-
 .../juneau/rest/client/RestClientBuilder.html   |    2 +-
 .../apache/juneau/rest/jaxrs/BaseProvider.html  |    4 +-
 .../juneau/rest/response/DefaultHandler.html    |    4 +-
 .../apache/juneau/serializer/Serializer.html    |  212 +-
 .../serializer/SerializerGroupBuilder.html      | 1506 ++++----
 .../juneau/serializer/SerializerSession.html    | 1411 ++++----
 .../juneau/serializer/SerializerWriter.html     |  646 ++--
 .../juneau/serializer/WriterSerializer.html     |    2 +-
 .../juneau/uon/UonSerializer.Encoding.html      |    4 +-
 .../juneau/uon/UonSerializer.Readable.html      |    4 +-
 .../org/apache/juneau/uon/UonSerializer.html    |    4 +-
 .../apache/juneau/uon/UonSerializerSession.html |   88 +-
 .../org/apache/juneau/uon/UonWriter.html        |  497 +--
 .../UrlEncodingSerializer.Expanded.html         |    6 +-
 .../UrlEncodingSerializer.Readable.html         |    6 +-
 .../urlencoding/UrlEncodingSerializer.html      |    6 +-
 .../UrlEncodingSerializerSession.html           |  116 +-
 .../apache/juneau/xml/XmlSchemaSerializer.html  |    8 +-
 .../org/apache/juneau/xml/XmlSerializer.Ns.html |    4 +-
 .../apache/juneau/xml/XmlSerializer.NsSq.html   |    4 +-
 .../juneau/xml/XmlSerializer.NsSqReadable.html  |    4 +-
 .../org/apache/juneau/xml/XmlSerializer.Sq.html |    4 +-
 .../juneau/xml/XmlSerializer.SqReadable.html    |    4 +-
 .../org/apache/juneau/xml/XmlSerializer.html    |    4 +-
 .../apache/juneau/xml/XmlSerializerSession.html |  292 +-
 .../org/apache/juneau/xml/XmlWriter.html        | 1247 +++----
 194 files changed, 14113 insertions(+), 9640 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/allclasses-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/allclasses-frame.html b/content/site/apidocs/allclasses-frame.html
index fe1007b..4ee9f65 100644
--- a/content/site/apidocs/allclasses-frame.html
+++ b/content/site/apidocs/allclasses-frame.html
@@ -284,6 +284,7 @@
 <li><a href="org/apache/juneau/html/HtmlParserBuilder.html" title="class in org.apache.juneau.html" target="classFrame">HtmlParserBuilder</a></li>
 <li><a href="org/apache/juneau/html/HtmlParserContext.html" title="class in org.apache.juneau.html" target="classFrame">HtmlParserContext</a></li>
 <li><a href="org/apache/juneau/html/HtmlParserSession.html" title="class in org.apache.juneau.html" target="classFrame">HtmlParserSession</a></li>
+<li><a href="org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html" target="classFrame">HtmlRender</a></li>
 <li><a href="org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html" target="classFrame">HtmlSchemaDocSerializer</a></li>
 <li><a href="org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html" target="classFrame">HtmlSerializer</a></li>
 <li><a href="org/apache/juneau/html/HtmlSerializer.Sq.html" title="class in org.apache.juneau.html" target="classFrame">HtmlSerializer.Sq</a></li>
@@ -433,6 +434,7 @@
 <li><a href="org/apache/juneau/parser/ParserMatch.html" title="class in org.apache.juneau.parser" target="classFrame">ParserMatch</a></li>
 <li><a href="org/apache/juneau/parser/ParserReader.html" title="class in org.apache.juneau.parser" target="classFrame">ParserReader</a></li>
 <li><a href="org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser" target="classFrame">ParserSession</a></li>
+<li><a href="org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable" target="classFrame">Path</a></li>
 <li><a href="org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Path</a></li>
 <li><a href="org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">PathRemainder</a></li>
 <li><a href="org/apache/juneau/dto/atom/Person.html" title="class in org.apache.juneau.dto.atom" target="classFrame">Person</a></li>
@@ -681,6 +683,9 @@
 <li><a href="org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon" target="classFrame">UonWriter</a></li>
 <li><a href="org/apache/juneau/http/Upgrade.html" title="class in org.apache.juneau.http" target="classFrame">Upgrade</a></li>
 <li><a href="org/apache/juneau/annotation/URI.html" title="annotation in org.apache.juneau.annotation" target="classFrame">URI</a></li>
+<li><a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau" target="classFrame">UriContext</a></li>
+<li><a href="org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau" target="classFrame">UriRelativity</a></li>
+<li><a href="org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau" target="classFrame">UriResolution</a></li>
 <li><a href="org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html" title="class in org.apache.juneau.rest.matchers" target="classFrame">UrlEncodedFormMatcher</a></li>
 <li><a href="org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars" target="classFrame">UrlEncodeVar</a></li>
 <li><a href="org/apache/juneau/urlencoding/annotation/UrlEncoding.html" title="annotation in org.apache.juneau.urlencoding.annotation" target="classFrame">UrlEncoding</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/allclasses-noframe.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/allclasses-noframe.html b/content/site/apidocs/allclasses-noframe.html
index 190676a..3688b94 100644
--- a/content/site/apidocs/allclasses-noframe.html
+++ b/content/site/apidocs/allclasses-noframe.html
@@ -284,6 +284,7 @@
 <li><a href="org/apache/juneau/html/HtmlParserBuilder.html" title="class in org.apache.juneau.html">HtmlParserBuilder</a></li>
 <li><a href="org/apache/juneau/html/HtmlParserContext.html" title="class in org.apache.juneau.html">HtmlParserContext</a></li>
 <li><a href="org/apache/juneau/html/HtmlParserSession.html" title="class in org.apache.juneau.html">HtmlParserSession</a></li>
+<li><a href="org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html">HtmlRender</a></li>
 <li><a href="org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html">HtmlSchemaDocSerializer</a></li>
 <li><a href="org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a></li>
 <li><a href="org/apache/juneau/html/HtmlSerializer.Sq.html" title="class in org.apache.juneau.html">HtmlSerializer.Sq</a></li>
@@ -433,6 +434,7 @@
 <li><a href="org/apache/juneau/parser/ParserMatch.html" title="class in org.apache.juneau.parser">ParserMatch</a></li>
 <li><a href="org/apache/juneau/parser/ParserReader.html" title="class in org.apache.juneau.parser">ParserReader</a></li>
 <li><a href="org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a></li>
+<li><a href="org/apache/juneau/remoteable/Path.html" title="annotation in org.apache.juneau.remoteable">Path</a></li>
 <li><a href="org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">Path</a></li>
 <li><a href="org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">PathRemainder</a></li>
 <li><a href="org/apache/juneau/dto/atom/Person.html" title="class in org.apache.juneau.dto.atom">Person</a></li>
@@ -681,6 +683,9 @@
 <li><a href="org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a></li>
 <li><a href="org/apache/juneau/http/Upgrade.html" title="class in org.apache.juneau.http">Upgrade</a></li>
 <li><a href="org/apache/juneau/annotation/URI.html" title="annotation in org.apache.juneau.annotation">URI</a></li>
+<li><a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></li>
+<li><a href="org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a></li>
+<li><a href="org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a></li>
 <li><a href="org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html" title="class in org.apache.juneau.rest.matchers">UrlEncodedFormMatcher</a></li>
 <li><a href="org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars">UrlEncodeVar</a></li>
 <li><a href="org/apache/juneau/urlencoding/annotation/UrlEncoding.html" title="annotation in org.apache.juneau.urlencoding.annotation">UrlEncoding</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/doc-files/HtmlRender_1.png
----------------------------------------------------------------------
diff --git a/content/site/apidocs/doc-files/HtmlRender_1.png b/content/site/apidocs/doc-files/HtmlRender_1.png
new file mode 100644
index 0000000..f070aea
Binary files /dev/null and b/content/site/apidocs/doc-files/HtmlRender_1.png differ


[20/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/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 2f0038b..60c1508 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
@@ -1008,547 +1008,559 @@
 <span class="sourceLineNo">1000</span>   }<a name="line.1000"></a>
 <span class="sourceLineNo">1001</span><a name="line.1001"></a>
 <span class="sourceLineNo">1002</span>   /**<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>    * Prints meta cache statistics to &lt;code&gt;System.out&lt;/code&gt;.<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>    */<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>   protected static void dumpCacheStats() {<a name="line.1005"></a>
-<span class="sourceLineNo">1006</span>      try {<a name="line.1006"></a>
-<span class="sourceLineNo">1007</span>         int ctCount = 0;<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span>         for (Map&lt;Class,ClassMeta&gt; cm : cmCacheCache.values())<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span>            ctCount += cm.size();<a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>         System.out.println(MessageFormat.format("ClassMeta cache: {0} instances in {1} caches", ctCount, cmCacheCache.size())); // NOT DEBUG<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span>      } catch (Exception e) {<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span>         e.printStackTrace();<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>      }<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span>   }<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span><a name="line.1015"></a>
-<span class="sourceLineNo">1016</span>   /**<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span>    * Returns the {@link BeanMeta} class for the specified class.<a name="line.1017"></a>
-<span class="sourceLineNo">1018</span>    *<a name="line.1018"></a>
-<span class="sourceLineNo">1019</span>    * @param &lt;T&gt; The class type to get the meta-data on.<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>    * @param c The class to get the meta-data on.<a name="line.1020"></a>
-<span class="sourceLineNo">1021</span>    * @return The {@link BeanMeta} for the specified class, or &lt;jk&gt;null&lt;/jk&gt; if the class<a name="line.1021"></a>
-<span class="sourceLineNo">1022</span>    *    is not a bean per the settings on this context.<a name="line.1022"></a>
-<span class="sourceLineNo">1023</span>    */<a name="line.1023"></a>
-<span class="sourceLineNo">1024</span>   public final &lt;T&gt; BeanMeta&lt;T&gt; getBeanMeta(Class&lt;T&gt; c) {<a name="line.1024"></a>
-<span class="sourceLineNo">1025</span>      if (c == null)<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span>         return null;<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span>      return getClassMeta(c).getBeanMeta();<a name="line.1027"></a>
-<span class="sourceLineNo">1028</span>   }<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span><a name="line.1029"></a>
-<span class="sourceLineNo">1030</span>   /**<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span>    * Construct a {@code ClassMeta} wrapper around a {@link Class} object.<a name="line.1031"></a>
-<span class="sourceLineNo">1032</span>    *<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span>    * @param &lt;T&gt; The class type being wrapped.<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span>    * @param type The class to resolve.<a name="line.1034"></a>
-<span class="sourceLineNo">1035</span>    * @return If the class is not an array, returns a cached {@link ClassMeta} object.<a name="line.1035"></a>
-<span class="sourceLineNo">1036</span>    * Otherwise, returns a new {@link ClassMeta} object every time.&lt;br&gt;<a name="line.1036"></a>
-<span class="sourceLineNo">1037</span>    */<a name="line.1037"></a>
-<span class="sourceLineNo">1038</span>   public final &lt;T&gt; ClassMeta&lt;T&gt; getClassMeta(Class&lt;T&gt; type) {<a name="line.1038"></a>
-<span class="sourceLineNo">1039</span><a name="line.1039"></a>
-<span class="sourceLineNo">1040</span>      // If this is an array, then we want it wrapped in an uncached ClassMeta object.<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span>      // Note that if it has a pojo swap, we still want to cache it so that<a name="line.1041"></a>
-<span class="sourceLineNo">1042</span>      // we can cache something like byte[] with ByteArrayBase64Swap.<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span>      if (type.isArray() &amp;&amp; findPojoSwap(type) == null)<a name="line.1043"></a>
-<span class="sourceLineNo">1044</span>         return new ClassMeta(type, this, findImplClass(type), findBeanFilter(type), findPojoSwap(type), findChildPojoSwaps(type));<a name="line.1044"></a>
-<span class="sourceLineNo">1045</span><a name="line.1045"></a>
-<span class="sourceLineNo">1046</span>      // This can happen if we have transforms defined against String or Object.<a name="line.1046"></a>
-<span class="sourceLineNo">1047</span>      if (cmCache == null)<a name="line.1047"></a>
-<span class="sourceLineNo">1048</span>         return null;<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span><a name="line.1049"></a>
-<span class="sourceLineNo">1050</span>      ClassMeta&lt;T&gt; cm = cmCache.get(type);<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>      if (cm == null) {<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span><a name="line.1052"></a>
-<span class="sourceLineNo">1053</span>         synchronized (this) {<a name="line.1053"></a>
-<span class="sourceLineNo">1054</span>            // Make sure someone didn't already set it while this thread was blocked.<a name="line.1054"></a>
-<span class="sourceLineNo">1055</span>            cm = cmCache.get(type);<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span>            if (cm == null)<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span>               cm = new ClassMeta&lt;T&gt;(type, this, findImplClass(type), findBeanFilter(type), findPojoSwap(type), findChildPojoSwaps(type));<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span>         }<a name="line.1058"></a>
-<span class="sourceLineNo">1059</span>      }<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>      return cm;<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span>   }<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span><a name="line.1062"></a>
-<span class="sourceLineNo">1063</span>   /**<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>    * Used to resolve &lt;code&gt;ClassMetas&lt;/code&gt; of type &lt;code&gt;Collection&lt;/code&gt; and &lt;code&gt;Map&lt;/code&gt; that have<a name="line.1064"></a>
-<span class="sourceLineNo">1065</span>    * &lt;code&gt;ClassMeta&lt;/code&gt; values that themselves could be collections or maps.<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span>    * &lt;p&gt;<a name="line.1066"></a>
-<span class="sourceLineNo">1067</span>    * &lt;code&gt;Collection&lt;/code&gt; meta objects are assumed to be followed by zero or one meta objects indicating the element type.<a name="line.1067"></a>
-<span class="sourceLineNo">1068</span>    * &lt;p&gt;<a name="line.1068"></a>
-<span class="sourceLineNo">1069</span>    * &lt;code&gt;Map&lt;/code&gt; meta objects are assumed to be followed by zero or two meta objects indicating the key and value types.<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span>    * &lt;p&gt;<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span>    * The array can be arbitrarily long to indicate arbitrarily complex data structures.<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span>    *<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span>    * &lt;h5 class='section'&gt;Examples:&lt;/h5&gt;<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span>    * &lt;ul&gt;<a name="line.1074"></a>
-<span class="sourceLineNo">1075</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(String.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A normal type.<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(List.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A list containing objects.<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(List.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A list containing strings.<a name="line.1077"></a>
-<span class="sourceLineNo">1078</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(LinkedList.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A linked-list containing strings.<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(LinkedList.&lt;jk&gt;class&lt;/jk&gt;, LinkedList.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A linked-list containing linked-lists of strings.<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(Map.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A map containing object keys/values.<a name="line.1080"></a>
-<span class="sourceLineNo">1081</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(Map.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A map containing string keys/values.<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(Map.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;, List.&lt;jk&gt;class&lt;/jk&gt;, MyBean.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A map containing string keys and values of lists containing beans.<a name="line.1082"></a>
-<span class="sourceLineNo">1083</span>    * &lt;/ul&gt;<a name="line.1083"></a>
+<span class="sourceLineNo">1003</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified object is a bean.<a name="line.1003"></a>
+<span class="sourceLineNo">1004</span>    *<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span>    * @param o The object to test.<a name="line.1005"></a>
+<span class="sourceLineNo">1006</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified object is a bean.  &lt;jk&gt;false&lt;/jk&gt; if the bean is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1006"></a>
+<span class="sourceLineNo">1007</span>    */<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>   public boolean isBean(Object o) {<a name="line.1008"></a>
+<span class="sourceLineNo">1009</span>      if (o == null)<a name="line.1009"></a>
+<span class="sourceLineNo">1010</span>         return false;<a name="line.1010"></a>
+<span class="sourceLineNo">1011</span>      return getClassMetaForObject(o).isBean();<a name="line.1011"></a>
+<span class="sourceLineNo">1012</span>   }<a name="line.1012"></a>
+<span class="sourceLineNo">1013</span><a name="line.1013"></a>
+<span class="sourceLineNo">1014</span>   /**<a name="line.1014"></a>
+<span class="sourceLineNo">1015</span>    * Prints meta cache statistics to &lt;code&gt;System.out&lt;/code&gt;.<a name="line.1015"></a>
+<span class="sourceLineNo">1016</span>    */<a name="line.1016"></a>
+<span class="sourceLineNo">1017</span>   protected static void dumpCacheStats() {<a name="line.1017"></a>
+<span class="sourceLineNo">1018</span>      try {<a name="line.1018"></a>
+<span class="sourceLineNo">1019</span>         int ctCount = 0;<a name="line.1019"></a>
+<span class="sourceLineNo">1020</span>         for (Map&lt;Class,ClassMeta&gt; cm : cmCacheCache.values())<a name="line.1020"></a>
+<span class="sourceLineNo">1021</span>            ctCount += cm.size();<a name="line.1021"></a>
+<span class="sourceLineNo">1022</span>         System.out.println(MessageFormat.format("ClassMeta cache: {0} instances in {1} caches", ctCount, cmCacheCache.size())); // NOT DEBUG<a name="line.1022"></a>
+<span class="sourceLineNo">1023</span>      } catch (Exception e) {<a name="line.1023"></a>
+<span class="sourceLineNo">1024</span>         e.printStackTrace();<a name="line.1024"></a>
+<span class="sourceLineNo">1025</span>      }<a name="line.1025"></a>
+<span class="sourceLineNo">1026</span>   }<a name="line.1026"></a>
+<span class="sourceLineNo">1027</span><a name="line.1027"></a>
+<span class="sourceLineNo">1028</span>   /**<a name="line.1028"></a>
+<span class="sourceLineNo">1029</span>    * Returns the {@link BeanMeta} class for the specified class.<a name="line.1029"></a>
+<span class="sourceLineNo">1030</span>    *<a name="line.1030"></a>
+<span class="sourceLineNo">1031</span>    * @param &lt;T&gt; The class type to get the meta-data on.<a name="line.1031"></a>
+<span class="sourceLineNo">1032</span>    * @param c The class to get the meta-data on.<a name="line.1032"></a>
+<span class="sourceLineNo">1033</span>    * @return The {@link BeanMeta} for the specified class, or &lt;jk&gt;null&lt;/jk&gt; if the class<a name="line.1033"></a>
+<span class="sourceLineNo">1034</span>    *    is not a bean per the settings on this context.<a name="line.1034"></a>
+<span class="sourceLineNo">1035</span>    */<a name="line.1035"></a>
+<span class="sourceLineNo">1036</span>   public final &lt;T&gt; BeanMeta&lt;T&gt; getBeanMeta(Class&lt;T&gt; c) {<a name="line.1036"></a>
+<span class="sourceLineNo">1037</span>      if (c == null)<a name="line.1037"></a>
+<span class="sourceLineNo">1038</span>         return null;<a name="line.1038"></a>
+<span class="sourceLineNo">1039</span>      return getClassMeta(c).getBeanMeta();<a name="line.1039"></a>
+<span class="sourceLineNo">1040</span>   }<a name="line.1040"></a>
+<span class="sourceLineNo">1041</span><a name="line.1041"></a>
+<span class="sourceLineNo">1042</span>   /**<a name="line.1042"></a>
+<span class="sourceLineNo">1043</span>    * Construct a {@code ClassMeta} wrapper around a {@link Class} object.<a name="line.1043"></a>
+<span class="sourceLineNo">1044</span>    *<a name="line.1044"></a>
+<span class="sourceLineNo">1045</span>    * @param &lt;T&gt; The class type being wrapped.<a name="line.1045"></a>
+<span class="sourceLineNo">1046</span>    * @param type The class to resolve.<a name="line.1046"></a>
+<span class="sourceLineNo">1047</span>    * @return If the class is not an array, returns a cached {@link ClassMeta} object.<a name="line.1047"></a>
+<span class="sourceLineNo">1048</span>    * Otherwise, returns a new {@link ClassMeta} object every time.&lt;br&gt;<a name="line.1048"></a>
+<span class="sourceLineNo">1049</span>    */<a name="line.1049"></a>
+<span class="sourceLineNo">1050</span>   public final &lt;T&gt; ClassMeta&lt;T&gt; getClassMeta(Class&lt;T&gt; type) {<a name="line.1050"></a>
+<span class="sourceLineNo">1051</span><a name="line.1051"></a>
+<span class="sourceLineNo">1052</span>      // If this is an array, then we want it wrapped in an uncached ClassMeta object.<a name="line.1052"></a>
+<span class="sourceLineNo">1053</span>      // Note that if it has a pojo swap, we still want to cache it so that<a name="line.1053"></a>
+<span class="sourceLineNo">1054</span>      // we can cache something like byte[] with ByteArrayBase64Swap.<a name="line.1054"></a>
+<span class="sourceLineNo">1055</span>      if (type.isArray() &amp;&amp; findPojoSwap(type) == null)<a name="line.1055"></a>
+<span class="sourceLineNo">1056</span>         return new ClassMeta(type, this, findImplClass(type), findBeanFilter(type), findPojoSwap(type), findChildPojoSwaps(type));<a name="line.1056"></a>
+<span class="sourceLineNo">1057</span><a name="line.1057"></a>
+<span class="sourceLineNo">1058</span>      // This can happen if we have transforms defined against String or Object.<a name="line.1058"></a>
+<span class="sourceLineNo">1059</span>      if (cmCache == null)<a name="line.1059"></a>
+<span class="sourceLineNo">1060</span>         return null;<a name="line.1060"></a>
+<span class="sourceLineNo">1061</span><a name="line.1061"></a>
+<span class="sourceLineNo">1062</span>      ClassMeta&lt;T&gt; cm = cmCache.get(type);<a name="line.1062"></a>
+<span class="sourceLineNo">1063</span>      if (cm == null) {<a name="line.1063"></a>
+<span class="sourceLineNo">1064</span><a name="line.1064"></a>
+<span class="sourceLineNo">1065</span>         synchronized (this) {<a name="line.1065"></a>
+<span class="sourceLineNo">1066</span>            // Make sure someone didn't already set it while this thread was blocked.<a name="line.1066"></a>
+<span class="sourceLineNo">1067</span>            cm = cmCache.get(type);<a name="line.1067"></a>
+<span class="sourceLineNo">1068</span>            if (cm == null)<a name="line.1068"></a>
+<span class="sourceLineNo">1069</span>               cm = new ClassMeta&lt;T&gt;(type, this, findImplClass(type), findBeanFilter(type), findPojoSwap(type), findChildPojoSwaps(type));<a name="line.1069"></a>
+<span class="sourceLineNo">1070</span>         }<a name="line.1070"></a>
+<span class="sourceLineNo">1071</span>      }<a name="line.1071"></a>
+<span class="sourceLineNo">1072</span>      return cm;<a name="line.1072"></a>
+<span class="sourceLineNo">1073</span>   }<a name="line.1073"></a>
+<span class="sourceLineNo">1074</span><a name="line.1074"></a>
+<span class="sourceLineNo">1075</span>   /**<a name="line.1075"></a>
+<span class="sourceLineNo">1076</span>    * Used to resolve &lt;code&gt;ClassMetas&lt;/code&gt; of type &lt;code&gt;Collection&lt;/code&gt; and &lt;code&gt;Map&lt;/code&gt; that have<a name="line.1076"></a>
+<span class="sourceLineNo">1077</span>    * &lt;code&gt;ClassMeta&lt;/code&gt; values that themselves could be collections or maps.<a name="line.1077"></a>
+<span class="sourceLineNo">1078</span>    * &lt;p&gt;<a name="line.1078"></a>
+<span class="sourceLineNo">1079</span>    * &lt;code&gt;Collection&lt;/code&gt; meta objects are assumed to be followed by zero or one meta objects indicating the element type.<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span>    * &lt;p&gt;<a name="line.1080"></a>
+<span class="sourceLineNo">1081</span>    * &lt;code&gt;Map&lt;/code&gt; meta objects are assumed to be followed by zero or two meta objects indicating the key and value types.<a name="line.1081"></a>
+<span class="sourceLineNo">1082</span>    * &lt;p&gt;<a name="line.1082"></a>
+<span class="sourceLineNo">1083</span>    * The array can be arbitrarily long to indicate arbitrarily complex data structures.<a name="line.1083"></a>
 <span class="sourceLineNo">1084</span>    *<a name="line.1084"></a>
-<span class="sourceLineNo">1085</span>    * @param type The class to resolve.<a name="line.1085"></a>
-<span class="sourceLineNo">1086</span>    *    &lt;br&gt;Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.1086"></a>
-<span class="sourceLineNo">1087</span>    * @param args The type arguments of the class if it's a collection or map.<a name="line.1087"></a>
-<span class="sourceLineNo">1088</span>    *    &lt;br&gt;Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>    *    &lt;br&gt;Ignored if the main type is not a map or collection.<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span>    * @return The resolved class meta.<a name="line.1090"></a>
-<span class="sourceLineNo">1091</span>    */<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span>   public final &lt;T&gt; ClassMeta&lt;T&gt; getClassMeta(Type type, Type...args) {<a name="line.1092"></a>
-<span class="sourceLineNo">1093</span>      if (type == null)<a name="line.1093"></a>
-<span class="sourceLineNo">1094</span>         return null;<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span>      ClassMeta&lt;T&gt; cm = type instanceof Class ? getClassMeta((Class)type) : resolveClassMeta(type, null);<a name="line.1095"></a>
-<span class="sourceLineNo">1096</span>      if (args.length == 0)<a name="line.1096"></a>
-<span class="sourceLineNo">1097</span>         return cm;<a name="line.1097"></a>
-<span class="sourceLineNo">1098</span>      ClassMeta&lt;?&gt;[] cma = new ClassMeta[args.length+1];<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span>      cma[0] = cm;<a name="line.1099"></a>
-<span class="sourceLineNo">1100</span>      for (int i = 0; i &lt; Array.getLength(args); i++) {<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>         Type arg = (Type)Array.get(args, i);<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span>         cma[i+1] = arg instanceof Class ? getClassMeta((Class)arg) : resolveClassMeta(arg, null);<a name="line.1102"></a>
-<span class="sourceLineNo">1103</span>      }<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span>      return (ClassMeta&lt;T&gt;) getTypedClassMeta(cma, 0);<a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>   }<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span><a name="line.1106"></a>
-<span class="sourceLineNo">1107</span>   /*<a name="line.1107"></a>
-<span class="sourceLineNo">1108</span>    * Resolves the 'genericized' class meta at the specified position in the ClassMeta array.<a name="line.1108"></a>
-<span class="sourceLineNo">1109</span>    */<a name="line.1109"></a>
-<span class="sourceLineNo">1110</span>   private ClassMeta&lt;?&gt; getTypedClassMeta(ClassMeta&lt;?&gt;[] c, int pos) {<a name="line.1110"></a>
-<span class="sourceLineNo">1111</span>      ClassMeta&lt;?&gt; cm = c[pos++];<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>      if (cm.isCollection()) {<a name="line.1112"></a>
-<span class="sourceLineNo">1113</span>         ClassMeta&lt;?&gt; ce = c.length == pos ? object() : getTypedClassMeta(c, pos);<a name="line.1113"></a>
-<span class="sourceLineNo">1114</span>         return (ce.isObject() ? cm : new ClassMeta(cm, null, null, ce));<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span>      } else if (cm.isMap()) {<a name="line.1115"></a>
-<span class="sourceLineNo">1116</span>         ClassMeta&lt;?&gt; ck = c.length == pos ? object() : c[pos++];<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span>         ClassMeta&lt;?&gt; cv = c.length == pos ? object() : getTypedClassMeta(c, pos);<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span>         return (ck.isObject() &amp;&amp; cv.isObject() ? cm : new ClassMeta(cm, ck, cv, null));<a name="line.1118"></a>
-<span class="sourceLineNo">1119</span>      }<a name="line.1119"></a>
-<span class="sourceLineNo">1120</span>      return cm;<a name="line.1120"></a>
-<span class="sourceLineNo">1121</span>   }<a name="line.1121"></a>
-<span class="sourceLineNo">1122</span><a name="line.1122"></a>
-<span class="sourceLineNo">1123</span>   final ClassMeta resolveClassMeta(Type o, Map&lt;Class&lt;?&gt;,Class&lt;?&gt;[]&gt; typeVarImpls) {<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span>      if (o == null)<a name="line.1124"></a>
-<span class="sourceLineNo">1125</span>         return null;<a name="line.1125"></a>
-<span class="sourceLineNo">1126</span><a name="line.1126"></a>
-<span class="sourceLineNo">1127</span>      if (o instanceof ClassMeta) {<a name="line.1127"></a>
-<span class="sourceLineNo">1128</span>         ClassMeta&lt;?&gt; cm = (ClassMeta)o;<a name="line.1128"></a>
-<span class="sourceLineNo">1129</span><a name="line.1129"></a>
-<span class="sourceLineNo">1130</span>         // This classmeta could have been created by a different context.<a name="line.1130"></a>
-<span class="sourceLineNo">1131</span>         // Need to re-resolve it to pick up PojoSwaps and stuff on this context.<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span>         if (cm.getBeanContext() == this)<a name="line.1132"></a>
-<span class="sourceLineNo">1133</span>            return cm;<a name="line.1133"></a>
-<span class="sourceLineNo">1134</span>         if (cm.isMap())<a name="line.1134"></a>
-<span class="sourceLineNo">1135</span>            return getClassMeta(cm.innerClass, cm.getKeyType(), cm.getValueType());<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span>         if (cm.isCollection())<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span>            return getClassMeta(cm.innerClass, cm.getElementType());<a name="line.1137"></a>
-<span class="sourceLineNo">1138</span>         return getClassMeta(cm.innerClass);<a name="line.1138"></a>
-<span class="sourceLineNo">1139</span>      }<a name="line.1139"></a>
-<span class="sourceLineNo">1140</span><a name="line.1140"></a>
-<span class="sourceLineNo">1141</span>      Class c = resolve(o, typeVarImpls);<a name="line.1141"></a>
-<span class="sourceLineNo">1142</span><a name="line.1142"></a>
-<span class="sourceLineNo">1143</span>      // This can happen when trying to resolve the "E getFirst()" method on LinkedList, whose type is a TypeVariable<a name="line.1143"></a>
-<span class="sourceLineNo">1144</span>      // These should just resolve to Object.<a name="line.1144"></a>
-<span class="sourceLineNo">1145</span>      if (c == null)<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span>         return object();<a name="line.1146"></a>
-<span class="sourceLineNo">1147</span><a name="line.1147"></a>
-<span class="sourceLineNo">1148</span>      ClassMeta rawType = getClassMeta(c);<a name="line.1148"></a>
-<span class="sourceLineNo">1149</span><a name="line.1149"></a>
-<span class="sourceLineNo">1150</span>      // If this is a Map or Collection, and the parameter types aren't part<a name="line.1150"></a>
-<span class="sourceLineNo">1151</span>      // of the class definition itself (e.g. class AddressBook extends List&lt;Person&gt;),<a name="line.1151"></a>
-<span class="sourceLineNo">1152</span>      // then we need to figure out the parameters.<a name="line.1152"></a>
-<span class="sourceLineNo">1153</span>      if (rawType.isMap() || rawType.isCollection()) {<a name="line.1153"></a>
-<span class="sourceLineNo">1154</span>         ClassMeta[] params = findParameters(o, c);<a name="line.1154"></a>
-<span class="sourceLineNo">1155</span>         if (params == null)<a name="line.1155"></a>
-<span class="sourceLineNo">1156</span>            return rawType;<a name="line.1156"></a>
-<span class="sourceLineNo">1157</span>         if (rawType.isMap()) {<a name="line.1157"></a>
-<span class="sourceLineNo">1158</span>            if (params.length != 2)<a name="line.1158"></a>
-<span class="sourceLineNo">1159</span>               return rawType;<a name="line.1159"></a>
-<span class="sourceLineNo">1160</span>            if (params[0].isObject() &amp;&amp; params[1].isObject())<a name="line.1160"></a>
-<span class="sourceLineNo">1161</span>               return rawType;<a name="line.1161"></a>
-<span class="sourceLineNo">1162</span>            return new ClassMeta(rawType, params[0], params[1], null);<a name="line.1162"></a>
-<span class="sourceLineNo">1163</span>         }<a name="line.1163"></a>
-<span class="sourceLineNo">1164</span>         if (rawType.isCollection()) {<a name="line.1164"></a>
-<span class="sourceLineNo">1165</span>            if (params.length != 1)<a name="line.1165"></a>
-<span class="sourceLineNo">1166</span>               return rawType;<a name="line.1166"></a>
-<span class="sourceLineNo">1167</span>            if (params[0].isObject())<a name="line.1167"></a>
-<span class="sourceLineNo">1168</span>               return rawType;<a name="line.1168"></a>
-<span class="sourceLineNo">1169</span>            return new ClassMeta(rawType, null, null, params[0]);<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><a name="line.1172"></a>
-<span class="sourceLineNo">1173</span>      return rawType;<a name="line.1173"></a>
-<span class="sourceLineNo">1174</span>   }<a name="line.1174"></a>
-<span class="sourceLineNo">1175</span><a name="line.1175"></a>
-<span class="sourceLineNo">1176</span>   /**<a name="line.1176"></a>
-<span class="sourceLineNo">1177</span>    * Convert a Type to a Class if possible.<a name="line.1177"></a>
-<span class="sourceLineNo">1178</span>    * Return null if not possible.<a name="line.1178"></a>
-<span class="sourceLineNo">1179</span>    */<a name="line.1179"></a>
-<span class="sourceLineNo">1180</span>   final Class resolve(Type t, Map&lt;Class&lt;?&gt;,Class&lt;?&gt;[]&gt; typeVarImpls) {<a name="line.1180"></a>
-<span class="sourceLineNo">1181</span><a name="line.1181"></a>
-<span class="sourceLineNo">1182</span>      if (t instanceof Class)<a name="line.1182"></a>
-<span class="sourceLineNo">1183</span>         return (Class)t;<a name="line.1183"></a>
+<span class="sourceLineNo">1085</span>    * &lt;h5 class='section'&gt;Examples:&lt;/h5&gt;<a name="line.1085"></a>
+<span class="sourceLineNo">1086</span>    * &lt;ul&gt;<a name="line.1086"></a>
+<span class="sourceLineNo">1087</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(String.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A normal type.<a name="line.1087"></a>
+<span class="sourceLineNo">1088</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(List.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A list containing objects.<a name="line.1088"></a>
+<span class="sourceLineNo">1089</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(List.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A list containing strings.<a name="line.1089"></a>
+<span class="sourceLineNo">1090</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(LinkedList.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A linked-list containing strings.<a name="line.1090"></a>
+<span class="sourceLineNo">1091</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(LinkedList.&lt;jk&gt;class&lt;/jk&gt;, LinkedList.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A linked-list containing linked-lists of strings.<a name="line.1091"></a>
+<span class="sourceLineNo">1092</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(Map.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A map containing object keys/values.<a name="line.1092"></a>
+<span class="sourceLineNo">1093</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(Map.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A map containing string keys/values.<a name="line.1093"></a>
+<span class="sourceLineNo">1094</span>    *    &lt;li&gt;&lt;code&gt;getClassMeta(Map.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;, List.&lt;jk&gt;class&lt;/jk&gt;, MyBean.&lt;jk&gt;class&lt;/jk&gt;);&lt;/code&gt; - A map containing string keys and values of lists containing beans.<a name="line.1094"></a>
+<span class="sourceLineNo">1095</span>    * &lt;/ul&gt;<a name="line.1095"></a>
+<span class="sourceLineNo">1096</span>    *<a name="line.1096"></a>
+<span class="sourceLineNo">1097</span>    * @param type The class to resolve.<a name="line.1097"></a>
+<span class="sourceLineNo">1098</span>    *    &lt;br&gt;Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.1098"></a>
+<span class="sourceLineNo">1099</span>    * @param args The type arguments of the class if it's a collection or map.<a name="line.1099"></a>
+<span class="sourceLineNo">1100</span>    *    &lt;br&gt;Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.1100"></a>
+<span class="sourceLineNo">1101</span>    *    &lt;br&gt;Ignored if the main type is not a map or collection.<a name="line.1101"></a>
+<span class="sourceLineNo">1102</span>    * @return The resolved class meta.<a name="line.1102"></a>
+<span class="sourceLineNo">1103</span>    */<a name="line.1103"></a>
+<span class="sourceLineNo">1104</span>   public final &lt;T&gt; ClassMeta&lt;T&gt; getClassMeta(Type type, Type...args) {<a name="line.1104"></a>
+<span class="sourceLineNo">1105</span>      if (type == null)<a name="line.1105"></a>
+<span class="sourceLineNo">1106</span>         return null;<a name="line.1106"></a>
+<span class="sourceLineNo">1107</span>      ClassMeta&lt;T&gt; cm = type instanceof Class ? getClassMeta((Class)type) : resolveClassMeta(type, null);<a name="line.1107"></a>
+<span class="sourceLineNo">1108</span>      if (args.length == 0)<a name="line.1108"></a>
+<span class="sourceLineNo">1109</span>         return cm;<a name="line.1109"></a>
+<span class="sourceLineNo">1110</span>      ClassMeta&lt;?&gt;[] cma = new ClassMeta[args.length+1];<a name="line.1110"></a>
+<span class="sourceLineNo">1111</span>      cma[0] = cm;<a name="line.1111"></a>
+<span class="sourceLineNo">1112</span>      for (int i = 0; i &lt; Array.getLength(args); i++) {<a name="line.1112"></a>
+<span class="sourceLineNo">1113</span>         Type arg = (Type)Array.get(args, i);<a name="line.1113"></a>
+<span class="sourceLineNo">1114</span>         cma[i+1] = arg instanceof Class ? getClassMeta((Class)arg) : resolveClassMeta(arg, null);<a name="line.1114"></a>
+<span class="sourceLineNo">1115</span>      }<a name="line.1115"></a>
+<span class="sourceLineNo">1116</span>      return (ClassMeta&lt;T&gt;) getTypedClassMeta(cma, 0);<a name="line.1116"></a>
+<span class="sourceLineNo">1117</span>   }<a name="line.1117"></a>
+<span class="sourceLineNo">1118</span><a name="line.1118"></a>
+<span class="sourceLineNo">1119</span>   /*<a name="line.1119"></a>
+<span class="sourceLineNo">1120</span>    * Resolves the 'genericized' class meta at the specified position in the ClassMeta array.<a name="line.1120"></a>
+<span class="sourceLineNo">1121</span>    */<a name="line.1121"></a>
+<span class="sourceLineNo">1122</span>   private ClassMeta&lt;?&gt; getTypedClassMeta(ClassMeta&lt;?&gt;[] c, int pos) {<a name="line.1122"></a>
+<span class="sourceLineNo">1123</span>      ClassMeta&lt;?&gt; cm = c[pos++];<a name="line.1123"></a>
+<span class="sourceLineNo">1124</span>      if (cm.isCollection()) {<a name="line.1124"></a>
+<span class="sourceLineNo">1125</span>         ClassMeta&lt;?&gt; ce = c.length == pos ? object() : getTypedClassMeta(c, pos);<a name="line.1125"></a>
+<span class="sourceLineNo">1126</span>         return (ce.isObject() ? cm : new ClassMeta(cm, null, null, ce));<a name="line.1126"></a>
+<span class="sourceLineNo">1127</span>      } else if (cm.isMap()) {<a name="line.1127"></a>
+<span class="sourceLineNo">1128</span>         ClassMeta&lt;?&gt; ck = c.length == pos ? object() : c[pos++];<a name="line.1128"></a>
+<span class="sourceLineNo">1129</span>         ClassMeta&lt;?&gt; cv = c.length == pos ? object() : getTypedClassMeta(c, pos);<a name="line.1129"></a>
+<span class="sourceLineNo">1130</span>         return (ck.isObject() &amp;&amp; cv.isObject() ? cm : new ClassMeta(cm, ck, cv, null));<a name="line.1130"></a>
+<span class="sourceLineNo">1131</span>      }<a name="line.1131"></a>
+<span class="sourceLineNo">1132</span>      return cm;<a name="line.1132"></a>
+<span class="sourceLineNo">1133</span>   }<a name="line.1133"></a>
+<span class="sourceLineNo">1134</span><a name="line.1134"></a>
+<span class="sourceLineNo">1135</span>   final ClassMeta resolveClassMeta(Type o, Map&lt;Class&lt;?&gt;,Class&lt;?&gt;[]&gt; typeVarImpls) {<a name="line.1135"></a>
+<span class="sourceLineNo">1136</span>      if (o == null)<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span>         return null;<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span><a name="line.1138"></a>
+<span class="sourceLineNo">1139</span>      if (o instanceof ClassMeta) {<a name="line.1139"></a>
+<span class="sourceLineNo">1140</span>         ClassMeta&lt;?&gt; cm = (ClassMeta)o;<a name="line.1140"></a>
+<span class="sourceLineNo">1141</span><a name="line.1141"></a>
+<span class="sourceLineNo">1142</span>         // This classmeta could have been created by a different context.<a name="line.1142"></a>
+<span class="sourceLineNo">1143</span>         // Need to re-resolve it to pick up PojoSwaps and stuff on this context.<a name="line.1143"></a>
+<span class="sourceLineNo">1144</span>         if (cm.getBeanContext() == this)<a name="line.1144"></a>
+<span class="sourceLineNo">1145</span>            return cm;<a name="line.1145"></a>
+<span class="sourceLineNo">1146</span>         if (cm.isMap())<a name="line.1146"></a>
+<span class="sourceLineNo">1147</span>            return getClassMeta(cm.innerClass, cm.getKeyType(), cm.getValueType());<a name="line.1147"></a>
+<span class="sourceLineNo">1148</span>         if (cm.isCollection())<a name="line.1148"></a>
+<span class="sourceLineNo">1149</span>            return getClassMeta(cm.innerClass, cm.getElementType());<a name="line.1149"></a>
+<span class="sourceLineNo">1150</span>         return getClassMeta(cm.innerClass);<a name="line.1150"></a>
+<span class="sourceLineNo">1151</span>      }<a name="line.1151"></a>
+<span class="sourceLineNo">1152</span><a name="line.1152"></a>
+<span class="sourceLineNo">1153</span>      Class c = resolve(o, typeVarImpls);<a name="line.1153"></a>
+<span class="sourceLineNo">1154</span><a name="line.1154"></a>
+<span class="sourceLineNo">1155</span>      // This can happen when trying to resolve the "E getFirst()" method on LinkedList, whose type is a TypeVariable<a name="line.1155"></a>
+<span class="sourceLineNo">1156</span>      // These should just resolve to Object.<a name="line.1156"></a>
+<span class="sourceLineNo">1157</span>      if (c == null)<a name="line.1157"></a>
+<span class="sourceLineNo">1158</span>         return object();<a name="line.1158"></a>
+<span class="sourceLineNo">1159</span><a name="line.1159"></a>
+<span class="sourceLineNo">1160</span>      ClassMeta rawType = getClassMeta(c);<a name="line.1160"></a>
+<span class="sourceLineNo">1161</span><a name="line.1161"></a>
+<span class="sourceLineNo">1162</span>      // If this is a Map or Collection, and the parameter types aren't part<a name="line.1162"></a>
+<span class="sourceLineNo">1163</span>      // of the class definition itself (e.g. class AddressBook extends List&lt;Person&gt;),<a name="line.1163"></a>
+<span class="sourceLineNo">1164</span>      // then we need to figure out the parameters.<a name="line.1164"></a>
+<span class="sourceLineNo">1165</span>      if (rawType.isMap() || rawType.isCollection()) {<a name="line.1165"></a>
+<span class="sourceLineNo">1166</span>         ClassMeta[] params = findParameters(o, c);<a name="line.1166"></a>
+<span class="sourceLineNo">1167</span>         if (params == null)<a name="line.1167"></a>
+<span class="sourceLineNo">1168</span>            return rawType;<a name="line.1168"></a>
+<span class="sourceLineNo">1169</span>         if (rawType.isMap()) {<a name="line.1169"></a>
+<span class="sourceLineNo">1170</span>            if (params.length != 2)<a name="line.1170"></a>
+<span class="sourceLineNo">1171</span>               return rawType;<a name="line.1171"></a>
+<span class="sourceLineNo">1172</span>            if (params[0].isObject() &amp;&amp; params[1].isObject())<a name="line.1172"></a>
+<span class="sourceLineNo">1173</span>               return rawType;<a name="line.1173"></a>
+<span class="sourceLineNo">1174</span>            return new ClassMeta(rawType, params[0], params[1], null);<a name="line.1174"></a>
+<span class="sourceLineNo">1175</span>         }<a name="line.1175"></a>
+<span class="sourceLineNo">1176</span>         if (rawType.isCollection()) {<a name="line.1176"></a>
+<span class="sourceLineNo">1177</span>            if (params.length != 1)<a name="line.1177"></a>
+<span class="sourceLineNo">1178</span>               return rawType;<a name="line.1178"></a>
+<span class="sourceLineNo">1179</span>            if (params[0].isObject())<a name="line.1179"></a>
+<span class="sourceLineNo">1180</span>               return rawType;<a name="line.1180"></a>
+<span class="sourceLineNo">1181</span>            return new ClassMeta(rawType, null, null, params[0]);<a name="line.1181"></a>
+<span class="sourceLineNo">1182</span>         }<a name="line.1182"></a>
+<span class="sourceLineNo">1183</span>      }<a name="line.1183"></a>
 <span class="sourceLineNo">1184</span><a name="line.1184"></a>
-<span class="sourceLineNo">1185</span>      if (t instanceof ParameterizedType)<a name="line.1185"></a>
-<span class="sourceLineNo">1186</span>         // A parameter (e.g. &lt;String&gt;.<a name="line.1186"></a>
-<span class="sourceLineNo">1187</span>         return (Class)((ParameterizedType)t).getRawType();<a name="line.1187"></a>
-<span class="sourceLineNo">1188</span><a name="line.1188"></a>
-<span class="sourceLineNo">1189</span>      if (t instanceof GenericArrayType) {<a name="line.1189"></a>
-<span class="sourceLineNo">1190</span>         // An array parameter (e.g. &lt;byte[]&gt;).<a name="line.1190"></a>
-<span class="sourceLineNo">1191</span>         Type gatct = ((GenericArrayType)t).getGenericComponentType();<a name="line.1191"></a>
-<span class="sourceLineNo">1192</span><a name="line.1192"></a>
-<span class="sourceLineNo">1193</span>         if (gatct instanceof Class)<a name="line.1193"></a>
-<span class="sourceLineNo">1194</span>            return Array.newInstance((Class)gatct, 0).getClass();<a name="line.1194"></a>
-<span class="sourceLineNo">1195</span><a name="line.1195"></a>
-<span class="sourceLineNo">1196</span>         if (gatct instanceof ParameterizedType)<a name="line.1196"></a>
-<span class="sourceLineNo">1197</span>            return Array.newInstance((Class)((ParameterizedType)gatct).getRawType(), 0).getClass();<a name="line.1197"></a>
-<span class="sourceLineNo">1198</span><a name="line.1198"></a>
-<span class="sourceLineNo">1199</span>         if (gatct instanceof GenericArrayType)<a name="line.1199"></a>
-<span class="sourceLineNo">1200</span>            return Array.newInstance(resolve(gatct, typeVarImpls), 0).getClass();<a name="line.1200"></a>
-<span class="sourceLineNo">1201</span><a name="line.1201"></a>
-<span class="sourceLineNo">1202</span>         return null;<a name="line.1202"></a>
-<span class="sourceLineNo">1203</span><a name="line.1203"></a>
-<span class="sourceLineNo">1204</span>      } else if (t instanceof TypeVariable) {<a name="line.1204"></a>
-<span class="sourceLineNo">1205</span>         if (typeVarImpls != null) {<a name="line.1205"></a>
-<span class="sourceLineNo">1206</span>            TypeVariable tv = (TypeVariable)t;<a name="line.1206"></a>
-<span class="sourceLineNo">1207</span>            String varName = tv.getName();<a name="line.1207"></a>
-<span class="sourceLineNo">1208</span>            int varIndex = -1;<a name="line.1208"></a>
-<span class="sourceLineNo">1209</span>            Class gc = (Class)tv.getGenericDeclaration();<a name="line.1209"></a>
-<span class="sourceLineNo">1210</span>            TypeVariable[] tvv = gc.getTypeParameters();<a name="line.1210"></a>
-<span class="sourceLineNo">1211</span>            for (int i = 0; i &lt; tvv.length; i++) {<a name="line.1211"></a>
-<span class="sourceLineNo">1212</span>               if (tvv[i].getName().equals(varName)) {<a name="line.1212"></a>
-<span class="sourceLineNo">1213</span>                  varIndex = i;<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>            if (varIndex != -1) {<a name="line.1216"></a>
-<span class="sourceLineNo">1217</span><a name="line.1217"></a>
-<span class="sourceLineNo">1218</span>               // If we couldn't find a type variable implementation, that means<a name="line.1218"></a>
-<span class="sourceLineNo">1219</span>               // the type was defined at runtime (e.g. Bean b = new Bean&lt;Foo&gt;();)<a name="line.1219"></a>
-<span class="sourceLineNo">1220</span>               // in which case the type is lost through erasure.<a name="line.1220"></a>
-<span class="sourceLineNo">1221</span>               // Assume java.lang.Object as the type.<a name="line.1221"></a>
-<span class="sourceLineNo">1222</span>               if (! typeVarImpls.containsKey(gc))<a name="line.1222"></a>
-<span class="sourceLineNo">1223</span>                  return null;<a name="line.1223"></a>
-<span class="sourceLineNo">1224</span><a name="line.1224"></a>
-<span class="sourceLineNo">1225</span>               return typeVarImpls.get(gc)[varIndex];<a name="line.1225"></a>
-<span class="sourceLineNo">1226</span>            }<a name="line.1226"></a>
-<span class="sourceLineNo">1227</span>         }<a name="line.1227"></a>
-<span class="sourceLineNo">1228</span>      }<a name="line.1228"></a>
-<span class="sourceLineNo">1229</span>      return null;<a name="line.1229"></a>
-<span class="sourceLineNo">1230</span>   }<a name="line.1230"></a>
-<span class="sourceLineNo">1231</span><a name="line.1231"></a>
-<span class="sourceLineNo">1232</span>   final ClassMeta[] findParameters(Type o, Class c) {<a name="line.1232"></a>
-<span class="sourceLineNo">1233</span>      if (o == null)<a name="line.1233"></a>
-<span class="sourceLineNo">1234</span>         o = c;<a name="line.1234"></a>
-<span class="sourceLineNo">1235</span><a name="line.1235"></a>
-<span class="sourceLineNo">1236</span>      // Loop until we find a ParameterizedType<a name="line.1236"></a>
-<span class="sourceLineNo">1237</span>      if (! (o instanceof ParameterizedType)) {<a name="line.1237"></a>
-<span class="sourceLineNo">1238</span>         loop: do {<a name="line.1238"></a>
-<span class="sourceLineNo">1239</span>            o = c.getGenericSuperclass();<a name="line.1239"></a>
-<span class="sourceLineNo">1240</span>            if (o instanceof ParameterizedType)<a name="line.1240"></a>
-<span class="sourceLineNo">1241</span>               break loop;<a name="line.1241"></a>
-<span class="sourceLineNo">1242</span>            for (Type t : c.getGenericInterfaces()) {<a name="line.1242"></a>
-<span class="sourceLineNo">1243</span>               o = t;<a name="line.1243"></a>
-<span class="sourceLineNo">1244</span>               if (o instanceof ParameterizedType)<a name="line.1244"></a>
-<span class="sourceLineNo">1245</span>                  break loop;<a name="line.1245"></a>
-<span class="sourceLineNo">1246</span>            }<a name="line.1246"></a>
-<span class="sourceLineNo">1247</span>            c = c.getSuperclass();<a name="line.1247"></a>
-<span class="sourceLineNo">1248</span>         } while (c != null);<a name="line.1248"></a>
-<span class="sourceLineNo">1249</span>      }<a name="line.1249"></a>
-<span class="sourceLineNo">1250</span><a name="line.1250"></a>
-<span class="sourceLineNo">1251</span>      if (o instanceof ParameterizedType) {<a name="line.1251"></a>
-<span class="sourceLineNo">1252</span>         ParameterizedType pt = (ParameterizedType)o;<a name="line.1252"></a>
-<span class="sourceLineNo">1253</span>         if (! pt.getRawType().equals(Enum.class)) {<a name="line.1253"></a>
-<span class="sourceLineNo">1254</span>            List&lt;ClassMeta&lt;?&gt;&gt; l = new LinkedList&lt;ClassMeta&lt;?&gt;&gt;();<a name="line.1254"></a>
-<span class="sourceLineNo">1255</span>            for (Type pt2 : pt.getActualTypeArguments()) {<a name="line.1255"></a>
-<span class="sourceLineNo">1256</span>               if (pt2 instanceof WildcardType || pt2 instanceof TypeVariable)<a name="line.1256"></a>
-<span class="sourceLineNo">1257</span>                  return null;<a name="line.1257"></a>
-<span class="sourceLineNo">1258</span>               l.add(resolveClassMeta(pt2, null));<a name="line.1258"></a>
-<span class="sourceLineNo">1259</span>            }<a name="line.1259"></a>
-<span class="sourceLineNo">1260</span>            if (l.isEmpty())<a name="line.1260"></a>
-<span class="sourceLineNo">1261</span>               return null;<a name="line.1261"></a>
-<span class="sourceLineNo">1262</span>            return l.toArray(new ClassMeta[l.size()]);<a name="line.1262"></a>
-<span class="sourceLineNo">1263</span>         }<a name="line.1263"></a>
-<span class="sourceLineNo">1264</span>      }<a name="line.1264"></a>
-<span class="sourceLineNo">1265</span><a name="line.1265"></a>
-<span class="sourceLineNo">1266</span>      return null;<a name="line.1266"></a>
-<span class="sourceLineNo">1267</span>   }<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>    * Shortcut for calling {@code getClassMeta(o.getClass())}.<a name="line.1270"></a>
-<span class="sourceLineNo">1271</span>    *<a name="line.1271"></a>
-<span class="sourceLineNo">1272</span>    * @param &lt;T&gt; The class of the object being passed in.<a name="line.1272"></a>
-<span class="sourceLineNo">1273</span>    * @param o The class to find the class type for.<a name="line.1273"></a>
-<span class="sourceLineNo">1274</span>    * @return The ClassMeta object, or &lt;jk&gt;null&lt;/jk&gt; if {@code o} is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span>    */<a name="line.1275"></a>
-<span class="sourceLineNo">1276</span>   public final &lt;T&gt; ClassMeta&lt;T&gt; getClassMetaForObject(T o) {<a name="line.1276"></a>
-<span class="sourceLineNo">1277</span>      if (o == null)<a name="line.1277"></a>
-<span class="sourceLineNo">1278</span>         return null;<a name="line.1278"></a>
-<span class="sourceLineNo">1279</span>      return (ClassMeta&lt;T&gt;)getClassMeta(o.getClass());<a name="line.1279"></a>
-<span class="sourceLineNo">1280</span>   }<a name="line.1280"></a>
-<span class="sourceLineNo">1281</span><a name="line.1281"></a>
-<span class="sourceLineNo">1282</span><a name="line.1282"></a>
-<span class="sourceLineNo">1283</span>   /**<a name="line.1283"></a>
-<span class="sourceLineNo">1284</span>    * Used for determining the class type on a method or field where a {@code @BeanProperty} annotation<a name="line.1284"></a>
-<span class="sourceLineNo">1285</span>    *    may be present.<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span>    *<a name="line.1286"></a>
-<span class="sourceLineNo">1287</span>    * @param &lt;T&gt; The class type we're wrapping.<a name="line.1287"></a>
-<span class="sourceLineNo">1288</span>    * @param p The property annotation on the type if there is one.<a name="line.1288"></a>
-<span class="sourceLineNo">1289</span>    * @param t The type.<a name="line.1289"></a>
-<span class="sourceLineNo">1290</span>    * @param typeVarImpls Contains known resolved type parameters on the specified class so<a name="line.1290"></a>
-<span class="sourceLineNo">1291</span>    *    that we can result {@code ParameterizedTypes} and {@code TypeVariables}.&lt;br&gt;<a name="line.1291"></a>
-<span class="sourceLineNo">1292</span>    * Can be &lt;jk&gt;null&lt;/jk&gt; if the information is not known.<a name="line.1292"></a>
-<span class="sourceLineNo">1293</span>    * @return The new {@code ClassMeta} object wrapped around the {@code Type} object.<a name="line.1293"></a>
-<span class="sourceLineNo">1294</span>    */<a name="line.1294"></a>
-<span class="sourceLineNo">1295</span>   protected final &lt;T&gt; ClassMeta&lt;T&gt; resolveClassMeta(BeanProperty p, Type t, Map&lt;Class&lt;?&gt;,Class&lt;?&gt;[]&gt; typeVarImpls) {<a name="line.1295"></a>
-<span class="sourceLineNo">1296</span>      ClassMeta&lt;T&gt; cm = resolveClassMeta(t, typeVarImpls);<a name="line.1296"></a>
-<span class="sourceLineNo">1297</span>      ClassMeta&lt;T&gt; cm2 = cm;<a name="line.1297"></a>
-<span class="sourceLineNo">1298</span>      if (p != null) {<a name="line.1298"></a>
-<span class="sourceLineNo">1299</span><a name="line.1299"></a>
-<span class="sourceLineNo">1300</span>         if (p.type() != Object.class)<a name="line.1300"></a>
-<span class="sourceLineNo">1301</span>            cm2 = resolveClassMeta(p.type(), typeVarImpls);<a name="line.1301"></a>
-<span class="sourceLineNo">1302</span><a name="line.1302"></a>
-<span class="sourceLineNo">1303</span>         if (cm2.isMap()) {<a name="line.1303"></a>
-<span class="sourceLineNo">1304</span>            Class&lt;?&gt;[] pParams = (p.params().length == 0 ? new Class[]{Object.class, Object.class} : p.params());<a name="line.1304"></a>
-<span class="sourceLineNo">1305</span>            if (pParams.length != 2)<a name="line.1305"></a>
-<span class="sourceLineNo">1306</span>               throw new RuntimeException("Invalid number of parameters specified for Map (must be 2): " + pParams.length);<a name="line.1306"></a>
-<span class="sourceLineNo">1307</span>            ClassMeta&lt;?&gt; keyType = resolveType(pParams[0], cm2.getKeyType(), cm.getKeyType());<a name="line.1307"></a>
-<span class="sourceLineNo">1308</span>            ClassMeta&lt;?&gt; valueType = resolveType(pParams[1], cm2.getValueType(), cm.getValueType());<a name="line.1308"></a>
-<span class="sourceLineNo">1309</span>            if (keyType.isObject() &amp;&amp; valueType.isObject())<a name="line.1309"></a>
-<span class="sourceLineNo">1310</span>               return cm2;<a name="line.1310"></a>
-<span class="sourceLineNo">1311</span>            return new ClassMeta&lt;T&gt;(cm2, keyType, valueType, null);<a name="line.1311"></a>
-<span class="sourceLineNo">1312</span>         }<a name="line.1312"></a>
-<span class="sourceLineNo">1313</span><a name="line.1313"></a>
-<span class="sourceLineNo">1314</span>         if (cm2.isCollection()) {<a name="line.1314"></a>
-<span class="sourceLineNo">1315</span>            Class&lt;?&gt;[] pParams = (p.params().length == 0 ? new Class[]{Object.class} : p.params());<a name="line.1315"></a>
-<span class="sourceLineNo">1316</span>            if (pParams.length != 1)<a name="line.1316"></a>
-<span class="sourceLineNo">1317</span>               throw new RuntimeException("Invalid number of parameters specified for Collection (must be 1): " + pParams.length);<a name="line.1317"></a>
-<span class="sourceLineNo">1318</span>            ClassMeta&lt;?&gt; elementType = resolveType(pParams[0], cm2.getElementType(), cm.getElementType());<a name="line.1318"></a>
-<span class="sourceLineNo">1319</span>            if (elementType.isObject())<a name="line.1319"></a>
-<span class="sourceLineNo">1320</span>               return cm2;<a name="line.1320"></a>
-<span class="sourceLineNo">1321</span>            return new ClassMeta&lt;T&gt;(cm2, null, null, elementType);<a name="line.1321"></a>
-<span class="sourceLineNo">1322</span>         }<a name="line.1322"></a>
-<span class="sourceLineNo">1323</span><a name="line.1323"></a>
-<span class="sourceLineNo">1324</span>         return cm2;<a name="line.1324"></a>
-<span class="sourceLineNo">1325</span>      }<a name="line.1325"></a>
-<span class="sourceLineNo">1326</span><a name="line.1326"></a>
-<span class="sourceLineNo">1327</span>      return cm;<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>   private ClassMeta&lt;?&gt; resolveType(Type...t) {<a name="line.1330"></a>
-<span class="sourceLineNo">1331</span>      for (Type tt : t) {<a name="line.1331"></a>
-<span class="sourceLineNo">1332</span>         if (tt != null) {<a name="line.1332"></a>
-<span class="sourceLineNo">1333</span>            ClassMeta&lt;?&gt; cm = getClassMeta(tt);<a name="line.1333"></a>
-<span class="sourceLineNo">1334</span>            if (tt != cmObject)<a name="line.1334"></a>
-<span class="sourceLineNo">1335</span>               return cm;<a name="line.1335"></a>
-<span class="sourceLineNo">1336</span>         }<a name="line.1336"></a>
+<span class="sourceLineNo">1185</span>      return rawType;<a name="line.1185"></a>
+<span class="sourceLineNo">1186</span>   }<a name="line.1186"></a>
+<span class="sourceLineNo">1187</span><a name="line.1187"></a>
+<span class="sourceLineNo">1188</span>   /**<a name="line.1188"></a>
+<span class="sourceLineNo">1189</span>    * Convert a Type to a Class if possible.<a name="line.1189"></a>
+<span class="sourceLineNo">1190</span>    * Return null if not possible.<a name="line.1190"></a>
+<span class="sourceLineNo">1191</span>    */<a name="line.1191"></a>
+<span class="sourceLineNo">1192</span>   final Class resolve(Type t, Map&lt;Class&lt;?&gt;,Class&lt;?&gt;[]&gt; typeVarImpls) {<a name="line.1192"></a>
+<span class="sourceLineNo">1193</span><a name="line.1193"></a>
+<span class="sourceLineNo">1194</span>      if (t instanceof Class)<a name="line.1194"></a>
+<span class="sourceLineNo">1195</span>         return (Class)t;<a name="line.1195"></a>
+<span class="sourceLineNo">1196</span><a name="line.1196"></a>
+<span class="sourceLineNo">1197</span>      if (t instanceof ParameterizedType)<a name="line.1197"></a>
+<span class="sourceLineNo">1198</span>         // A parameter (e.g. &lt;String&gt;.<a name="line.1198"></a>
+<span class="sourceLineNo">1199</span>         return (Class)((ParameterizedType)t).getRawType();<a name="line.1199"></a>
+<span class="sourceLineNo">1200</span><a name="line.1200"></a>
+<span class="sourceLineNo">1201</span>      if (t instanceof GenericArrayType) {<a name="line.1201"></a>
+<span class="sourceLineNo">1202</span>         // An array parameter (e.g. &lt;byte[]&gt;).<a name="line.1202"></a>
+<span class="sourceLineNo">1203</span>         Type gatct = ((GenericArrayType)t).getGenericComponentType();<a name="line.1203"></a>
+<span class="sourceLineNo">1204</span><a name="line.1204"></a>
+<span class="sourceLineNo">1205</span>         if (gatct instanceof Class)<a name="line.1205"></a>
+<span class="sourceLineNo">1206</span>            return Array.newInstance((Class)gatct, 0).getClass();<a name="line.1206"></a>
+<span class="sourceLineNo">1207</span><a name="line.1207"></a>
+<span class="sourceLineNo">1208</span>         if (gatct instanceof ParameterizedType)<a name="line.1208"></a>
+<span class="sourceLineNo">1209</span>            return Array.newInstance((Class)((ParameterizedType)gatct).getRawType(), 0).getClass();<a name="line.1209"></a>
+<span class="sourceLineNo">1210</span><a name="line.1210"></a>
+<span class="sourceLineNo">1211</span>         if (gatct instanceof GenericArrayType)<a name="line.1211"></a>
+<span class="sourceLineNo">1212</span>            return Array.newInstance(resolve(gatct, typeVarImpls), 0).getClass();<a name="line.1212"></a>
+<span class="sourceLineNo">1213</span><a name="line.1213"></a>
+<span class="sourceLineNo">1214</span>         return null;<a name="line.1214"></a>
+<span class="sourceLineNo">1215</span><a name="line.1215"></a>
+<span class="sourceLineNo">1216</span>      } else if (t instanceof TypeVariable) {<a name="line.1216"></a>
+<span class="sourceLineNo">1217</span>         if (typeVarImpls != null) {<a name="line.1217"></a>
+<span class="sourceLineNo">1218</span>            TypeVariable tv = (TypeVariable)t;<a name="line.1218"></a>
+<span class="sourceLineNo">1219</span>            String varName = tv.getName();<a name="line.1219"></a>
+<span class="sourceLineNo">1220</span>            int varIndex = -1;<a name="line.1220"></a>
+<span class="sourceLineNo">1221</span>            Class gc = (Class)tv.getGenericDeclaration();<a name="line.1221"></a>
+<span class="sourceLineNo">1222</span>            TypeVariable[] tvv = gc.getTypeParameters();<a name="line.1222"></a>
+<span class="sourceLineNo">1223</span>            for (int i = 0; i &lt; tvv.length; i++) {<a name="line.1223"></a>
+<span class="sourceLineNo">1224</span>               if (tvv[i].getName().equals(varName)) {<a name="line.1224"></a>
+<span class="sourceLineNo">1225</span>                  varIndex = i;<a name="line.1225"></a>
+<span class="sourceLineNo">1226</span>               }<a name="line.1226"></a>
+<span class="sourceLineNo">1227</span>            }<a name="line.1227"></a>
+<span class="sourceLineNo">1228</span>            if (varIndex != -1) {<a name="line.1228"></a>
+<span class="sourceLineNo">1229</span><a name="line.1229"></a>
+<span class="sourceLineNo">1230</span>               // If we couldn't find a type variable implementation, that means<a name="line.1230"></a>
+<span class="sourceLineNo">1231</span>               // the type was defined at runtime (e.g. Bean b = new Bean&lt;Foo&gt;();)<a name="line.1231"></a>
+<span class="sourceLineNo">1232</span>               // in which case the type is lost through erasure.<a name="line.1232"></a>
+<span class="sourceLineNo">1233</span>               // Assume java.lang.Object as the type.<a name="line.1233"></a>
+<span class="sourceLineNo">1234</span>               if (! typeVarImpls.containsKey(gc))<a name="line.1234"></a>
+<span class="sourceLineNo">1235</span>                  return null;<a name="line.1235"></a>
+<span class="sourceLineNo">1236</span><a name="line.1236"></a>
+<span class="sourceLineNo">1237</span>               return typeVarImpls.get(gc)[varIndex];<a name="line.1237"></a>
+<span class="sourceLineNo">1238</span>            }<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>      return null;<a name="line.1241"></a>
+<span class="sourceLineNo">1242</span>   }<a name="line.1242"></a>
+<span class="sourceLineNo">1243</span><a name="line.1243"></a>
+<span class="sourceLineNo">1244</span>   final ClassMeta[] findParameters(Type o, Class c) {<a name="line.1244"></a>
+<span class="sourceLineNo">1245</span>      if (o == null)<a name="line.1245"></a>
+<span class="sourceLineNo">1246</span>         o = c;<a name="line.1246"></a>
+<span class="sourceLineNo">1247</span><a name="line.1247"></a>
+<span class="sourceLineNo">1248</span>      // Loop until we find a ParameterizedType<a name="line.1248"></a>
+<span class="sourceLineNo">1249</span>      if (! (o instanceof ParameterizedType)) {<a name="line.1249"></a>
+<span class="sourceLineNo">1250</span>         loop: do {<a name="line.1250"></a>
+<span class="sourceLineNo">1251</span>            o = c.getGenericSuperclass();<a name="line.1251"></a>
+<span class="sourceLineNo">1252</span>            if (o instanceof ParameterizedType)<a name="line.1252"></a>
+<span class="sourceLineNo">1253</span>               break loop;<a name="line.1253"></a>
+<span class="sourceLineNo">1254</span>            for (Type t : c.getGenericInterfaces()) {<a name="line.1254"></a>
+<span class="sourceLineNo">1255</span>               o = t;<a name="line.1255"></a>
+<span class="sourceLineNo">1256</span>               if (o instanceof ParameterizedType)<a name="line.1256"></a>
+<span class="sourceLineNo">1257</span>                  break loop;<a name="line.1257"></a>
+<span class="sourceLineNo">1258</span>            }<a name="line.1258"></a>
+<span class="sourceLineNo">1259</span>            c = c.getSuperclass();<a name="line.1259"></a>
+<span class="sourceLineNo">1260</span>         } while (c != null);<a name="line.1260"></a>
+<span class="sourceLineNo">1261</span>      }<a name="line.1261"></a>
+<span class="sourceLineNo">1262</span><a name="line.1262"></a>
+<span class="sourceLineNo">1263</span>      if (o instanceof ParameterizedType) {<a name="line.1263"></a>
+<span class="sourceLineNo">1264</span>         ParameterizedType pt = (ParameterizedType)o;<a name="line.1264"></a>
+<span class="sourceLineNo">1265</span>         if (! pt.getRawType().equals(Enum.class)) {<a name="line.1265"></a>
+<span class="sourceLineNo">1266</span>            List&lt;ClassMeta&lt;?&gt;&gt; l = new LinkedList&lt;ClassMeta&lt;?&gt;&gt;();<a name="line.1266"></a>
+<span class="sourceLineNo">1267</span>            for (Type pt2 : pt.getActualTypeArguments()) {<a name="line.1267"></a>
+<span class="sourceLineNo">1268</span>               if (pt2 instanceof WildcardType || pt2 instanceof TypeVariable)<a name="line.1268"></a>
+<span class="sourceLineNo">1269</span>                  return null;<a name="line.1269"></a>
+<span class="sourceLineNo">1270</span>               l.add(resolveClassMeta(pt2, null));<a name="line.1270"></a>
+<span class="sourceLineNo">1271</span>            }<a name="line.1271"></a>
+<span class="sourceLineNo">1272</span>            if (l.isEmpty())<a name="line.1272"></a>
+<span class="sourceLineNo">1273</span>               return null;<a name="line.1273"></a>
+<span class="sourceLineNo">1274</span>            return l.toArray(new ClassMeta[l.size()]);<a name="line.1274"></a>
+<span class="sourceLineNo">1275</span>         }<a name="line.1275"></a>
+<span class="sourceLineNo">1276</span>      }<a name="line.1276"></a>
+<span class="sourceLineNo">1277</span><a name="line.1277"></a>
+<span class="sourceLineNo">1278</span>      return null;<a name="line.1278"></a>
+<span class="sourceLineNo">1279</span>   }<a name="line.1279"></a>
+<span class="sourceLineNo">1280</span><a name="line.1280"></a>
+<span class="sourceLineNo">1281</span>   /**<a name="line.1281"></a>
+<span class="sourceLineNo">1282</span>    * Shortcut for calling {@code getClassMeta(o.getClass())}.<a name="line.1282"></a>
+<span class="sourceLineNo">1283</span>    *<a name="line.1283"></a>
+<span class="sourceLineNo">1284</span>    * @param &lt;T&gt; The class of the object being passed in.<a name="line.1284"></a>
+<span class="sourceLineNo">1285</span>    * @param o The class to find the class type for.<a name="line.1285"></a>
+<span class="sourceLineNo">1286</span>    * @return The ClassMeta object, or &lt;jk&gt;null&lt;/jk&gt; if {@code o} is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1286"></a>
+<span class="sourceLineNo">1287</span>    */<a name="line.1287"></a>
+<span class="sourceLineNo">1288</span>   public final &lt;T&gt; ClassMeta&lt;T&gt; getClassMetaForObject(T o) {<a name="line.1288"></a>
+<span class="sourceLineNo">1289</span>      if (o == null)<a name="line.1289"></a>
+<span class="sourceLineNo">1290</span>         return null;<a name="line.1290"></a>
+<span class="sourceLineNo">1291</span>      return (ClassMeta&lt;T&gt;)getClassMeta(o.getClass());<a name="line.1291"></a>
+<span class="sourceLineNo">1292</span>   }<a name="line.1292"></a>
+<span class="sourceLineNo">1293</span><a name="line.1293"></a>
+<span class="sourceLineNo">1294</span><a name="line.1294"></a>
+<span class="sourceLineNo">1295</span>   /**<a name="line.1295"></a>
+<span class="sourceLineNo">1296</span>    * Used for determining the class type on a method or field where a {@code @BeanProperty} annotation<a name="line.1296"></a>
+<span class="sourceLineNo">1297</span>    *    may be present.<a name="line.1297"></a>
+<span class="sourceLineNo">1298</span>    *<a name="line.1298"></a>
+<span class="sourceLineNo">1299</span>    * @param &lt;T&gt; The class type we're wrapping.<a name="line.1299"></a>
+<span class="sourceLineNo">1300</span>    * @param p The property annotation on the type if there is one.<a name="line.1300"></a>
+<span class="sourceLineNo">1301</span>    * @param t The type.<a name="line.1301"></a>
+<span class="sourceLineNo">1302</span>    * @param typeVarImpls Contains known resolved type parameters on the specified class so<a name="line.1302"></a>
+<span class="sourceLineNo">1303</span>    *    that we can result {@code ParameterizedTypes} and {@code TypeVariables}.&lt;br&gt;<a name="line.1303"></a>
+<span class="sourceLineNo">1304</span>    * Can be &lt;jk&gt;null&lt;/jk&gt; if the information is not known.<a name="line.1304"></a>
+<span class="sourceLineNo">1305</span>    * @return The new {@code ClassMeta} object wrapped around the {@code Type} object.<a name="line.1305"></a>
+<span class="sourceLineNo">1306</span>    */<a name="line.1306"></a>
+<span class="sourceLineNo">1307</span>   protected final &lt;T&gt; ClassMeta&lt;T&gt; resolveClassMeta(BeanProperty p, Type t, Map&lt;Class&lt;?&gt;,Class&lt;?&gt;[]&gt; typeVarImpls) {<a name="line.1307"></a>
+<span class="sourceLineNo">1308</span>      ClassMeta&lt;T&gt; cm = resolveClassMeta(t, typeVarImpls);<a name="line.1308"></a>
+<span class="sourceLineNo">1309</span>      ClassMeta&lt;T&gt; cm2 = cm;<a name="line.1309"></a>
+<span class="sourceLineNo">1310</span>      if (p != null) {<a name="line.1310"></a>
+<span class="sourceLineNo">1311</span><a name="line.1311"></a>
+<span class="sourceLineNo">1312</span>         if (p.type() != Object.class)<a name="line.1312"></a>
+<span class="sourceLineNo">1313</span>            cm2 = resolveClassMeta(p.type(), typeVarImpls);<a name="line.1313"></a>
+<span class="sourceLineNo">1314</span><a name="line.1314"></a>
+<span class="sourceLineNo">1315</span>         if (cm2.isMap()) {<a name="line.1315"></a>
+<span class="sourceLineNo">1316</span>            Class&lt;?&gt;[] pParams = (p.params().length == 0 ? new Class[]{Object.class, Object.class} : p.params());<a name="line.1316"></a>
+<span class="sourceLineNo">1317</span>            if (pParams.length != 2)<a name="line.1317"></a>
+<span class="sourceLineNo">1318</span>               throw new RuntimeException("Invalid number of parameters specified for Map (must be 2): " + pParams.length);<a name="line.1318"></a>
+<span class="sourceLineNo">1319</span>            ClassMeta&lt;?&gt; keyType = resolveType(pParams[0], cm2.getKeyType(), cm.getKeyType());<a name="line.1319"></a>
+<span class="sourceLineNo">1320</span>            ClassMeta&lt;?&gt; valueType = resolveType(pParams[1], cm2.getValueType(), cm.getValueType());<a name="line.1320"></a>
+<span class="sourceLineNo">1321</span>            if (keyType.isObject() &amp;&amp; valueType.isObject())<a name="line.1321"></a>
+<span class="sourceLineNo">1322</span>               return cm2;<a name="line.1322"></a>
+<span class="sourceLineNo">1323</span>            return new ClassMeta&lt;T&gt;(cm2, keyType, valueType, null);<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>         if (cm2.isCollection()) {<a name="line.1326"></a>
+<span class="sourceLineNo">1327</span>            Class&lt;?&gt;[] pParams = (p.params().length == 0 ? new Class[]{Object.class} : p.params());<a name="line.1327"></a>
+<span class="sourceLineNo">1328</span>            if (pParams.length != 1)<a name="line.1328"></a>
+<span class="sourceLineNo">1329</span>               throw new RuntimeException("Invalid number of parameters specified for Collection (must be 1): " + pParams.length);<a name="line.1329"></a>
+<span class="sourceLineNo">1330</span>            ClassMeta&lt;?&gt; elementType = resolveType(pParams[0], cm2.getElementType(), cm.getElementType());<a name="line.1330"></a>
+<span class="sourceLineNo">1331</span>            if (elementType.isObject())<a name="line.1331"></a>
+<span class="sourceLineNo">1332</span>               return cm2;<a name="line.1332"></a>
+<span class="sourceLineNo">1333</span>            return new ClassMeta&lt;T&gt;(cm2, null, null, elementType);<a name="line.1333"></a>
+<span class="sourceLineNo">1334</span>         }<a name="line.1334"></a>
+<span class="sourceLineNo">1335</span><a name="line.1335"></a>
+<span class="sourceLineNo">1336</span>         return cm2;<a name="line.1336"></a>
 <span class="sourceLineNo">1337</span>      }<a name="line.1337"></a>
-<span class="sourceLineNo">1338</span>      return cmObject;<a name="line.1338"></a>
-<span class="sourceLineNo">1339</span>   }<a name="line.1339"></a>
-<span class="sourceLineNo">1340</span><a name="line.1340"></a>
-<span class="sourceLineNo">1341</span>   /**<a name="line.1341"></a>
-<span class="sourceLineNo">1342</span>    * Returns the {@link PojoSwap} associated with the specified class, or &lt;jk&gt;null&lt;/jk&gt; if there is no<a name="line.1342"></a>
-<span class="sourceLineNo">1343</span>    * pojo swap associated with the class.<a name="line.1343"></a>
-<span class="sourceLineNo">1344</span>    *<a name="line.1344"></a>
-<span class="sourceLineNo">1345</span>    * @param &lt;T&gt; The class associated with the swap.<a name="line.1345"></a>
-<span class="sourceLineNo">1346</span>    * @param c The class associated with the swap.<a name="line.1346"></a>
-<span class="sourceLineNo">1347</span>    * @return The swap associated with the class, or null if there is no association.<a name="line.1347"></a>
-<span class="sourceLineNo">1348</span>    */<a name="line.1348"></a>
-<span class="sourceLineNo">1349</span>   private final &lt;T&gt; PojoSwap findPojoSwap(Class&lt;T&gt; c) {<a name="line.1349"></a>
-<span class="sourceLineNo">1350</span>      // Note:  On first<a name="line.1350"></a>
-<span class="sourceLineNo">1351</span>      if (c != null)<a name="line.1351"></a>
-<span class="sourceLineNo">1352</span>         for (PojoSwap f : pojoSwaps)<a name="line.1352"></a>
-<span class="sourceLineNo">1353</span>            if (isParentClass(f.getNormalClass(), c))<a name="line.1353"></a>
-<span class="sourceLineNo">1354</span>               return f;<a name="line.1354"></a>
-<span class="sourceLineNo">1355</span>      return null;<a name="line.1355"></a>
-<span class="sourceLineNo">1356</span>   }<a name="line.1356"></a>
-<span class="sourceLineNo">1357</span><a name="line.1357"></a>
-<span class="sourceLineNo">1358</span>   /**<a name="line.1358"></a>
-<span class="sourceLineNo">1359</span>    * Checks whether a class has a {@link PojoSwap} associated with it in this bean context.<a name="line.1359"></a>
-<span class="sourceLineNo">1360</span>    * @param c The class to check.<a name="line.1360"></a>
-<span class="sourceLineNo">1361</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified class or one of its subclasses has a {@link PojoSwap} associated with it.<a name="line.1361"></a>
-<span class="sourceLineNo">1362</span>    */<a name="line.1362"></a>
-<span class="sourceLineNo">1363</span>   private final PojoSwap[] findChildPojoSwaps(Class&lt;?&gt; c) {<a name="line.1363"></a>
-<span class="sourceLineNo">1364</span>      if (c == null || pojoSwaps.length == 0)<a name="line.1364"></a>
-<span class="sourceLineNo">1365</span>         return null;<a name="line.1365"></a>
-<span class="sourceLineNo">1366</span>      List&lt;PojoSwap&gt; l = null;<a name="line.1366"></a>
-<span class="sourceLineNo">1367</span>      for (PojoSwap f : pojoSwaps) {<a name="line.1367"></a>
-<span class="sourceLineNo">1368</span>         if (isParentClass(c, f.getNormalClass())) {<a name="line.1368"></a>
-<span class="sourceLineNo">1369</span>            if (l == null)<a name="line.1369"></a>
-<span class="sourceLineNo">1370</span>               l = new ArrayList&lt;PojoSwap&gt;();<a name="line.1370"></a>
-<span class="sourceLineNo">1371</span>            l.add(f);<a name="line.1371"></a>
-<span class="sourceLineNo">1372</span>         }<a name="line.1372"></a>
-<span class="sourceLineNo">1373</span>      }<a name="line.1373"></a>
-<span class="sourceLineNo">1374</span>      return l == null ? null : l.toArray(new PojoSwap[l.size()]);<a name="line.1374"></a>
-<span class="sourceLineNo">1375</span>   }<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>    * Returns the {@link BeanFilter} associated with the specified class, or &lt;jk&gt;null&lt;/jk&gt; if there is no<a name="line.1378"></a>
-<span class="sourceLineNo">1379</span>    * bean filter associated with the class.<a name="line.1379"></a>
-<span class="sourceLineNo">1380</span>    *<a name="line.1380"></a>
-<span class="sourceLineNo">1381</span>    * @param &lt;T&gt; The class associated with the bean filter.<a name="line.1381"></a>
-<span class="sourceLineNo">1382</span>    * @param c The class associated with the bean filter.<a name="line.1382"></a>
-<span class="sourceLineNo">1383</span>    * @return The bean filter associated with the class, or null if there is no association.<a name="line.1383"></a>
-<span class="sourceLineNo">1384</span>    */<a name="line.1384"></a>
-<span class="sourceLineNo">1385</span>   private final &lt;T&gt; BeanFilter findBeanFilter(Class&lt;T&gt; c) {<a name="line.1385"></a>
-<span class="sourceLineNo">1386</span>      if (c != null)<a name="line.1386"></a>
-<span class="sourceLineNo">1387</span>         for (BeanFilter f : beanFilters)<a name="line.1387"></a>
-<span class="sourceLineNo">1388</span>            if (isParentClass(f.getBeanClass(), c))<a name="line.1388"></a>
-<span class="sourceLineNo">1389</span>               return f;<a name="line.1389"></a>
-<span class="sourceLineNo">1390</span>      return null;<a name="line.1390"></a>
-<span class="sourceLineNo">1391</span>   }<a name="line.1391"></a>
-<span class="sourceLineNo">1392</span><a name="line.1392"></a>
-<span class="sourceLineNo">1393</span>   /**<a name="line.1393"></a>
-<span class="sourceLineNo">1394</span>    * Returns the type property name as defined by {@link BeanContext#BEAN_beanTypePropertyName}.<a name="line.1394"></a>
-<span class="sourceLineNo">1395</span>    *<a name="line.1395"></a>
-<span class="sourceLineNo">1396</span>    * @return The type property name.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1396"></a>
-<span class="sourceLineNo">1397</span>    */<a name="line.1397"></a>
-<span class="sourceLineNo">1398</span>   protected final String getBeanTypePropertyName() {<a name="line.1398"></a>
-<span class="sourceLineNo">1399</span>      return beanTypePropertyName;<a name="line.1399"></a>
-<span class="sourceLineNo">1400</span>   }<a name="line.1400"></a>
-<span class="sourceLineNo">1401</span><a name="line.1401"></a>
-<span class="sourceLineNo">1402</span>   /**<a name="line.1402"></a>
-<span class="sourceLineNo">1403</span>    * Returns the bean registry defined in this bean context defined by {@link BeanContext#BEAN_beanDictionary}.<a name="line.1403"></a>
-<span class="sourceLineNo">1404</span>    *<a name="line.1404"></a>
-<span class="sourceLineNo">1405</span>    * @return The bean registry defined in this bean context.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1405"></a>
-<span class="sourceLineNo">1406</span>    */<a name="line.1406"></a>
-<span class="sourceLineNo">1407</span>   protected final BeanRegistry getBeanRegistry() {<a name="line.1407"></a>
-<span class="sourceLineNo">1408</span>      return beanRegistry;<a name="line.1408"></a>
-<span class="sourceLineNo">1409</span>   }<a name="line.1409"></a>
-<span class="sourceLineNo">1410</span><a name="line.1410"></a>
-<span class="sourceLineNo">1411</span>   /**<a name="line.1411"></a>
-<span class="sourceLineNo">1412</span>    * Gets the no-arg constructor for the specified class.<a name="line.1412"></a>
-<span class="sourceLineNo">1413</span>    *<a name="line.1413"></a>
-<span class="sourceLineNo">1414</span>    * @param &lt;T&gt; The class to check.<a name="line.1414"></a>
-<span class="sourceLineNo">1415</span>    * @param c The class to check.<a name="line.1415"></a>
-<span class="sourceLineNo">1416</span>    * @param v The minimum visibility for the constructor.<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span>    * @return The no arg constructor, or &lt;jk&gt;null&lt;/jk&gt; if the class has no no-arg constructor.<a name="line.1417"></a>
+<span class="sourceLineNo">1338</span><a name="line.1338"></a>
+<span class="sourceLineNo">1339</span>      return cm;<a name="line.1339"></a>
+<span class="sourceLineNo">1340</span>   }<a name="line.1340"></a>
+<span class="sourceLineNo">1341</span><a name="line.1341"></a>
+<span class="sourceLineNo">1342</span>   private ClassMeta&lt;?&gt; resolveType(Type...t) {<a name="line.1342"></a>
+<span class="sourceLineNo">1343</span>      for (Type tt : t) {<a name="line.1343"></a>
+<span class="sourceLineNo">1344</span>         if (tt != null) {<a name="line.1344"></a>
+<span class="sourceLineNo">1345</span>            ClassMeta&lt;?&gt; cm = getClassMeta(tt);<a name="line.1345"></a>
+<span class="sourceLineNo">1346</span>            if (tt != cmObject)<a name="line.1346"></a>
+<span class="sourceLineNo">1347</span>               return cm;<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 cmObject;<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 PojoSwap} associated with the specified class, or &lt;jk&gt;null&lt;/jk&gt; if there is no<a name="line.1354"></a>
+<span class="sourceLineNo">1355</span>    * pojo swap 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 &lt;T&gt; The class associated with the swap.<a name="line.1357"></a>
+<span class="sourceLineNo">1358</span>    * @param c The class associated with the swap.<a name="line.1358"></a>
+<span class="sourceLineNo">1359</span>    * @return The swap 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 &lt;T&gt; PojoSwap findPojoSwap(Class&lt;T&gt; c) {<a name="line.1361"></a>
+<span class="sourceLineNo">1362</span>      // Note:  On first<a name="line.1362"></a>
+<span class="sourceLineNo">1363</span>      if (c != null)<a name="line.1363"></a>
+<span class="sourceLineNo">1364</span>         for (PojoSwap f : pojoSwaps)<a name="line.1364"></a>
+<span class="sourceLineNo">1365</span>            if (isParentClass(f.getNormalClass(), c))<a name="line.1365"></a>
+<span class="sourceLineNo">1366</span>               return f;<a name="line.1366"></a>
+<span class="sourceLineNo">1367</span>      return null;<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>   /**<a name="line.1370"></a>
+<span class="sourceLineNo">1371</span>    * Checks whether a class has a {@link PojoSwap} associated with it in this bean context.<a name="line.1371"></a>
+<span class="sourceLineNo">1372</span>    * @param c The class to check.<a name="line.1372"></a>
+<span class="sourceLineNo">1373</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified class or one of its subclasses has a {@link PojoSwap} associated with it.<a name="line.1373"></a>
+<span class="sourceLineNo">1374</span>    */<a name="line.1374"></a>
+<span class="sourceLineNo">1375</span>   private final PojoSwap[] findChildPojoSwaps(Class&lt;?&gt; c) {<a name="line.1375"></a>
+<span class="sourceLineNo">1376</span>      if (c == null || pojoSwaps.length == 0)<a name="line.1376"></a>
+<span class="sourceLineNo">1377</span>         return null;<a name="line.1377"></a>
+<span class="sourceLineNo">1378</span>      List&lt;PojoSwap&gt; l = null;<a name="line.1378"></a>
+<span class="sourceLineNo">1379</span>      for (PojoSwap f : pojoSwaps) {<a name="line.1379"></a>
+<span class="sourceLineNo">1380</span>         if (isParentClass(c, f.getNormalClass())) {<a name="line.1380"></a>
+<span class="sourceLineNo">1381</span>            if (l == null)<a name="line.1381"></a>
+<span class="sourceLineNo">1382</span>               l = new ArrayList&lt;PojoSwap&gt;();<a name="line.1382"></a>
+<span class="sourceLineNo">1383</span>            l.add(f);<a name="line.1383"></a>
+<span class="sourceLineNo">1384</span>         }<a name="line.1384"></a>
+<span class="sourceLineNo">1385</span>      }<a name="line.1385"></a>
+<span class="sourceLineNo">1386</span>      return l == null ? null : l.toArray(new PojoSwap[l.size()]);<a name="line.1386"></a>
+<span class="sourceLineNo">1387</span>   }<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>    * Returns the {@link BeanFilter} associated with the specified class, or &lt;jk&gt;null&lt;/jk&gt; if there is no<a name="line.1390"></a>
+<span class="sourceLineNo">1391</span>    * bean filter associated with the class.<a name="line.1391"></a>
+<span class="sourceLineNo">1392</span>    *<a name="line.1392"></a>
+<span class="sourceLineNo">1393</span>    * @param &lt;T&gt; The class associated with the bean filter.<a name="line.1393"></a>
+<span class="sourceLineNo">1394</span>    * @param c The class associated with the bean filter.<a name="line.1394"></a>
+<span class="sourceLineNo">1395</span>    * @return The bean filter associated with the class, or null if there is no association.<a name="line.1395"></a>
+<span class="sourceLineNo">1396</span>    */<a name="line.1396"></a>
+<span class="sourceLineNo">1397</span>   private final &lt;T&gt; BeanFilter findBeanFilter(Class&lt;T&gt; c) {<a name="line.1397"></a>
+<span class="sourceLineNo">1398</span>      if (c != null)<a name="line.1398"></a>
+<span class="sourceLineNo">1399</span>         for (BeanFilter f : beanFilters)<a name="line.1399"></a>
+<span class="sourceLineNo">1400</span>            if (isParentClass(f.getBeanClass(), c))<a name="line.1400"></a>
+<span class="sourceLineNo">1401</span>               return f;<a name="line.1401"></a>
+<span class="sourceLineNo">1402</span>      return null;<a name="line.1402"></a>
+<span class="sourceLineNo">1403</span>   }<a name="line.1403"></a>
+<span class="sourceLineNo">1404</span><a name="line.1404"></a>
+<span class="sourceLineNo">1405</span>   /**<a name="line.1405"></a>
+<span class="sourceLineNo">1406</span>    * Returns the type property name as defined by {@link BeanContext#BEAN_beanTypePropertyName}.<a name="line.1406"></a>
+<span class="sourceLineNo">1407</span>    *<a name="line.1407"></a>
+<span class="sourceLineNo">1408</span>    * @return The type property name.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1408"></a>
+<span class="sourceLineNo">1409</span>    */<a name="line.1409"></a>
+<span class="sourceLineNo">1410</span>   protected final String getBeanTypePropertyName() {<a name="line.1410"></a>
+<span class="sourceLineNo">1411</span>      return beanTypePropertyName;<a name="line.1411"></a>
+<span class="sourceLineNo">1412</span>   }<a name="line.1412"></a>
+<span class="sourceLineNo">1413</span><a name="line.1413"></a>
+<span class="sourceLineNo">1414</span>   /**<a name="line.1414"></a>
+<span class="sourceLineNo">1415</span>    * Returns the bean registry defined in this bean context defined by {@link BeanContext#BEAN_beanDictionary}.<a name="line.1415"></a>
+<span class="sourceLineNo">1416</span>    *<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span>    * @return The bean registry defined in this bean context.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1417"></a>
 <span class="sourceLineNo">1418</span>    */<a name="line.1418"></a>
-<span class="sourceLineNo">1419</span>   protected final &lt;T&gt; Constructor&lt;? extends T&gt; getImplClassConstructor(Class&lt;T&gt; c, Visibility v) {<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span>      if (implClasses.isEmpty())<a name="line.1420"></a>
-<span class="sourceLineNo">1421</span>         return null;<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span>      Class cc = c;<a name="line.1422"></a>
-<span class="sourceLineNo">1423</span>      while (cc != null) {<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span>         Class implClass = implClasses.get(cc);<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span>         if (implClass != null)<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span>            return findNoArgConstructor(implClass, v);<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span>         for (Class ic : cc.getInterfaces()) {<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span>            implClass = implClasses.get(ic);<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span>            if (implClass != null)<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span>               return findNoArgConstructor(implClass, v);<a name="line.1430

<TRUNCATED>


[13/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/html/HtmlWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlWriter.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlWriter.html
index 0bcaf05..24d065e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlWriter.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlWriter.html
@@ -22,340 +22,343 @@
 <span class="sourceLineNo">014</span><a name="line.14"></a>
 <span class="sourceLineNo">015</span>import java.io.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.internal.*;<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><a name="line.19"></a>
-<span class="sourceLineNo">020</span>/**<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * Specialized writer for serializing HTML.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> */<a name="line.22"></a>
-<span class="sourceLineNo">023</span>public class HtmlWriter extends XmlWriter {<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>   /**<a name="line.25"></a>
-<span class="sourceLineNo">026</span>    * Constructor.<a name="line.26"></a>
-<span class="sourceLineNo">027</span>    *<a name="line.27"></a>
-<span class="sourceLineNo">028</span>    * @param out The writer being wrapped.<a name="line.28"></a>
-<span class="sourceLineNo">029</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt;, tabs will be used in output.<a name="line.29"></a>
-<span class="sourceLineNo">030</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings should be trimmed before they're serialized.<a name="line.30"></a>
-<span class="sourceLineNo">031</span>    * @param quoteChar The quote character to use (i.e. &lt;js&gt;'\''&lt;/js&gt; or &lt;js&gt;'"'&lt;/js&gt;)<a name="line.31"></a>
-<span class="sourceLineNo">032</span>    * @param uriContext The web application context path (e.g. "/contextRoot").<a name="line.32"></a>
-<span class="sourceLineNo">033</span>    * @param uriAuthority The web application URI authority (e.g. "http://hostname:9080")<a name="line.33"></a>
-<span class="sourceLineNo">034</span>    */<a name="line.34"></a>
-<span class="sourceLineNo">035</span>   public HtmlWriter(Writer out, boolean useWhitespace, boolean trimStrings, char quoteChar, String uriContext, String uriAuthority) {<a name="line.35"></a>
-<span class="sourceLineNo">036</span>      super(out, useWhitespace, trimStrings, quoteChar, uriContext, uriAuthority, false, null);<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>   /**<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    * Append an attribute with a URI value.<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    *<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    * @param name The attribute name.<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    * @param value The attribute value.  Can be any object whose &lt;code&gt;toString()&lt;/code&gt; method returns a URI.<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    * @return This object (for method chaining);<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    * @throws IOException If a problem occurred.<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>   public HtmlWriter attrUri(String name, Object value) throws IOException {<a name="line.47"></a>
-<span class="sourceLineNo">048</span>      super.attrUri((String)null, name, value);<a name="line.48"></a>
-<span class="sourceLineNo">049</span>      return this;<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>   //--------------------------------------------------------------------------------<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   // Overridden methods<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   //--------------------------------------------------------------------------------<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>   @Override /* XmlSerializerWriter */<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   public HtmlWriter text(Object o, boolean preserveWhitespace) throws IOException {<a name="line.58"></a>
+<span class="sourceLineNo">017</span>import org.apache.juneau.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.internal.*;<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><a name="line.20"></a>
+<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * Specialized writer for serializing HTML.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> */<a name="line.23"></a>
+<span class="sourceLineNo">024</span>public class HtmlWriter extends XmlWriter {<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>   /**<a name="line.26"></a>
+<span class="sourceLineNo">027</span>    * Constructor.<a name="line.27"></a>
+<span class="sourceLineNo">028</span>    *<a name="line.28"></a>
+<span class="sourceLineNo">029</span>    * @param out The writer being wrapped.<a name="line.29"></a>
+<span class="sourceLineNo">030</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt;, tabs will be used in output.<a name="line.30"></a>
+<span class="sourceLineNo">031</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings should be trimmed before they're serialized.<a name="line.31"></a>
+<span class="sourceLineNo">032</span>    * @param quoteChar The quote character to use (i.e. &lt;js&gt;'\''&lt;/js&gt; or &lt;js&gt;'"'&lt;/js&gt;)<a name="line.32"></a>
+<span class="sourceLineNo">033</span>    * @param uriContext The web application context path (e.g. "/contextRoot").<a name="line.33"></a>
+<span class="sourceLineNo">034</span>    * @param uriAuthority The web application URI authority (e.g. "http://hostname:9080")<a name="line.34"></a>
+<span class="sourceLineNo">035</span>    * @param uriContext2 The URI context.<a name="line.35"></a>
+<span class="sourceLineNo">036</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.36"></a>
+<span class="sourceLineNo">037</span>    */<a name="line.37"></a>
+<span class="sourceLineNo">038</span>   public HtmlWriter(Writer out, boolean useWhitespace, boolean trimStrings, char quoteChar, String uriContext, String uriAuthority, UriContext uriContext2) {<a name="line.38"></a>
+<span class="sourceLineNo">039</span>      super(out, useWhitespace, trimStrings, quoteChar, uriContext, uriAuthority, uriContext2, false, null);<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>   /**<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    * Append an attribute with a URI value.<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    *<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    * @param name The attribute name.<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    * @param value The attribute value.  Can be any object whose &lt;code&gt;toString()&lt;/code&gt; method returns a URI.<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    * @return This object (for method chaining);<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    * @throws IOException If a problem occurred.<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   public HtmlWriter attrUri(String name, Object value) throws IOException {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      super.attrUri((String)null, name, value);<a name="line.51"></a>
+<span class="sourceLineNo">052</span>      return this;<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>   //--------------------------------------------------------------------------------<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   // Overridden methods<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>      if (o == null) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>         append("&lt;null/&gt;");<a name="line.61"></a>
-<span class="sourceLineNo">062</span>         return this;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>      }<a name="line.63"></a>
-<span class="sourceLineNo">064</span>      String s = o.toString();<a name="line.64"></a>
-<span class="sourceLineNo">065</span>      if (s.isEmpty()) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>         append("&lt;sp/&gt;");<a name="line.66"></a>
-<span class="sourceLineNo">067</span>         return this;<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>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>         char test = s.charAt(i);<a name="line.71"></a>
-<span class="sourceLineNo">072</span>         if (test == '&amp;')<a name="line.72"></a>
-<span class="sourceLineNo">073</span>            append("&amp;amp;");<a name="line.73"></a>
-<span class="sourceLineNo">074</span>         else if (test == '&lt;')<a name="line.74"></a>
-<span class="sourceLineNo">075</span>            append("&amp;lt;");<a name="line.75"></a>
-<span class="sourceLineNo">076</span>         else if (test == '&gt;')<a name="line.76"></a>
-<span class="sourceLineNo">077</span>            append("&amp;gt;");<a name="line.77"></a>
-<span class="sourceLineNo">078</span>         else if (test == '\n')<a name="line.78"></a>
-<span class="sourceLineNo">079</span>            append(preserveWhitespace ? "\n" : "&lt;br/&gt;");<a name="line.79"></a>
-<span class="sourceLineNo">080</span>         else if (test == '\f')  // XML 1.0 doesn't support formfeeds or backslashes, so we have to invent something.<a name="line.80"></a>
-<span class="sourceLineNo">081</span>            append(preserveWhitespace ? "\f" : "&lt;ff/&gt;");<a name="line.81"></a>
-<span class="sourceLineNo">082</span>         else if (test == '\b')<a name="line.82"></a>
-<span class="sourceLineNo">083</span>            append(preserveWhitespace ? "\b" : "&lt;bs/&gt;");<a name="line.83"></a>
-<span class="sourceLineNo">084</span>         else if (test == '\t')<a name="line.84"></a>
-<span class="sourceLineNo">085</span>            append(preserveWhitespace ? "\t" : "&lt;sp&gt;&amp;#x2003;&lt;/sp&gt;");<a name="line.85"></a>
-<span class="sourceLineNo">086</span>         else if ((i == 0 || i == s.length()-1) &amp;&amp; Character.isWhitespace(test)) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>            if (preserveWhitespace)<a name="line.87"></a>
-<span class="sourceLineNo">088</span>               append(test);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>            else if (test == ' ')<a name="line.89"></a>
-<span class="sourceLineNo">090</span>               append("&lt;sp&gt; &lt;/sp&gt;");<a name="line.90"></a>
-<span class="sourceLineNo">091</span>            else<a name="line.91"></a>
-<span class="sourceLineNo">092</span>               append("&lt;sp&gt;&amp;#x").append(StringUtils.toHex(test)).append(";&lt;/sp&gt;");<a name="line.92"></a>
-<span class="sourceLineNo">093</span>         }<a name="line.93"></a>
-<span class="sourceLineNo">094</span>         else if (Character.isISOControl(test))<a name="line.94"></a>
-<span class="sourceLineNo">095</span>            append("&amp;#" + (int) test + ";");<a name="line.95"></a>
-<span class="sourceLineNo">096</span>         else<a name="line.96"></a>
-<span class="sourceLineNo">097</span>            append(test);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>      return this;<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   }<a name="line.101"></a>
+<span class="sourceLineNo">060</span>   @Override /* XmlSerializerWriter */<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   public HtmlWriter text(Object o, boolean preserveWhitespace) throws IOException {<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>      if (o == null) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>         append("&lt;null/&gt;");<a name="line.64"></a>
+<span class="sourceLineNo">065</span>         return this;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>      }<a name="line.66"></a>
+<span class="sourceLineNo">067</span>      String s = o.toString();<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      if (s.isEmpty()) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>         append("&lt;sp/&gt;");<a name="line.69"></a>
+<span class="sourceLineNo">070</span>         return this;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>         char test = s.charAt(i);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>         if (test == '&amp;')<a name="line.75"></a>
+<span class="sourceLineNo">076</span>            append("&amp;amp;");<a name="line.76"></a>
+<span class="sourceLineNo">077</span>         else if (test == '&lt;')<a name="line.77"></a>
+<span class="sourceLineNo">078</span>            append("&amp;lt;");<a name="line.78"></a>
+<span class="sourceLineNo">079</span>         else if (test == '&gt;')<a name="line.79"></a>
+<span class="sourceLineNo">080</span>            append("&amp;gt;");<a name="line.80"></a>
+<span class="sourceLineNo">081</span>         else if (test == '\n')<a name="line.81"></a>
+<span class="sourceLineNo">082</span>            append(preserveWhitespace ? "\n" : "&lt;br/&gt;");<a name="line.82"></a>
+<span class="sourceLineNo">083</span>         else if (test == '\f')  // XML 1.0 doesn't support formfeeds or backslashes, so we have to invent something.<a name="line.83"></a>
+<span class="sourceLineNo">084</span>            append(preserveWhitespace ? "\f" : "&lt;ff/&gt;");<a name="line.84"></a>
+<span class="sourceLineNo">085</span>         else if (test == '\b')<a name="line.85"></a>
+<span class="sourceLineNo">086</span>            append(preserveWhitespace ? "\b" : "&lt;bs/&gt;");<a name="line.86"></a>
+<span class="sourceLineNo">087</span>         else if (test == '\t')<a name="line.87"></a>
+<span class="sourceLineNo">088</span>            append(preserveWhitespace ? "\t" : "&lt;sp&gt;&amp;#x2003;&lt;/sp&gt;");<a name="line.88"></a>
+<span class="sourceLineNo">089</span>         else if ((i == 0 || i == s.length()-1) &amp;&amp; Character.isWhitespace(test)) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>            if (preserveWhitespace)<a name="line.90"></a>
+<span class="sourceLineNo">091</span>               append(test);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>            else if (test == ' ')<a name="line.92"></a>
+<span class="sourceLineNo">093</span>               append("&lt;sp&gt; &lt;/sp&gt;");<a name="line.93"></a>
+<span class="sourceLineNo">094</span>            else<a name="line.94"></a>
+<span class="sourceLineNo">095</span>               append("&lt;sp&gt;&amp;#x").append(StringUtils.toHex(test)).append(";&lt;/sp&gt;");<a name="line.95"></a>
+<span class="sourceLineNo">096</span>         }<a name="line.96"></a>
+<span class="sourceLineNo">097</span>         else if (Character.isISOControl(test))<a name="line.97"></a>
+<span class="sourceLineNo">098</span>            append("&amp;#" + (int) test + ";");<a name="line.98"></a>
+<span class="sourceLineNo">099</span>         else<a name="line.99"></a>
+<span class="sourceLineNo">100</span>            append(test);<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      }<a name="line.101"></a>
 <span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>   @Override /* XmlSerializerWriter */<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   public HtmlWriter oTag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      super.oTag(ns, name, needsEncoding);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.109"></a>
-<span class="sourceLineNo">110</span>   public HtmlWriter oTag(String ns, String name) throws IOException {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      super.oTag(ns, name);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   public HtmlWriter oTag(String name) throws IOException {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      super.oTag(name);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   public HtmlWriter oTag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      super.oTag(indent, ns, name, needsEncoding);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   public HtmlWriter oTag(int indent, String ns, String name) throws IOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      super.oTag(indent, ns, name);<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>   @Override /* XmlSerializerWriter */<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   public HtmlWriter oTag(int indent, String name) throws IOException {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      super.oTag(indent, name);<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.139"></a>
-<span class="sourceLineNo">140</span>   public HtmlWriter tag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      super.tag(ns, name, needsEncoding);<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   public HtmlWriter tag(String ns, String name) throws IOException {<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      super.tag(ns, name);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   public HtmlWriter tag(String name) throws IOException {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      super.tag(name);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>   public HtmlWriter tag(int indent, String name) throws IOException {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      super.tag(indent, name);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.163"></a>
-<span class="sourceLineNo">164</span>   public HtmlWriter tag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      super.tag(indent, ns, name, needsEncoding);<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>   @Override /* XmlSerializerWriter */<a name="line.169"></a>
-<span class="sourceLineNo">170</span>   public HtmlWriter tag(int indent, String ns, String name) throws IOException {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      super.tag(indent, ns, name);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.175"></a>
-<span class="sourceLineNo">176</span>   public HtmlWriter sTag(String ns, String name) throws IOException {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      super.sTag(ns, name);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.181"></a>
-<span class="sourceLineNo">182</span>   public HtmlWriter sTag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      super.sTag(ns, name, needsEncoding);<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.187"></a>
-<span class="sourceLineNo">188</span>   public HtmlWriter sTag(int indent, String ns, String name) throws IOException {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      super.sTag(indent, ns, name);<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>   @Override /* XmlSerializerWriter */<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   public HtmlWriter sTag(int indent, String name) throws IOException {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      super.sTag(indent, name);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   public HtmlWriter sTag(String name) throws IOException {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      super.sTag(name);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   public HtmlWriter sTag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      super.sTag(indent, ns, name, needsEncoding);<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.211"></a>
-<span class="sourceLineNo">212</span>   public HtmlWriter eTag(String ns, String name) throws IOException {<a name="line.212"></a>
-<span class="sourceLineNo">213</span>      super.eTag(ns, name);<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   public HtmlWriter eTag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      super.eTag(ns, name, needsEncoding);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      return this;<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   }<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span>   @Override /* XmlSerializerWriter */<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   public HtmlWriter eTag(int indent, String ns, String name) throws IOException {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      super.eTag(indent, ns, name);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   public HtmlWriter eTag(int indent, String name) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      super.eTag(indent, name);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   public HtmlWriter eTag(String name) throws IOException {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      super.eTag(name);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      return this;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>   }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span>   @Override /* XmlSerializerWriter */<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   public HtmlWriter eTag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      super.eTag(indent, ns, name, needsEncoding);<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.247"></a>
-<span class="sourceLineNo">248</span>   public HtmlWriter attr(String name, Object value) throws IOException {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      super.attr(name, value);<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   public HtmlWriter attr(String ns, String name, Object value) throws IOException {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      super.attr(ns, name, value);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.259"></a>
-<span class="sourceLineNo">260</span>   public HtmlWriter attr(String ns, String name, Object value, boolean needsEncoding) throws IOException {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      super.attr(ns, name, value, needsEncoding);<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   public HtmlWriter attr(String name, Object value, boolean needsEncoding) throws IOException {<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      super.attr(null, name, value, needsEncoding);<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.271"></a>
-<span class="sourceLineNo">272</span>   public HtmlWriter oAttr(String ns, String name) throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      super.oAttr(ns, name);<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.277"></a>
-<span class="sourceLineNo">278</span>   public HtmlWriter cr(int depth) throws IOException {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      if (depth &gt; 0)<a name="line.279"></a>
-<span class="sourceLineNo">280</span>         super.cr(depth);<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.284"></a>
-<span class="sourceLineNo">285</span>   public HtmlWriter appendln(int indent, String text) throws IOException {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>      super.appendln(indent, text);<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>   @Override /* SerializerWriter */<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   public HtmlWriter appendln(String text) throws IOException {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      super.appendln(text);<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>   @Override /* SerializerWriter */<a name="line.296"></a>
-<span class="sourceLineNo">297</span>   public HtmlWriter append(int indent, String text) throws IOException {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      super.append(indent, text);<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>   @Override /* SerializerWriter */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>   public HtmlWriter append(int indent, char c) throws IOException {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      super.append(indent, c);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      return this;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>   }<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span>   @Override /* SerializerWriter */<a name="line.308"></a>
-<span class="sourceLineNo">309</span>   public HtmlWriter s() throws IOException {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      super.s();<a name="line.310"></a>
-<span class="sourceLineNo">311</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>   public HtmlWriter q() throws IOException {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      super.q();<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.320"></a>
-<span class="sourceLineNo">321</span>   public HtmlWriter i(int indent) throws IOException {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      super.i(indent);<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   public HtmlWriter nl() throws IOException {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      super.nl();<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      return this;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>   @Override /* SerializerWriter */<a name="line.332"></a>
-<span class="sourceLineNo">333</span>   public HtmlWriter append(Object text) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      super.append(text);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      return this;<a name="line.335"></a>
-<span class="sourceLineNo">336</span>   }<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span>   @Override /* SerializerWriter */<a name="line.338"></a>
-<span class="sourceLineNo">339</span>   public HtmlWriter append(String text) throws IOException {<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      super.append(text);<a name="line.340"></a>
-<span class="sourceLineNo">341</span>      return this;<a name="line.341"></a>
-<span class="sourceLineNo">342</span>   }<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>   @Override /* SerializerWriter */<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   public HtmlWriter append(char c) throws IOException {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      super.append(c);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      return this;<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>}<a name="line.350"></a>
+<span class="sourceLineNo">103</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   public HtmlWriter oTag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      super.oTag(ns, name, needsEncoding);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   public HtmlWriter oTag(String ns, String name) throws IOException {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      super.oTag(ns, name);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   public HtmlWriter oTag(String name) throws IOException {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      super.oTag(name);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   public HtmlWriter oTag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      super.oTag(indent, ns, name, needsEncoding);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   public HtmlWriter oTag(int indent, String ns, String name) throws IOException {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      super.oTag(indent, ns, name);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   public HtmlWriter oTag(int indent, String name) throws IOException {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      super.oTag(indent, name);<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   public HtmlWriter tag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      super.tag(ns, name, needsEncoding);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   public HtmlWriter tag(String ns, String name) throws IOException {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      super.tag(ns, name);<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>   @Override /* XmlSerializerWriter */<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   public HtmlWriter tag(String name) throws IOException {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      super.tag(name);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>   public HtmlWriter tag(int indent, String name) throws IOException {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      super.tag(indent, name);<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>   @Override /* XmlSerializerWriter */<a name="line.166"></a>
+<span class="sourceLineNo">167</span>   public HtmlWriter tag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      super.tag(indent, ns, name, needsEncoding);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   public HtmlWriter tag(int indent, String ns, String name) throws IOException {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      super.tag(indent, ns, name);<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>   @Override /* XmlSerializerWriter */<a name="line.178"></a>
+<span class="sourceLineNo">179</span>   public HtmlWriter sTag(String ns, String name) throws IOException {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      super.sTag(ns, name);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.184"></a>
+<span class="sourceLineNo">185</span>   public HtmlWriter sTag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      super.sTag(ns, name, needsEncoding);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.190"></a>
+<span class="sourceLineNo">191</span>   public HtmlWriter sTag(int indent, String ns, String name) throws IOException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      super.sTag(indent, ns, name);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   public HtmlWriter sTag(int indent, String name) throws IOException {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      super.sTag(indent, name);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   public HtmlWriter sTag(String name) throws IOException {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      super.sTag(name);<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   public HtmlWriter sTag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      super.sTag(indent, ns, name, needsEncoding);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   public HtmlWriter eTag(String ns, String name) throws IOException {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      super.eTag(ns, name);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.220"></a>
+<span class="sourceLineNo">221</span>   public HtmlWriter eTag(String ns, String name, boolean needsEncoding) throws IOException {<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      super.eTag(ns, name, needsEncoding);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      return this;<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 /* XmlSerializerWriter */<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   public HtmlWriter eTag(int indent, String ns, String name) throws IOException {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      super.eTag(indent, ns, name);<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   public HtmlWriter eTag(int indent, String name) throws IOException {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      super.eTag(indent, name);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   public HtmlWriter eTag(String name) throws IOException {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      super.eTag(name);<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>   @Override /* XmlSerializerWriter */<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   public HtmlWriter eTag(int indent, String ns, String name, boolean needsEncoding) throws IOException {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      super.eTag(indent, ns, name, needsEncoding);<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   public HtmlWriter attr(String name, Object value) throws IOException {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      super.attr(name, value);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>   public HtmlWriter attr(String ns, String name, Object value) throws IOException {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      super.attr(ns, name, value);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.262"></a>
+<span class="sourceLineNo">263</span>   public HtmlWriter attr(String ns, String name, Object value, boolean needsEncoding) throws IOException {<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      super.attr(ns, name, value, needsEncoding);<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>   @Override /* XmlSerializerWriter */<a name="line.268"></a>
+<span class="sourceLineNo">269</span>   public HtmlWriter attr(String name, Object value, boolean needsEncoding) throws IOException {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      super.attr(null, name, value, needsEncoding);<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      return this;<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>   @Override /* XmlSerializerWriter */<a name="line.274"></a>
+<span class="sourceLineNo">275</span>   public HtmlWriter oAttr(String ns, String name) throws IOException {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>      super.oAttr(ns, name);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.280"></a>
+<span class="sourceLineNo">281</span>   public HtmlWriter cr(int depth) throws IOException {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      if (depth &gt; 0)<a name="line.282"></a>
+<span class="sourceLineNo">283</span>         super.cr(depth);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      return this;<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 /* SerializerWriter */<a name="line.287"></a>
+<span class="sourceLineNo">288</span>   public HtmlWriter appendln(int indent, String text) throws IOException {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      super.appendln(indent, text);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.293"></a>
+<span class="sourceLineNo">294</span>   public HtmlWriter appendln(String text) throws IOException {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      super.appendln(text);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.299"></a>
+<span class="sourceLineNo">300</span>   public HtmlWriter append(int indent, String text) throws IOException {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      super.append(indent, text);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.305"></a>
+<span class="sourceLineNo">306</span>   public HtmlWriter append(int indent, char c) throws IOException {<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      super.append(indent, c);<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.311"></a>
+<span class="sourceLineNo">312</span>   public HtmlWriter s() throws IOException {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      super.s();<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   public HtmlWriter q() throws IOException {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      super.q();<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.323"></a>
+<span class="sourceLineNo">324</span>   public HtmlWriter i(int indent) throws IOException {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      super.i(indent);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      return this;<a name="line.326"></a>
+<span class="sourceLineNo">327</span>   }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>   @Override /* SerializerWriter */<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   public HtmlWriter nl() throws IOException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      super.nl();<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>   @Override /* SerializerWriter */<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   public HtmlWriter append(Object text) throws IOException {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      super.append(text);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.341"></a>
+<span class="sourceLineNo">342</span>   public HtmlWriter append(String text) throws IOException {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      super.append(text);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   public HtmlWriter append(char c) throws IOException {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      super.append(c);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>      return this;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/html/SimpleHtmlWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/SimpleHtmlWriter.html b/content/site/apidocs/src-html/org/apache/juneau/html/SimpleHtmlWriter.html
index c4ef271..5a60b1c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/SimpleHtmlWriter.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/SimpleHtmlWriter.html
@@ -36,7 +36,7 @@
 <span class="sourceLineNo">028</span>    * Constructor.<a name="line.28"></a>
 <span class="sourceLineNo">029</span>    */<a name="line.29"></a>
 <span class="sourceLineNo">030</span>   public SimpleHtmlWriter() {<a name="line.30"></a>
-<span class="sourceLineNo">031</span>      super(new StringWriter(), true, false, '\'', null, null);<a name="line.31"></a>
+<span class="sourceLineNo">031</span>      super(new StringWriter(), true, false, '\'', null, null, null);<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>   @Override /* Object */<a name="line.34"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/html/annotation/Html.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/annotation/Html.html b/content/site/apidocs/src-html/org/apache/juneau/html/annotation/Html.html
index 2bf1876..37f617f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/annotation/Html.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/annotation/Html.html
@@ -61,7 +61,42 @@
 <span class="sourceLineNo">053</span>    * Default is &lt;jk&gt;false&lt;/jk&gt;.<a name="line.53"></a>
 <span class="sourceLineNo">054</span>    */<a name="line.54"></a>
 <span class="sourceLineNo">055</span>   boolean noTableHeaders() default false;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>}<a name="line.56"></a>
+<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>    * Associates an {@link HtmlRender} with a bean property for custom HTML rendering of the property.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * &lt;p&gt;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * This annotation applies to bean properties only.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>   @SuppressWarnings("rawtypes")<a name="line.62"></a>
+<span class="sourceLineNo">063</span>   Class&lt;? extends HtmlRender&gt; render() default HtmlRender.class;<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>    * Adds a hyperlink to a bean property when rendered as HTML.<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    * &lt;p&gt;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    * The text can contain any bean property values resolved through variables of the form &lt;js&gt;"{property-name}"&lt;/js&gt;.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    * &lt;p&gt;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    * The URLs can be any of the following forms:<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    * &lt;ul&gt;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    *    &lt;li&gt;Absolute - e.g. &lt;js&gt;"http://host:123/myContext/myServlet/myPath"&lt;/js&gt;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    *    &lt;li&gt;Context-root-relative - e.g. &lt;js&gt;"/myContext/myServlet/myPath"&lt;/js&gt;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    *    &lt;li&gt;Context-relative - e.g. &lt;js&gt;"context:/myServlet/myPath"&lt;/js&gt;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    *    &lt;li&gt;Servlet-relative - e.g. &lt;js&gt;"servlet:/myPath"&lt;/js&gt;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    *    &lt;li&gt;Path-info-relative - e.g. &lt;js&gt;"myPath"&lt;/js&gt;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    * &lt;/ul&gt;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    *<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    * &lt;h6 class='figure'&gt;Example:&lt;/h6&gt;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    * &lt;p class='bcode'&gt;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    *    &lt;jk&gt;public class&lt;/jk&gt; FileSpace {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    *<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    *       &lt;ja&gt;@Html&lt;/ja&gt;(link=&lt;js&gt;"servlet:/drive/{drive}"&lt;/js&gt;)<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    *       &lt;jk&gt;public&lt;/jk&gt; String getDrive() {<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>    *    }<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    * &lt;/p&gt;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    */<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   String link() default "";<a name="line.90"></a>
+<span class="sourceLineNo">091</span>}<a name="line.91"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/internal/StringUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/StringUtils.html b/content/site/apidocs/src-html/org/apache/juneau/internal/StringUtils.html
index 7799473..0abf310 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/StringUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/StringUtils.html
@@ -1340,7 +1340,109 @@
 <span class="sourceLineNo">1332</span>         return 0;<a name="line.1332"></a>
 <span class="sourceLineNo">1333</span>      return s.charAt(i);<a name="line.1333"></a>
 <span class="sourceLineNo">1334</span>   }<a name="line.1334"></a>
-<span class="sourceLineNo">1335</span>}<a name="line.1335"></a>
+<span class="sourceLineNo">1335</span><a name="line.1335"></a>
+<span class="sourceLineNo">1336</span>   /**<a name="line.1336"></a>
+<span class="sourceLineNo">1337</span>    * Efficiently determines whether a URL is of the pattern "xxx://xxx"<a name="line.1337"></a>
+<span class="sourceLineNo">1338</span>    *<a name="line.1338"></a>
+<span class="sourceLineNo">1339</span>    * @param s The string to test.<a name="line.1339"></a>
+<span class="sourceLineNo">1340</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if it's an absolute path.<a name="line.1340"></a>
+<span class="sourceLineNo">1341</span>    */<a name="line.1341"></a>
+<span class="sourceLineNo">1342</span>   public static boolean isAbsoluteUri(String s) {<a name="line.1342"></a>
+<span class="sourceLineNo">1343</span><a name="line.1343"></a>
+<span class="sourceLineNo">1344</span>      if (isEmpty(s))<a name="line.1344"></a>
+<span class="sourceLineNo">1345</span>         return false;<a name="line.1345"></a>
+<span class="sourceLineNo">1346</span><a name="line.1346"></a>
+<span class="sourceLineNo">1347</span>      // Use a state machine for maximum performance.<a name="line.1347"></a>
+<span class="sourceLineNo">1348</span>      <a name="line.1348"></a>
+<span class="sourceLineNo">1349</span>      int S1 = 1;  // Looking for http<a name="line.1349"></a>
+<span class="sourceLineNo">1350</span>      int S2 = 2;  // Found http, looking for :<a name="line.1350"></a>
+<span class="sourceLineNo">1351</span>      int S3 = 3;  // Found :, looking for /<a name="line.1351"></a>
+<span class="sourceLineNo">1352</span>      int S4 = 4;  // Found /, looking for /<a name="line.1352"></a>
+<span class="sourceLineNo">1353</span>      int S5 = 5;  // Found /, looking for x<a name="line.1353"></a>
+<span class="sourceLineNo">1354</span><a name="line.1354"></a>
+<span class="sourceLineNo">1355</span>      int state = S1;<a name="line.1355"></a>
+<span class="sourceLineNo">1356</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.1356"></a>
+<span class="sourceLineNo">1357</span>         char c = s.charAt(i);<a name="line.1357"></a>
+<span class="sourceLineNo">1358</span>         if (state == S1) {<a name="line.1358"></a>
+<span class="sourceLineNo">1359</span>            if (c &gt;= 'a' &amp;&amp; c &lt;= 'z')<a name="line.1359"></a>
+<span class="sourceLineNo">1360</span>               state = S2;<a name="line.1360"></a>
+<span class="sourceLineNo">1361</span>            else<a name="line.1361"></a>
+<span class="sourceLineNo">1362</span>               return false;<a name="line.1362"></a>
+<span class="sourceLineNo">1363</span>         } else if (state == S2) {<a name="line.1363"></a>
+<span class="sourceLineNo">1364</span>            if (c == ':')<a name="line.1364"></a>
+<span class="sourceLineNo">1365</span>               state = S3;<a name="line.1365"></a>
+<span class="sourceLineNo">1366</span>            else if (c &lt; 'a' || c &gt; 'z')<a name="line.1366"></a>
+<span class="sourceLineNo">1367</span>               return false;<a name="line.1367"></a>
+<span class="sourceLineNo">1368</span>         } else if (state == S3) {<a name="line.1368"></a>
+<span class="sourceLineNo">1369</span>            if (c == '/')<a name="line.1369"></a>
+<span class="sourceLineNo">1370</span>               state = S4;<a name="line.1370"></a>
+<span class="sourceLineNo">1371</span>            else<a name="line.1371"></a>
+<span class="sourceLineNo">1372</span>               return false;<a name="line.1372"></a>
+<span class="sourceLineNo">1373</span>         } else if (state == S4) {<a name="line.1373"></a>
+<span class="sourceLineNo">1374</span>            if (c == '/')<a name="line.1374"></a>
+<span class="sourceLineNo">1375</span>               state = S5;<a name="line.1375"></a>
+<span class="sourceLineNo">1376</span>            else<a name="line.1376"></a>
+<span class="sourceLineNo">1377</span>               return false;<a name="line.1377"></a>
+<span class="sourceLineNo">1378</span>         } else if (state == S5) {<a name="line.1378"></a>
+<span class="sourceLineNo">1379</span>            return true;<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>      return false;<a name="line.1382"></a>
+<span class="sourceLineNo">1383</span>   }<a name="line.1383"></a>
+<span class="sourceLineNo">1384</span><a name="line.1384"></a>
+<span class="sourceLineNo">1385</span>   /**<a name="line.1385"></a>
+<span class="sourceLineNo">1386</span>    * Given an absolute URI, returns just the authority portion (e.g. &lt;js&gt;"http://hostname:port"&lt;/js&gt;)<a name="line.1386"></a>
+<span class="sourceLineNo">1387</span>    *<a name="line.1387"></a>
+<span class="sourceLineNo">1388</span>    * @param s The URI string.<a name="line.1388"></a>
+<span class="sourceLineNo">1389</span>    * @return Just the authority portion of the URI.<a name="line.1389"></a>
+<span class="sourceLineNo">1390</span>    */<a name="line.1390"></a>
+<span class="sourceLineNo">1391</span>   public static String getAuthorityUri(String s) {<a name="line.1391"></a>
+<span class="sourceLineNo">1392</span><a name="line.1392"></a>
+<span class="sourceLineNo">1393</span>      // Use a state machine for maximum performance.<a name="line.1393"></a>
+<span class="sourceLineNo">1394</span><a name="line.1394"></a>
+<span class="sourceLineNo">1395</span>      int S1 = 1;  // Looking for http<a name="line.1395"></a>
+<span class="sourceLineNo">1396</span>      int S2 = 2;  // Found http, looking for :<a name="line.1396"></a>
+<span class="sourceLineNo">1397</span>      int S3 = 3;  // Found :, looking for /<a name="line.1397"></a>
+<span class="sourceLineNo">1398</span>      int S4 = 4;  // Found /, looking for /<a name="line.1398"></a>
+<span class="sourceLineNo">1399</span>      int S5 = 5;  // Found /, looking for x<a name="line.1399"></a>
+<span class="sourceLineNo">1400</span>      int S6 = 6;  // Found x, looking for /<a name="line.1400"></a>
+<span class="sourceLineNo">1401</span><a name="line.1401"></a>
+<span class="sourceLineNo">1402</span>      int state = S1;<a name="line.1402"></a>
+<span class="sourceLineNo">1403</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.1403"></a>
+<span class="sourceLineNo">1404</span>         char c = s.charAt(i);<a name="line.1404"></a>
+<span class="sourceLineNo">1405</span>         if (state == S1) {<a name="line.1405"></a>
+<span class="sourceLineNo">1406</span>            if (c &gt;= 'a' &amp;&amp; c &lt;= 'z')<a name="line.1406"></a>
+<span class="sourceLineNo">1407</span>               state = S2;<a name="line.1407"></a>
+<span class="sourceLineNo">1408</span>            else<a name="line.1408"></a>
+<span class="sourceLineNo">1409</span>               return s;<a name="line.1409"></a>
+<span class="sourceLineNo">1410</span>         } else if (state == S2) {<a name="line.1410"></a>
+<span class="sourceLineNo">1411</span>            if (c == ':')<a name="line.1411"></a>
+<span class="sourceLineNo">1412</span>               state = S3;<a name="line.1412"></a>
+<span class="sourceLineNo">1413</span>            else if (c &lt; 'a' || c &gt; 'z')<a name="line.1413"></a>
+<span class="sourceLineNo">1414</span>               return s;<a name="line.1414"></a>
+<span class="sourceLineNo">1415</span>         } else if (state == S3) {<a name="line.1415"></a>
+<span class="sourceLineNo">1416</span>            if (c == '/')<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span>               state = S4;<a name="line.1417"></a>
+<span class="sourceLineNo">1418</span>            else<a name="line.1418"></a>
+<span class="sourceLineNo">1419</span>               return s;<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span>         } else if (state == S4) {<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span>            if (c == '/')<a name="line.1421"></a>
+<span class="sourceLineNo">1422</span>               state = S5;<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span>            else<a name="line.1423"></a>
+<span class="sourceLineNo">1424</span>               return s;<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span>         } else if (state == S5) {<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span>            if (c != '/')<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span>               state = S6;<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span>            else<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span>               return s;<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span>         } else if (state == S6) {<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span>            if (c == '/')<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span>               return s.substring(0, i);<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span>         }<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span>      }<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span>      return s;<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span>   }<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span>}<a name="line.1437"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.N3.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.N3.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.N3.html
index 7699679..838c53f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.N3.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.N3.html
@@ -458,8 +458,8 @@
 <span class="sourceLineNo">450</span>   //--------------------------------------------------------------------------------<a name="line.450"></a>
 <span class="sourceLineNo">451</span><a name="line.451"></a>
 <span class="sourceLineNo">452</span>   @Override /* Serializer */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.454"></a>
+<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.NTriple.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.NTriple.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.NTriple.html
index 7699679..838c53f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.NTriple.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.NTriple.html
@@ -458,8 +458,8 @@
 <span class="sourceLineNo">450</span>   //--------------------------------------------------------------------------------<a name="line.450"></a>
 <span class="sourceLineNo">451</span><a name="line.451"></a>
 <span class="sourceLineNo">452</span>   @Override /* Serializer */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.454"></a>
+<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Turtle.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Turtle.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Turtle.html
index 7699679..838c53f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Turtle.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Turtle.html
@@ -458,8 +458,8 @@
 <span class="sourceLineNo">450</span>   //--------------------------------------------------------------------------------<a name="line.450"></a>
 <span class="sourceLineNo">451</span><a name="line.451"></a>
 <span class="sourceLineNo">452</span>   @Override /* Serializer */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.454"></a>
+<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Xml.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Xml.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Xml.html
index 7699679..838c53f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Xml.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Xml.html
@@ -458,8 +458,8 @@
 <span class="sourceLineNo">450</span>   //--------------------------------------------------------------------------------<a name="line.450"></a>
 <span class="sourceLineNo">451</span><a name="line.451"></a>
 <span class="sourceLineNo">452</span>   @Override /* Serializer */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.454"></a>
+<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html
index 7699679..838c53f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html
@@ -458,8 +458,8 @@
 <span class="sourceLineNo">450</span>   //--------------------------------------------------------------------------------<a name="line.450"></a>
 <span class="sourceLineNo">451</span><a name="line.451"></a>
 <span class="sourceLineNo">452</span>   @Override /* Serializer */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.454"></a>
+<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.html
index 7699679..838c53f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.html
@@ -458,8 +458,8 @@
 <span class="sourceLineNo">450</span>   //--------------------------------------------------------------------------------<a name="line.450"></a>
 <span class="sourceLineNo">451</span><a name="line.451"></a>
 <span class="sourceLineNo">452</span>   @Override /* Serializer */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.454"></a>
+<span class="sourceLineNo">453</span>   public RdfSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      return new RdfSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>
 



[04/39] incubator-juneau-website git commit: Javadoc updates.

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerWriter.html b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerWriter.html
index a9ec45a..4101d42 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerWriter.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerWriter.html
@@ -23,325 +23,333 @@
 <span class="sourceLineNo">015</span>import java.io.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span>import java.net.*;<a name="line.16"></a>
 <span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.internal.*;<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> * Simple wrapper around a standard {@link Writer} with additional methods.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * &lt;p&gt;<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * Modeled after the Java ProcessBuilder class so that you can chain commands to reduce<a name="line.23"></a>
-<span class="sourceLineNo">024</span> *    the need for string concatenation for performance reasons.<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * &lt;p class='bcode'&gt;<a name="line.27"></a>
-<span class="sourceLineNo">028</span> *    writer.append(&lt;js&gt;"foo"&lt;/js&gt;).nl().i(5).append(&lt;js&gt;"bar"&lt;/js&gt;);<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * &lt;/p&gt;<a name="line.29"></a>
-<span class="sourceLineNo">030</span> */<a name="line.30"></a>
-<span class="sourceLineNo">031</span>public class SerializerWriter extends Writer {<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>   /** The underlying writer. */<a name="line.33"></a>
-<span class="sourceLineNo">034</span>   protected final Writer out;<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>   /** Use-whitespace flag. */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>   protected final boolean useWhitespace;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>   /** Trim strings flag. */<a name="line.39"></a>
-<span class="sourceLineNo">040</span>   protected final boolean trimStrings;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>   /** The quote character being used by this writer. */<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   protected final char quoteChar;<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>   /** The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;). */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   protected final String relativeUriBase;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>   /** The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;). */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   protected final String absolutePathUriBase;<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>    * @param out The writer being wrapped.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt;, calling {@link #cr(int)} will create an indentation and calling {@link #s()} will write a space character.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings should be trimmed before they're serialized.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    * @param quoteChar The character to write when {@link #q()} is called.<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    * @param relativeUriBase The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;).<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * @param absolutePathUriBase The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;).<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   public SerializerWriter(Writer out, boolean useWhitespace, boolean trimStrings, char quoteChar, String relativeUriBase, String absolutePathUriBase) {<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      this.out = out;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      this.useWhitespace = useWhitespace;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      this.trimStrings = trimStrings;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>      this.quoteChar = quoteChar;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>      this.relativeUriBase = relativeUriBase;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>      this.absolutePathUriBase = absolutePathUriBase;<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>   /**<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    * Performs a carriage return.<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    * &lt;p&gt;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    * Adds a newline and the specified number of tabs (if the {@code useWhitespace} setting is enabled) to the output.<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    *<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    * @param depth The indentation.<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    * @return This object (for method chaining).<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    */<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   public SerializerWriter cr(int depth) throws IOException {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      if (useWhitespace)<a name="line.78"></a>
-<span class="sourceLineNo">079</span>         return nl().i(depth);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      return this;<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>    * Writes an indent (if the {@code useWhitespace} setting is enabled), followed by text,<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    *    followed by a newline (if the {@code useWhitespace} setting is enabled).<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    *<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    * @param indent The number of tabs to indent.<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    * @param text The text to write.<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    * @return This object.<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    */<a name="line.91"></a>
-<span class="sourceLineNo">092</span>   public SerializerWriter appendln(int indent, String text) throws IOException {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      return append(indent, true, text);<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>    * Writes the specified text followed by a newline (if the {@code useWhitespace} setting is enabled).<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    *<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    * @param text The text to write.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    * @return This object.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    */<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   public SerializerWriter appendln(String text) throws IOException {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      return append(0, true, text);<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>   /**<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    * Writes an indent (if the {@code useWhitespace} setting is enabled), followed by text.<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    *<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    * @param indent The number of tabs to indent.<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    * @param text The text to write.<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    * @return This object.<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    */<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   public SerializerWriter append(int indent, String text) throws IOException {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      return append(indent, false, text);<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>   /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    * Writes an indent (if the {@code useWhitespace} setting is enabled), followed by text.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    *<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    * @param indent The number of tabs to indent.<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    * @param c The character to write.<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    * @return This object.<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    */<a name="line.126"></a>
-<span class="sourceLineNo">127</span>   public SerializerWriter append(int indent, char c) throws IOException {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      return i(indent).append(c);<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>    * Writes an indent (if the {@code useWhitespace} setting is enabled), followed by text,<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    *    optionally followed by a newline (if the {@code useWhitespace} setting is enabled).<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    *<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    * @param indent The number of tabs to indent.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    * @param newline If &lt;jk&gt;true&lt;/jk&gt;, then a newline is written.<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    * @param text The text to write.<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    * @throws IOException If a problem occurred trying to write to the writer.<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>   private SerializerWriter append(int indent, boolean newline, String text) throws IOException {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      i(indent);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      out.write(text);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      if (newline)<a name="line.144"></a>
-<span class="sourceLineNo">145</span>         nl();<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      return this;<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>    * Appends the specified object as a URI.<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    * &lt;p&gt;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    * Object is converted to a &lt;code&gt;String&lt;/code&gt; using &lt;code&gt;toString()&lt;/code&gt;, so this will work on {@link URL} or {@link URI} objects,<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    * or any other type that returns a URI via it's &lt;code&gt;toString()&lt;/code&gt; method.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    * &lt;p&gt;<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    * If the URI is relative (i.e. without a schema and not prepended with &lt;js&gt;'/'&lt;/js&gt;) the URI<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    * will be prepended with {@link #absolutePathUriBase} and {@link #relativeUriBase}.<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    * &lt;p&gt;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    * If the URI is context-absolute (i.e. without a schema, but prepended with &lt;js&gt;'/'&lt;/js&gt;)<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    * the URI will be prepended with {@link #absolutePathUriBase}.<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    *<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    * @param uri The URI to serialize.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    * @return This object (for method chaining).<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    */<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   public SerializerWriter appendUri(Object uri) throws IOException {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      String s = uri.toString();<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      if (s.indexOf("://") == -1) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>         if (StringUtils.startsWith(s, '/')) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>            if (absolutePathUriBase != null)<a name="line.169"></a>
-<span class="sourceLineNo">170</span>               append(absolutePathUriBase);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>         } else {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>            if (relativeUriBase != null) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>               append(relativeUriBase);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>               if (! relativeUriBase.equals("/"))<a name="line.174"></a>
-<span class="sourceLineNo">175</span>                  append("/");<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>      }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      return append(s);<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>   /**<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    * Appends the specified characters to this writer.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    *<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    * @param characters The characters to append to this writer.<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    * @return This object (for method chaining).<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    * @throws IOException<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    */<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   public SerializerWriter append(char[] characters) throws IOException {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      for (char c : characters)<a name="line.191"></a>
-<span class="sourceLineNo">192</span>         append(c);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      return this;<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>   /**<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    * Adds a whitespace character to the output if the {@code useWhitespace} setting is enabled.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    *<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    * @return This object (for method chaining).<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    */<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   public SerializerWriter s() throws IOException {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      if (useWhitespace)<a name="line.203"></a>
-<span class="sourceLineNo">204</span>         out.write(' ');<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      return this;<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>    * Adds the quote character specified by the {@code quoteChar} setting to the output.<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    *<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>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    */<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   public SerializerWriter q() throws IOException {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      out.write(quoteChar);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      return this;<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>   /**<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    * Writes an indent to the writer if the {@code useWhitespace} setting is enabled.<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    *<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    * @param indent The number of tabs to indent.<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    * @throws IOException If a problem occurred trying to write to the writer.<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 SerializerWriter i(int indent) throws IOException {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      if (useWhitespace)<a name="line.227"></a>
-<span class="sourceLineNo">228</span>         for (int i = 0; i &lt; indent; i++)<a name="line.228"></a>
-<span class="sourceLineNo">229</span>            out.write('\t');<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      return this;<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>    * Writes a newline to the writer if the {@code useWhitespace} setting is enabled.<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    *<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    * @throws IOException If a problem occurred trying to write to the writer.<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 SerializerWriter nl() throws IOException {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      if (useWhitespace)<a name="line.240"></a>
-<span class="sourceLineNo">241</span>         out.write('\n');<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      return this;<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>    * Writes a newline to the writer if the {@code useWhitespace} setting is enabled and the boolean flag is true.<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    *<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    * @param b The boolean flag.<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    * @return This object (for method chaining).<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    */<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   public SerializerWriter nlIf(boolean b) throws IOException {<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      if (b &amp;&amp; useWhitespace)<a name="line.253"></a>
-<span class="sourceLineNo">254</span>         out.write('\n');<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      return this;<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>    * Writes the specified text to the writer.<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    *<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    * @param text The text to write.<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    * @return This object (for method chaining).<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    */<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   public SerializerWriter append(Object text) throws IOException {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      out.append(text == null ? null : text.toString());<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      return this;<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>   /**<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    * Writes the specified text to the writer.<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    *<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    * @param text The text to write.<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    * @throws IOException If a problem occurred trying to write to the writer.<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 SerializerWriter append(String text) throws IOException {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      if (text != null)<a name="line.278"></a>
-<span class="sourceLineNo">279</span>         out.append(text);<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      return this;<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>    * Writes the specified text to the writer if b is true.<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    *<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    * @param b Boolean flag.<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    * @param text The text to write.<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    * @throws IOException If a problem occurred trying to write to the writer.<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 SerializerWriter appendIf(boolean b, String text) throws IOException {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      if (b)<a name="line.292"></a>
-<span class="sourceLineNo">293</span>         out.write(text);<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      return this;<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>    * Writes the specified text to the writer if b is true.<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    *<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    * @param b Boolean flag.<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    * @param c The text to write.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    * @throws IOException If a problem occurred trying to write to the writer.<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 SerializerWriter appendIf(boolean b, char c) throws IOException {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      if (b)<a name="line.306"></a>
-<span class="sourceLineNo">307</span>         out.write(c);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      return this;<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>   //--------------------------------------------------------------------------------<a name="line.312"></a>
-<span class="sourceLineNo">313</span>   // Overridden methods<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>   @Override /* Writer */<a name="line.316"></a>
-<span class="sourceLineNo">317</span>   public SerializerWriter append(char c) throws IOException {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      out.write(c);<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      return this;<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>   @Override /* Writer */<a name="line.322"></a>
-<span class="sourceLineNo">323</span>   public void write(char[] cbuf, int off, int len) throws IOException {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      out.write(cbuf, off, len);<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>   @Override /* Writer */<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   public void flush() throws IOException {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      out.flush();<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>   @Override /* Writer */<a name="line.332"></a>
-<span class="sourceLineNo">333</span>   public void close() throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      out.close();<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">018</span>import org.apache.juneau.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.internal.*;<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> * Simple wrapper around a standard {@link Writer} with additional methods.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * &lt;p&gt;<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Modeled after the Java ProcessBuilder class so that you can chain commands to reduce<a name="line.24"></a>
+<span class="sourceLineNo">025</span> *    the need for string concatenation for performance reasons.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * &lt;p class='bcode'&gt;<a name="line.28"></a>
+<span class="sourceLineNo">029</span> *    writer.append(&lt;js&gt;"foo"&lt;/js&gt;).nl().i(5).append(&lt;js&gt;"bar"&lt;/js&gt;);<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * &lt;/p&gt;<a name="line.30"></a>
+<span class="sourceLineNo">031</span> */<a name="line.31"></a>
+<span class="sourceLineNo">032</span>public class SerializerWriter extends Writer {<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>   /** The underlying writer. */<a name="line.34"></a>
+<span class="sourceLineNo">035</span>   protected final Writer out;<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>   /** Use-whitespace flag. */<a name="line.37"></a>
+<span class="sourceLineNo">038</span>   protected final boolean useWhitespace;<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>   /** Trim strings flag. */<a name="line.40"></a>
+<span class="sourceLineNo">041</span>   protected final boolean trimStrings;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>   /** The quote character being used by this writer. */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>   protected final char quoteChar;<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>   /** The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;). */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>   protected final String relativeUriBase;<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>   /** The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;). */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   protected final String absolutePathUriBase;<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>   /** The URI context of the request. (i.e. the REST request URL broken down into authority/context/servlet/pathInfo parts. */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   protected final UriContext uriContext;<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>    * @param out The writer being wrapped.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt;, calling {@link #cr(int)} will create an indentation and calling<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    *    {@link #s()} will write a space character.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings should be trimmed before they're serialized.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * @param quoteChar The character to write when {@link #q()} is called.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    * @param relativeUriBase The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;).<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * @param absolutePathUriBase The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;).<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    * @param uriContext The URI context.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    */<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   public SerializerWriter(Writer out, boolean useWhitespace, boolean trimStrings, char quoteChar, String relativeUriBase, String absolutePathUriBase, UriContext uriContext) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>      this.out = out;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      this.useWhitespace = useWhitespace;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      this.trimStrings = trimStrings;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      this.quoteChar = quoteChar;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      this.relativeUriBase = relativeUriBase;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      this.absolutePathUriBase = absolutePathUriBase;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      this.uriContext = uriContext != null ? uriContext : new UriContext(null, null, null, null);<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>    * Performs a carriage return.<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    * &lt;p&gt;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    * Adds a newline and the specified number of tabs (if the {@code useWhitespace} setting is enabled) to the output.<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    *<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    * @param depth The indentation.<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    * @return This object (for method chaining).<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   public SerializerWriter cr(int depth) throws IOException {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      if (useWhitespace)<a name="line.86"></a>
+<span class="sourceLineNo">087</span>         return nl().i(depth);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      return this;<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>   /**<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    * Writes an indent (if the {@code useWhitespace} setting is enabled), followed by text,<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    *    followed by a newline (if the {@code useWhitespace} setting is enabled).<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    *<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    * @param indent The number of tabs to indent.<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    * @param text The text to write.<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    * @return This object.<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    */<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   public SerializerWriter appendln(int indent, String text) throws IOException {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      return append(indent, true, text);<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>   /**<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    * Writes the specified text followed by a newline (if the {@code useWhitespace} setting is enabled).<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    *<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    * @param text The text to write.<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    * @return This object.<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    */<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   public SerializerWriter appendln(String text) throws IOException {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      return append(0, true, text);<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>    * Writes an indent (if the {@code useWhitespace} setting is enabled), followed by text.<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    *<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    * @param indent The number of tabs to indent.<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    * @param text The text to write.<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    * @return This object.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    */<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   public SerializerWriter append(int indent, String text) throws IOException {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      return append(indent, false, text);<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>    * Writes an indent (if the {@code useWhitespace} setting is enabled), followed by text.<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    *<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    * @param indent The number of tabs to indent.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    * @param c The character to write.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    * @return This object.<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    */<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   public SerializerWriter append(int indent, char c) throws IOException {<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      return i(indent).append(c);<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>    * Writes an indent (if the {@code useWhitespace} setting is enabled), followed by text,<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    *    optionally followed by a newline (if the {@code useWhitespace} setting is enabled).<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    *<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    * @param indent The number of tabs to indent.<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    * @param newline If &lt;jk&gt;true&lt;/jk&gt;, then a newline is written.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    * @param text The text to write.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    * @throws IOException If a problem occurred trying to write to the writer.<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>   private SerializerWriter append(int indent, boolean newline, String text) throws IOException {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      i(indent);<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      out.write(text);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      if (newline)<a name="line.152"></a>
+<span class="sourceLineNo">153</span>         nl();<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      return this;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>   /**<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    * Appends the specified object as a URI.<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    * &lt;p&gt;<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    * Object is converted to a &lt;code&gt;String&lt;/code&gt; using &lt;code&gt;toString()&lt;/code&gt;, so this will work on {@link URL} or {@link URI} objects,<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    * or any other type that returns a URI via it's &lt;code&gt;toString()&lt;/code&gt; method.<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    * &lt;p&gt;<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    * If the URI is relative (i.e. without a schema and not prepended with &lt;js&gt;'/'&lt;/js&gt;) the URI<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    * will be prepended with {@link #absolutePathUriBase} and {@link #relativeUriBase}.<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    * &lt;p&gt;<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    * If the URI is context-absolute (i.e. without a schema, but prepended with &lt;js&gt;'/'&lt;/js&gt;)<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    * the URI will be prepended with {@link #absolutePathUriBase}.<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    *<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    * @param uri The URI to serialize.<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 IOException If a problem occurred trying to write to the writer.<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    */<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   public SerializerWriter appendUri(Object uri) throws IOException {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      String s = uri.toString();<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      if (s.indexOf("://") == -1) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>         if (StringUtils.startsWith(s, '/')) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>            if (absolutePathUriBase != null)<a name="line.177"></a>
+<span class="sourceLineNo">178</span>               append(absolutePathUriBase);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>         } else {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>            if (relativeUriBase != null) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>               append(relativeUriBase);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>               if (! relativeUriBase.equals("/"))<a name="line.182"></a>
+<span class="sourceLineNo">183</span>                  append("/");<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>      }<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      return append(s);<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>   /**<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    * Appends the specified characters to this writer.<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    *<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    * @param characters The characters to append to this writer.<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>    * @throws IOException<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    */<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   public SerializerWriter append(char[] characters) throws IOException {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      for (char c : characters)<a name="line.199"></a>
+<span class="sourceLineNo">200</span>         append(c);<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      return this;<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>    * Adds a whitespace character to the output if the {@code useWhitespace} setting is enabled.<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    *<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>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    */<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   public SerializerWriter s() throws IOException {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      if (useWhitespace)<a name="line.211"></a>
+<span class="sourceLineNo">212</span>         out.write(' ');<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      return this;<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>    * Adds the quote character specified by the {@code quoteChar} setting to the output.<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    *<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>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    */<a name="line.221"></a>
+<span class="sourceLineNo">222</span>   public SerializerWriter q() throws IOException {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      out.write(quoteChar);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      return this;<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>    * Writes an indent to the writer if the {@code useWhitespace} setting is enabled.<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    *<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    * @param indent The number of tabs to indent.<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    * @return This object (for method chaining).<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    */<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   public SerializerWriter i(int indent) throws IOException {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      if (useWhitespace)<a name="line.235"></a>
+<span class="sourceLineNo">236</span>         for (int i = 0; i &lt; indent; i++)<a name="line.236"></a>
+<span class="sourceLineNo">237</span>            out.write('\t');<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      return this;<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   }<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>    * Writes a newline to the writer if the {@code useWhitespace} setting is enabled.<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    *<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    * @return This object (for method chaining).<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    */<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   public SerializerWriter nl() throws IOException {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      if (useWhitespace)<a name="line.248"></a>
+<span class="sourceLineNo">249</span>         out.write('\n');<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      return this;<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>   /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    * Writes a newline to the writer if the {@code useWhitespace} setting is enabled and the boolean flag is true.<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    *<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    * @param b The boolean flag.<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    * @return This object (for method chaining).<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    */<a name="line.259"></a>
+<span class="sourceLineNo">260</span>   public SerializerWriter nlIf(boolean b) throws IOException {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      if (b &amp;&amp; useWhitespace)<a name="line.261"></a>
+<span class="sourceLineNo">262</span>         out.write('\n');<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      return this;<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>    * Writes the specified text to the writer.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    *<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    * @param text The text to write.<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    * @throws IOException If a problem occurred trying to write to the writer.<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    * @return This object (for method chaining).<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    */<a name="line.272"></a>
+<span class="sourceLineNo">273</span>   public SerializerWriter append(Object text) throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      out.append(text == null ? null : text.toString());<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      return this;<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>   /**<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    * Writes the specified text to the writer.<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    *<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    * @param text The text to write.<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    * @throws IOException If a problem occurred trying to write to the writer.<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 SerializerWriter append(String text) throws IOException {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      if (text != null)<a name="line.286"></a>
+<span class="sourceLineNo">287</span>         out.append(text);<a name="line.287"></a>
+<span class="sourceLineNo">288</span>      return this;<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>   /**<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    * Writes the specified text to the writer if b is true.<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    *<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    * @param b Boolean flag.<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    * @param text The text to write.<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    * @throws IOException If a problem occurred trying to write to the writer.<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 SerializerWriter appendIf(boolean b, String text) throws IOException {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      if (b)<a name="line.300"></a>
+<span class="sourceLineNo">301</span>         out.write(text);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      return this;<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>    * Writes the specified text to the writer if b is true.<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    *<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    * @param b Boolean flag.<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    * @param c The text to write.<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    * @throws IOException If a problem occurred trying to write to the writer.<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 SerializerWriter appendIf(boolean b, char c) throws IOException {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      if (b)<a name="line.314"></a>
+<span class="sourceLineNo">315</span>         out.write(c);<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      return this;<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><a name="line.319"></a>
+<span class="sourceLineNo">320</span>   //--------------------------------------------------------------------------------<a name="line.320"></a>
+<span class="sourceLineNo">321</span>   // Overridden methods<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>   @Override /* Writer */<a name="line.324"></a>
+<span class="sourceLineNo">325</span>   public SerializerWriter append(char c) throws IOException {<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      out.write(c);<a name="line.326"></a>
+<span class="sourceLineNo">327</span>      return this;<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>   @Override /* Writer */<a name="line.330"></a>
+<span class="sourceLineNo">331</span>   public void write(char[] cbuf, int off, int len) throws IOException {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      out.write(cbuf, off, len);<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>   @Override /* Writer */<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   public void flush() throws IOException {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      out.flush();<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>   @Override /* Writer */<a name="line.340"></a>
+<span class="sourceLineNo">341</span>   public void close() throws IOException {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      out.close();<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/serializer/WriterSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/serializer/WriterSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/serializer/WriterSerializer.html
index eb790e3..ce26403 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/serializer/WriterSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/serializer/WriterSerializer.html
@@ -37,7 +37,7 @@
 <span class="sourceLineNo">029</span> * This class is typically the parent class of all character-based serializers.<a name="line.29"></a>
 <span class="sourceLineNo">030</span> * It has 2 abstract methods to implement...<a name="line.30"></a>
 <span class="sourceLineNo">031</span> * &lt;ul class='spaced-list'&gt;<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *    &lt;li&gt;{@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)}<a name="line.32"></a>
+<span class="sourceLineNo">032</span> *    &lt;li&gt;{@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)}<a name="line.32"></a>
 <span class="sourceLineNo">033</span> *    &lt;li&gt;{@link #doSerialize(SerializerSession, Object)}<a name="line.33"></a>
 <span class="sourceLineNo">034</span> * &lt;/ul&gt;<a name="line.34"></a>
 <span class="sourceLineNo">035</span> *<a name="line.35"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Encoding.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Encoding.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Encoding.html
index 635649d..925d438 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Encoding.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Encoding.html
@@ -384,8 +384,8 @@
 <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>   @Override /* Serializer */<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.380"></a>
+<span class="sourceLineNo">379</span>   public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>      return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* Serializer */<a name="line.383"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Readable.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Readable.html
index 635649d..925d438 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Readable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Readable.html
@@ -384,8 +384,8 @@
 <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>   @Override /* Serializer */<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.380"></a>
+<span class="sourceLineNo">379</span>   public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>      return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* Serializer */<a name="line.383"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.html
index 635649d..925d438 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.html
@@ -384,8 +384,8 @@
 <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>   @Override /* Serializer */<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.380"></a>
+<span class="sourceLineNo">379</span>   public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>      return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>   @Override /* Serializer */<a name="line.383"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
index 0ff93b0..bc19c81 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
@@ -46,56 +46,58 @@
 <span class="sourceLineNo">038</span>    * Create a new session using properties specified in the context.<a name="line.38"></a>
 <span class="sourceLineNo">039</span>    *<a name="line.39"></a>
 <span class="sourceLineNo">040</span>    * @param ctx The context creating this session object.<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    * The context contains all the configuration settings for this object.<a name="line.41"></a>
+<span class="sourceLineNo">041</span>    *    The context contains all the configuration settings for this object.<a name="line.41"></a>
 <span class="sourceLineNo">042</span>    * @param encode Override the {@link UonSerializerContext#UON_encodeChars} setting.<a name="line.42"></a>
 <span class="sourceLineNo">043</span>    * @param output The output object.  See {@link JsonSerializerSession#getWriter()} for valid class types.<a name="line.43"></a>
 <span class="sourceLineNo">044</span>    * @param op The override properties.<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    * These override any context properties defined in the context.<a name="line.45"></a>
+<span class="sourceLineNo">045</span>    *    These override any context properties defined in the context.<a name="line.45"></a>
 <span class="sourceLineNo">046</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.46"></a>
 <span class="sourceLineNo">047</span>    * @param locale The session locale.<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.48"></a>
+<span class="sourceLineNo">048</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.48"></a>
 <span class="sourceLineNo">049</span>    * @param timeZone The session timezone.<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.50"></a>
+<span class="sourceLineNo">050</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.50"></a>
 <span class="sourceLineNo">051</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    */<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   protected UonSerializerSession(UonSerializerContext ctx, Boolean encode, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      if (op == null || op.isEmpty()) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>         encodeChars = encode == null ? ctx.encodeChars : encode;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      } else {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>         encodeChars = encode == null ? op.getBoolean(UON_encodeChars, ctx.encodeChars) : encode;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>         addBeanTypeProperties = op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      }<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>   /**<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    * Returns the {@link UonSerializerContext#UON_encodeChars} setting value for this session.<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    *<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    * @return The {@link UonSerializerContext#UON_encodeChars} setting value for this session.<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    */<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   public final boolean isEncodeChars() {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      return encodeChars;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   }<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>   /**<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    * Returns the {@link UonSerializerContext#UON_addBeanTypeProperties} setting value for this session.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    *<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    * @return The {@link UonSerializerContext#UON_addBeanTypeProperties} setting value for this session.<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    */<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   @Override /* SerializerSession */<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   public final boolean isAddBeanTypeProperties() {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      return addBeanTypeProperties;<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>   @Override /* SerializerSession */<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   public final UonWriter getWriter() throws Exception {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      Object output = getOutput();<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      if (output instanceof UonWriter)<a name="line.86"></a>
-<span class="sourceLineNo">087</span>         return (UonWriter)output;<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      return new UonWriter(this, super.getWriter(), isUseWhitespace(), isEncodeChars(), isTrimStrings(), getRelativeUriBase(), getAbsolutePathUriBase());<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">052</span>    * @param uriContext The URI context.<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    */<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   protected UonSerializerSession(UonSerializerContext ctx, Boolean encode, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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>         encodeChars = encode == null ? ctx.encodeChars : encode;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>         addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>      } else {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>         encodeChars = encode == null ? op.getBoolean(UON_encodeChars, ctx.encodeChars) : encode;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>         addBeanTypeProperties = op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<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>   /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    * Returns the {@link UonSerializerContext#UON_encodeChars} setting value for this session.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    *<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    * @return The {@link UonSerializerContext#UON_encodeChars} setting value for this session.<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    */<a name="line.70"></a>
+<span class="sourceLineNo">071</span>   public final boolean isEncodeChars() {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      return encodeChars;<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>    * Returns the {@link UonSerializerContext#UON_addBeanTypeProperties} setting value for this session.<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    *<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    * @return The {@link UonSerializerContext#UON_addBeanTypeProperties} setting value for this session.<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    */<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   @Override /* SerializerSession */<a name="line.80"></a>
+<span class="sourceLineNo">081</span>   public final boolean isAddBeanTypeProperties() {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      return addBeanTypeProperties;<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>   @Override /* SerializerSession */<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   public final UonWriter getWriter() throws Exception {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      Object output = getOutput();<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      if (output instanceof UonWriter)<a name="line.88"></a>
+<span class="sourceLineNo">089</span>         return (UonWriter)output;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      return new UonWriter(this, super.getWriter(), isUseWhitespace(), isEncodeChars(), isTrimStrings(), getRelativeUriBase(), getAbsolutePathUriBase(), getUriContext());<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>