http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2f6fc8b5/content/site/apidocs/src-html/org/apache/juneau/dto/Link.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/Link.html
b/content/site/apidocs/src-html/org/apache/juneau/dto/Link.html
index 62bc93a..15a98fe 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/Link.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/Link.html
@@ -23,125 +23,126 @@
<span class="sourceLineNo">015</span>import java.text.*;<a name="line.15"></a>
<span class="sourceLineNo">016</span><a name="line.16"></a>
<span class="sourceLineNo">017</span>import org.apache.juneau.html.*;<a
name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.urlencoding.*;<a
name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.utils.*;<a
name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * Simple bean that implements a
hyperlink for the HTML serializer.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * <p><a name="line.23"></a>
-<span class="sourceLineNo">024</span> * The name and url properties correspond
to the following parts of a hyperlink in an HTML document...<a
name="line.24"></a>
-<span class="sourceLineNo">025</span> * <p class='bcode'><a
name="line.25"></a>
-<span class="sourceLineNo">026</span> * <xt>&lt;a</xt>
<xa>href</xa>=<xs>'href'</xs><xt>&gt;</xt>name<xt>&lt;/a&gt;</xt><a
name="line.26"></a>
-<span class="sourceLineNo">027</span> * <p><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * When encountered by the {@link
HtmlSerializer} class, this object gets converted to a hyperlink.<br><a
name="line.28"></a>
-<span class="sourceLineNo">029</span> * All other serializers simply convert
it to a simple bean.<a name="line.29"></a>
-<span class="sourceLineNo">030</span> */<a name="line.30"></a>
-<span class="sourceLineNo">031</span>@HtmlLink(nameProperty = "name",
hrefProperty = "href")<a name="line.31"></a>
-<span class="sourceLineNo">032</span>public class Link implements
Comparable<Link> {<a name="line.32"></a>
-<span class="sourceLineNo">033</span> private String name, href;<a
name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span> /** No-arg constructor. */<a
name="line.35"></a>
-<span class="sourceLineNo">036</span> public Link() {}<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> * Constructor.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * @param name Corresponds to the text
inside of the <xt>&lt;A&gt;</xt> element.<a
name="line.41"></a>
-<span class="sourceLineNo">042</span> * @param href Corresponds to the
value of the <xa>href</xa> attribute of the
<xt>&lt;A&gt;</xt> element.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * @param hrefArgs Optional arguments
for {@link MessageFormat} style arguments in the href.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> */<a name="line.44"></a>
-<span class="sourceLineNo">045</span> public Link(String name, String href,
Object...hrefArgs) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span> setName(name);<a name="line.46"></a>
-<span class="sourceLineNo">047</span> setHref(href, hrefArgs);<a
name="line.47"></a>
-<span class="sourceLineNo">048</span> }<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.serializer.*;<a
name="line.18"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.urlencoding.*;<a
name="line.19"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.utils.*;<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> * Simple bean that implements a
hyperlink for the HTML serializer.<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * <p><a name="line.24"></a>
+<span class="sourceLineNo">025</span> * The name and url properties correspond
to the following parts of a hyperlink in an HTML document...<a
name="line.25"></a>
+<span class="sourceLineNo">026</span> * <p class='bcode'><a
name="line.26"></a>
+<span class="sourceLineNo">027</span> * <xt>&lt;a</xt>
<xa>href</xa>=<xs>'href'</xs><xt>&gt;</xt>name<xt>&lt;/a&gt;</xt><a
name="line.27"></a>
+<span class="sourceLineNo">028</span> * <p><a name="line.28"></a>
+<span class="sourceLineNo">029</span> * When encountered by the {@link
HtmlSerializer} class, this object gets converted to a hyperlink.<br><a
name="line.29"></a>
+<span class="sourceLineNo">030</span> * All other serializers simply convert
it to a simple bean.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> */<a name="line.31"></a>
+<span class="sourceLineNo">032</span>@HtmlLink(nameProperty = "name",
hrefProperty = "href")<a name="line.32"></a>
+<span class="sourceLineNo">033</span>public class Link implements
Comparable<Link> {<a name="line.33"></a>
+<span class="sourceLineNo">034</span> private String name, href;<a
name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span> /** No-arg constructor. */<a
name="line.36"></a>
+<span class="sourceLineNo">037</span> public Link() {}<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> * Constructor.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * @param name Corresponds to the text
inside of the <xt>&lt;A&gt;</xt> element.<a
name="line.42"></a>
+<span class="sourceLineNo">043</span> * @param href Corresponds to the
value of the <xa>href</xa> attribute of the
<xt>&lt;A&gt;</xt> element.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * @param hrefArgs Optional arguments
for {@link MessageFormat} style arguments in the href.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> */<a name="line.45"></a>
+<span class="sourceLineNo">046</span> public Link(String name, String href,
Object...hrefArgs) {<a name="line.46"></a>
+<span class="sourceLineNo">047</span> setName(name);<a name="line.47"></a>
+<span class="sourceLineNo">048</span> setHref(href, hrefArgs);<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> // Bean properties<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> * Bean property getter:
<property>name</property>.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * Corresponds to the text inside of
the <xt>&lt;A&gt;</xt> element.<a name="line.57"></a>
-<span class="sourceLineNo">058</span> *<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * @return The value of the
<property>name</property> property on this bean, or
<jk>null</jk> if it is not set.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> */<a name="line.60"></a>
-<span class="sourceLineNo">061</span> public String getName() {<a
name="line.61"></a>
-<span class="sourceLineNo">062</span> return name;<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> * Bean property setter:
<property>name</property>.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> *<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * @param name The new value for the
<property>name</property> property on this bean.<a
name="line.68"></a>
-<span class="sourceLineNo">069</span> * @return This object (for method
chaining).<a name="line.69"></a>
-<span class="sourceLineNo">070</span> */<a name="line.70"></a>
-<span class="sourceLineNo">071</span> public Link setName(String name) {<a
name="line.71"></a>
-<span class="sourceLineNo">072</span> this.name = name;<a
name="line.72"></a>
-<span class="sourceLineNo">073</span> return this;<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> * Bean property getter:
<property>href</property>.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * Corresponds to the value of the
<xa>href</xa> attribute of the
<xt>&lt;A&gt;</xt> element.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> *<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * @return The value of the
<property>href</property> property on this bean, or
<jk>null</jk> if it is not set.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> */<a name="line.81"></a>
-<span class="sourceLineNo">082</span> public String getHref() {<a
name="line.82"></a>
-<span class="sourceLineNo">083</span> return href;<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> * Bean property setter:
<property>href</property>.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> *<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * @param href The new value for the
<property>href</property> property on this bean.<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> */<a name="line.91"></a>
-<span class="sourceLineNo">092</span> public Link setHref(String href) {<a
name="line.92"></a>
-<span class="sourceLineNo">093</span> setHref(href, new Object[0]);<a
name="line.93"></a>
-<span class="sourceLineNo">094</span> return this;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> /**<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * Bean property setter:
<property>href</property>.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * Same as {@link #setHref(String)}
except allows for {@link MessageFormat} style arguments.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> *<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * @param href The new href.<a
name="line.101"></a>
-<span class="sourceLineNo">102</span> * @param args Optional {@link
MessageFormat}-style arguments.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * @return This object (for method
chaining).<a name="line.103"></a>
-<span class="sourceLineNo">104</span> */<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public Link setHref(String href,
Object...args) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> for (int i = 0; i < args.length;
i++)<a name="line.106"></a>
-<span class="sourceLineNo">107</span> args[i] =
UrlEncodingSerializer.DEFAULT.serializePart(args[i], null, null);<a
name="line.107"></a>
-<span class="sourceLineNo">108</span> this.href = (args.length > 0 ?
MessageFormat.format(href, args) : href);<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> /**<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * Returns the name so that the {@link
PojoQuery} class can search against it.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> */<a name="line.114"></a>
-<span class="sourceLineNo">115</span> @Override /* Object */<a
name="line.115"></a>
-<span class="sourceLineNo">116</span> public String toString() {<a
name="line.116"></a>
-<span class="sourceLineNo">117</span> return name;<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> @Override /* Comparable */<a
name="line.120"></a>
-<span class="sourceLineNo">121</span> public int compareTo(Link o) {<a
name="line.121"></a>
-<span class="sourceLineNo">122</span> return name.compareTo(o.name);<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> @Override /* Object */<a
name="line.125"></a>
-<span class="sourceLineNo">126</span> public boolean equals(Object o) {<a
name="line.126"></a>
-<span class="sourceLineNo">127</span> if (! (o instanceof Link))<a
name="line.127"></a>
-<span class="sourceLineNo">128</span> return false;<a
name="line.128"></a>
-<span class="sourceLineNo">129</span> return (compareTo((Link)o) == 0);<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> @Override /* Object */<a
name="line.132"></a>
-<span class="sourceLineNo">133</span> public int hashCode() {<a
name="line.133"></a>
-<span class="sourceLineNo">134</span> return super.hashCode();<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">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>
//--------------------------------------------------------------------------------<a
name="line.52"></a>
+<span class="sourceLineNo">053</span> // Bean properties<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> * Bean property getter:
<property>name</property>.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * Corresponds to the text inside of
the <xt>&lt;A&gt;</xt> element.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> *<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * @return The value of the
<property>name</property> property on this bean, or
<jk>null</jk> if it is not set.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> */<a name="line.61"></a>
+<span class="sourceLineNo">062</span> public String getName() {<a
name="line.62"></a>
+<span class="sourceLineNo">063</span> return name;<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> * Bean property setter:
<property>name</property>.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> *<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * @param name The new value for the
<property>name</property> property on this bean.<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> */<a name="line.71"></a>
+<span class="sourceLineNo">072</span> public Link setName(String name) {<a
name="line.72"></a>
+<span class="sourceLineNo">073</span> this.name = name;<a
name="line.73"></a>
+<span class="sourceLineNo">074</span> return this;<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> * Bean property getter:
<property>href</property>.<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * Corresponds to the value of the
<xa>href</xa> attribute of the
<xt>&lt;A&gt;</xt> element.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> *<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * @return The value of the
<property>href</property> property on this bean, or
<jk>null</jk> if it is not set.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> */<a name="line.82"></a>
+<span class="sourceLineNo">083</span> public String getHref() {<a
name="line.83"></a>
+<span class="sourceLineNo">084</span> return href;<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> * Bean property setter:
<property>href</property>.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> *<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * @param href The new value for the
<property>href</property> property on this bean.<a
name="line.90"></a>
+<span class="sourceLineNo">091</span> * @return This object (for method
chaining).<a name="line.91"></a>
+<span class="sourceLineNo">092</span> */<a name="line.92"></a>
+<span class="sourceLineNo">093</span> public Link setHref(String href) {<a
name="line.93"></a>
+<span class="sourceLineNo">094</span> setHref(href, new Object[0]);<a
name="line.94"></a>
+<span class="sourceLineNo">095</span> return this;<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> /**<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * Bean property setter:
<property>href</property>.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * Same as {@link #setHref(String)}
except allows for {@link MessageFormat} style arguments.<a name="line.100"></a>
+<span class="sourceLineNo">101</span> *<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * @param href The new href.<a
name="line.102"></a>
+<span class="sourceLineNo">103</span> * @param args Optional {@link
MessageFormat}-style arguments.<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * @return This object (for method
chaining).<a name="line.104"></a>
+<span class="sourceLineNo">105</span> */<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public Link setHref(String href,
Object...args) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> for (int i = 0; i < args.length;
i++)<a name="line.107"></a>
+<span class="sourceLineNo">108</span> args[i] =
UrlEncodingSerializer.DEFAULT.serialize(PartType.PATH, args[i]);<a
name="line.108"></a>
+<span class="sourceLineNo">109</span> this.href = (args.length > 0 ?
MessageFormat.format(href, args) : href);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> return this;<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 name so that the {@link
PojoQuery} class can search against it.<a name="line.114"></a>
+<span class="sourceLineNo">115</span> */<a name="line.115"></a>
+<span class="sourceLineNo">116</span> @Override /* Object */<a
name="line.116"></a>
+<span class="sourceLineNo">117</span> public String toString() {<a
name="line.117"></a>
+<span class="sourceLineNo">118</span> return name;<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 /* Comparable */<a
name="line.121"></a>
+<span class="sourceLineNo">122</span> public int compareTo(Link o) {<a
name="line.122"></a>
+<span class="sourceLineNo">123</span> return name.compareTo(o.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> @Override /* Object */<a
name="line.126"></a>
+<span class="sourceLineNo">127</span> public boolean equals(Object o) {<a
name="line.127"></a>
+<span class="sourceLineNo">128</span> if (! (o instanceof Link))<a
name="line.128"></a>
+<span class="sourceLineNo">129</span> return false;<a
name="line.129"></a>
+<span class="sourceLineNo">130</span> return (compareTo((Link)o) == 0);<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 /* Object */<a
name="line.133"></a>
+<span class="sourceLineNo">134</span> public int hashCode() {<a
name="line.134"></a>
+<span class="sourceLineNo">135</span> return super.hashCode();<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>