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/11/26 19:46:16 UTC
[07/51] [partial] juneau-website git commit: New
Security-Best-Practices section in javadocs.
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/SchemaMap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/SchemaMap.html b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/SchemaMap.html
index b7e7321..da13700 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/SchemaMap.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/SchemaMap.html
@@ -127,32 +127,31 @@
<span class="sourceLineNo">119</span> * @return The parsed schema.<a name="line.119"></a>
<span class="sourceLineNo">120</span> */<a name="line.120"></a>
<span class="sourceLineNo">121</span> public Schema load(URI uri) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> Reader r = getReader(uri);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> if (r == null)<a name="line.123"></a>
-<span class="sourceLineNo">124</span> return null;<a name="line.124"></a>
-<span class="sourceLineNo">125</span> try (Reader r2 = r) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> return JsonParser.DEFAULT.parse(r2, Schema.class);<a name="line.126"></a>
-<span class="sourceLineNo">127</span> } catch (Exception e) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> throw new RuntimeException(e);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span> }<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * Subclasses must implement either this method or {@link #load(URI)} to load the schema with the specified URI.<a name="line.133"></a>
-<span class="sourceLineNo">134</span> *<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * <p><a name="line.135"></a>
-<span class="sourceLineNo">136</span> * It's up to the implementer to decide where these come from.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> *<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * <p><a name="line.138"></a>
-<span class="sourceLineNo">139</span> * The default implementation returns <jk>null</jk>.<a name="line.139"></a>
-<span class="sourceLineNo">140</span> *<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * @param uri The URI to connect to and retrieve the contents.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * @return The reader from reading the specified URI.<a name="line.142"></a>
-<span class="sourceLineNo">143</span> */<a name="line.143"></a>
-<span class="sourceLineNo">144</span> public Reader getReader(URI uri) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> return null;<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">122</span> try (Reader r = getReader(uri)) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> if (r == null)<a name="line.123"></a>
+<span class="sourceLineNo">124</span> return null;<a name="line.124"></a>
+<span class="sourceLineNo">125</span> return JsonParser.DEFAULT.parse(r, Schema.class);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> } catch (Exception e) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> throw new RuntimeException(e);<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> /**<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * Subclasses must implement either this method or {@link #load(URI)} to load the schema with the specified URI.<a name="line.132"></a>
+<span class="sourceLineNo">133</span> *<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * <p><a name="line.134"></a>
+<span class="sourceLineNo">135</span> * It's up to the implementer to decide where these come from.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> *<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * <p><a name="line.137"></a>
+<span class="sourceLineNo">138</span> * The default implementation returns <jk>null</jk>.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> *<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * @param uri The URI to connect to and retrieve the contents.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * @return The reader from reading the specified URI.<a name="line.141"></a>
+<span class="sourceLineNo">142</span> */<a name="line.142"></a>
+<span class="sourceLineNo">143</span> public Reader getReader(URI uri) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> return null;<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>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Swagger.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Swagger.html b/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Swagger.html
index ce4f3f4..b0428f6 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Swagger.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Swagger.html
@@ -1021,7 +1021,7 @@
<span class="sourceLineNo">1013</span> return setExternalDocs(externalDocs);<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> private static class MethodSorter implements Comparator<String> {<a name="line.1016"></a>
+<span class="sourceLineNo">1016</span> static final class MethodSorter implements Comparator<String> {<a name="line.1016"></a>
<span class="sourceLineNo">1017</span> private final Map<String,Integer> methods = new AMap<String,Integer>()<a name="line.1017"></a>
<span class="sourceLineNo">1018</span> .append("get",7)<a name="line.1018"></a>
<span class="sourceLineNo">1019</span> .append("put",6)<a name="line.1019"></a>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/src-html/org/apache/juneau/encoders/EncoderGroup.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/encoders/EncoderGroup.html b/content/site/apidocs/src-html/org/apache/juneau/encoders/EncoderGroup.html
index b3cd1a2..ab4fe32 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/encoders/EncoderGroup.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/encoders/EncoderGroup.html
@@ -71,85 +71,106 @@
<span class="sourceLineNo">063</span> private final List<Encoder> encoders;<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> * Constructor<a name="line.66"></a>
-<span class="sourceLineNo">067</span> *<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * @param encoders The encoders to add to this group.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> */<a name="line.69"></a>
-<span class="sourceLineNo">070</span> public EncoderGroup(Encoder[] encoders) {<a name="line.70"></a>
-<span class="sourceLineNo">071</span> this.encoders = Collections.unmodifiableList(new ArrayList<>(Arrays.asList(encoders)));<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span> List<String> lc = new ArrayList<>();<a name="line.73"></a>
-<span class="sourceLineNo">074</span> List<Encoder> l = new ArrayList<>();<a name="line.74"></a>
-<span class="sourceLineNo">075</span> for (Encoder e : encoders) {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> for (String c: e.getCodings()) {<a name="line.76"></a>
-<span class="sourceLineNo">077</span> lc.add(c);<a name="line.77"></a>
-<span class="sourceLineNo">078</span> l.add(e);<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><a name="line.81"></a>
-<span class="sourceLineNo">082</span> this.encodings = lc.toArray(new String[lc.size()]);<a name="line.82"></a>
-<span class="sourceLineNo">083</span> this.encodingsList = Collections.unmodifiableList(lc);<a name="line.83"></a>
-<span class="sourceLineNo">084</span> this.encodingsEncoders = l.toArray(new Encoder[l.size()]);<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> * Returns the coding string for the matching encoder that can handle the specified <code>Accept-Encoding</code><a name="line.88"></a>
-<span class="sourceLineNo">089</span> * or <code>Content-Encoding</code> header value.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> *<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * <p><a name="line.91"></a>
-<span class="sourceLineNo">092</span> * Returns <jk>null</jk> if no encoders can handle it.<a name="line.92"></a>
-<span class="sourceLineNo">093</span> *<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * <p><a name="line.94"></a>
-<span class="sourceLineNo">095</span> * This method is fully compliant with the RFC2616/14.3 and 14.11 specifications.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> *<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * @param acceptEncoding The <code>Accept-Encoding</code> or <code>Content-Encoding</code> value.<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * @return The coding value (e.g. <js>"gzip"</js>).<a name="line.98"></a>
-<span class="sourceLineNo">099</span> */<a name="line.99"></a>
-<span class="sourceLineNo">100</span> public EncoderMatch getEncoderMatch(String acceptEncoding) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> EncoderMatch em = cache.get(acceptEncoding);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (em != null)<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return em;<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span> AcceptEncoding ae = AcceptEncoding.forString(acceptEncoding);<a name="line.105"></a>
-<span class="sourceLineNo">106</span> int match = ae.findMatch(encodings);<a name="line.106"></a>
+<span class="sourceLineNo">066</span> * Instantiates a new clean-slate {@link EncoderGroupBuilder} object.<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * <a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <p><a name="line.68"></a>
+<span class="sourceLineNo">069</span> * This is equivalent to simply calling <code><jk>new</jk> EncoderGroupBuilder()</code>.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * <a name="line.70"></a>
+<span class="sourceLineNo">071</span> * @return A new {@link EncoderGroupBuilder} object.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> */<a name="line.72"></a>
+<span class="sourceLineNo">073</span> public static EncoderGroupBuilder create() {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> return new EncoderGroupBuilder();<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 a builder that's a copy of the settings on this encoder group.<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <a name="line.79"></a>
+<span class="sourceLineNo">080</span> * @return A new {@link EncoderGroupBuilder} initialized to this group.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> */<a name="line.81"></a>
+<span class="sourceLineNo">082</span> public EncoderGroupBuilder builder() {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> return new EncoderGroupBuilder(this);<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> * Constructor<a name="line.87"></a>
+<span class="sourceLineNo">088</span> *<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * @param encoders The encoders to add to this group.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> */<a name="line.90"></a>
+<span class="sourceLineNo">091</span> public EncoderGroup(Encoder[] encoders) {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> this.encoders = Collections.unmodifiableList(new ArrayList<>(Arrays.asList(encoders)));<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> List<String> lc = new ArrayList<>();<a name="line.94"></a>
+<span class="sourceLineNo">095</span> List<Encoder> l = new ArrayList<>();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> for (Encoder e : encoders) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> for (String c: e.getCodings()) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> lc.add(c);<a name="line.98"></a>
+<span class="sourceLineNo">099</span> l.add(e);<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> this.encodings = lc.toArray(new String[lc.size()]);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> this.encodingsList = Collections.unmodifiableList(lc);<a name="line.104"></a>
+<span class="sourceLineNo">105</span> this.encodingsEncoders = l.toArray(new Encoder[l.size()]);<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> if (match >= 0) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> em = new EncoderMatch(encodings[match], encodingsEncoders[match]);<a name="line.109"></a>
-<span class="sourceLineNo">110</span> cache.putIfAbsent(acceptEncoding, em);<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> return cache.get(acceptEncoding);<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> * Returns the encoder registered with the specified coding (e.g. <js>"gzip"</js>).<a name="line.117"></a>
-<span class="sourceLineNo">118</span> *<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * @param encoding The coding string.<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @return The encoder, or <jk>null</jk> if encoder isn't registered with that coding.<a name="line.120"></a>
-<span class="sourceLineNo">121</span> */<a name="line.121"></a>
-<span class="sourceLineNo">122</span> public Encoder getEncoder(String encoding) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> EncoderMatch em = getEncoderMatch(encoding);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> return (em == null ? null : em.getEncoder());<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 set of codings supported by all encoders in this group.<a name="line.128"></a>
-<span class="sourceLineNo">129</span> *<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * @return An unmodifiable list of codings supported by all encoders in this group. Never <jk>null</jk>.<a name="line.130"></a>
-<span class="sourceLineNo">131</span> */<a name="line.131"></a>
-<span class="sourceLineNo">132</span> public List<String> getSupportedEncodings() {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> return encodingsList;<a name="line.133"></a>
-<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> /**<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * Returns the encoders in this group.<a name="line.137"></a>
-<span class="sourceLineNo">138</span> *<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * @return An unmodifiable list of encoders in this group.<a name="line.139"></a>
-<span class="sourceLineNo">140</span> */<a name="line.140"></a>
-<span class="sourceLineNo">141</span> public List<Encoder> getEncoders() {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return encoders;<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">108</span> /**<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * Returns the coding string for the matching encoder that can handle the specified <code>Accept-Encoding</code><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * or <code>Content-Encoding</code> header value.<a name="line.110"></a>
+<span class="sourceLineNo">111</span> *<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * <p><a name="line.112"></a>
+<span class="sourceLineNo">113</span> * Returns <jk>null</jk> if no encoders can handle it.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> *<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <p><a name="line.115"></a>
+<span class="sourceLineNo">116</span> * This method is fully compliant with the RFC2616/14.3 and 14.11 specifications.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> *<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * @param acceptEncoding The <code>Accept-Encoding</code> or <code>Content-Encoding</code> value.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * @return The coding value (e.g. <js>"gzip"</js>).<a name="line.119"></a>
+<span class="sourceLineNo">120</span> */<a name="line.120"></a>
+<span class="sourceLineNo">121</span> public EncoderMatch getEncoderMatch(String acceptEncoding) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> EncoderMatch em = cache.get(acceptEncoding);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> if (em != null)<a name="line.123"></a>
+<span class="sourceLineNo">124</span> return em;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> AcceptEncoding ae = AcceptEncoding.forString(acceptEncoding);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> int match = ae.findMatch(encodings);<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> if (match >= 0) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> em = new EncoderMatch(encodings[match], encodingsEncoders[match]);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> cache.putIfAbsent(acceptEncoding, em);<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> return cache.get(acceptEncoding);<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 encoder registered with the specified coding (e.g. <js>"gzip"</js>).<a name="line.138"></a>
+<span class="sourceLineNo">139</span> *<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * @param encoding The coding string.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * @return The encoder, or <jk>null</jk> if encoder isn't registered with that coding.<a name="line.141"></a>
+<span class="sourceLineNo">142</span> */<a name="line.142"></a>
+<span class="sourceLineNo">143</span> public Encoder getEncoder(String encoding) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> EncoderMatch em = getEncoderMatch(encoding);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> return (em == null ? null : em.getEncoder());<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 set of codings supported by all encoders in this group.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> *<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @return An unmodifiable list of codings supported by all encoders in this group. Never <jk>null</jk>.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> */<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public List<String> getSupportedEncodings() {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return encodingsList;<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 encoders in this group.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> *<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * @return An unmodifiable list of encoders in this group.<a name="line.160"></a>
+<span class="sourceLineNo">161</span> */<a name="line.161"></a>
+<span class="sourceLineNo">162</span> public List<Encoder> getEncoders() {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> return encoders;<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>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/src-html/org/apache/juneau/encoders/EncoderGroupBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/encoders/EncoderGroupBuilder.html b/content/site/apidocs/src-html/org/apache/juneau/encoders/EncoderGroupBuilder.html
index c94fff6..36dc9d9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/encoders/EncoderGroupBuilder.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/encoders/EncoderGroupBuilder.html
@@ -21,95 +21,97 @@
<span class="sourceLineNo">013</span>package org.apache.juneau.encoders;<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.CollectionUtils.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import static org.apache.juneau.internal.ClassUtils.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import java.util.*;<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> * Builder class for creating instances of {@link EncoderGroup}.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> */<a name="line.22"></a>
-<span class="sourceLineNo">023</span>public class EncoderGroupBuilder {<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span> private final List<Encoder> encoders;<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span> /**<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * Create an empty encoder group builder.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> */<a name="line.29"></a>
-<span class="sourceLineNo">030</span> public EncoderGroupBuilder() {<a name="line.30"></a>
-<span class="sourceLineNo">031</span> this.encoders = new ArrayList<>();<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> /**<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * Clone an existing encoder group builder.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * @param copyFrom The encoder group that we're copying settings and encoders from.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> */<a name="line.38"></a>
-<span class="sourceLineNo">039</span> public EncoderGroupBuilder(EncoderGroup copyFrom) {<a name="line.39"></a>
-<span class="sourceLineNo">040</span> this.encoders = new ArrayList<>();<a name="line.40"></a>
-<span class="sourceLineNo">041</span> addReverse(encoders, copyFrom.getEncoders());<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> /**<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * Registers the specified encoders with this group.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> *<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * @param e The encoders to append to this group.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * @return This object (for method chaining).<a name="line.48"></a>
-<span class="sourceLineNo">049</span> */<a name="line.49"></a>
-<span class="sourceLineNo">050</span> public EncoderGroupBuilder append(Class<?>...e) {<a name="line.50"></a>
-<span class="sourceLineNo">051</span> for (int i = e.length-1; i >= 0; i--)<a name="line.51"></a>
-<span class="sourceLineNo">052</span> encoders.add(newInstance(Encoder.class, e[i]));<a name="line.52"></a>
-<span class="sourceLineNo">053</span> return this;<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> * Registers the specified encoders with this group.<a name="line.57"></a>
-<span class="sourceLineNo">058</span> *<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * @param e The encoders to append to this group.<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> */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public EncoderGroupBuilder append(Encoder...e) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> addReverse(encoders, e);<a name="line.63"></a>
-<span class="sourceLineNo">064</span> return this;<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> * Registers the specified encoders with this group.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> *<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * @param e The encoders to append to this group.<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * @return This object (for method chaining).<a name="line.71"></a>
-<span class="sourceLineNo">072</span> */<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public EncoderGroupBuilder append(List<Encoder> e) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> addReverse(encoders, e);<a name="line.74"></a>
-<span class="sourceLineNo">075</span> return this;<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> * Registers the encoders in the specified group with this group.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> *<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * @param eg The encoders to append to this group.<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * @return This object (for method chaining).<a name="line.82"></a>
-<span class="sourceLineNo">083</span> */<a name="line.83"></a>
-<span class="sourceLineNo">084</span> public EncoderGroupBuilder append(EncoderGroup eg) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> append(eg.getEncoders());<a name="line.85"></a>
-<span class="sourceLineNo">086</span> return this;<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> /**<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * Creates a new {@link EncoderGroup} object using a snapshot of the settings defined in this builder.<a name="line.90"></a>
-<span class="sourceLineNo">091</span> *<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * <p><a name="line.92"></a>
-<span class="sourceLineNo">093</span> * This method can be called multiple times to produce multiple encoder groups.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> *<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * @return A new {@link EncoderGroup} object.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> */<a name="line.96"></a>
-<span class="sourceLineNo">097</span> public EncoderGroup build() {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> List<Encoder> l = new ArrayList<>();<a name="line.98"></a>
-<span class="sourceLineNo">099</span> for (Object e : encoders)<a name="line.99"></a>
-<span class="sourceLineNo">100</span> l.add(newInstance(Encoder.class, e));<a name="line.100"></a>
-<span class="sourceLineNo">101</span> Collections.reverse(l);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> return new EncoderGroup(l.toArray(new Encoder[l.size()]));<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">016</span><a name="line.16"></a>
+<span class="sourceLineNo">017</span>import java.util.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span><a name="line.18"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.*;<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> * Builder class for creating instances of {@link EncoderGroup}.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> */<a name="line.23"></a>
+<span class="sourceLineNo">024</span>public class EncoderGroupBuilder {<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span> private final List<Encoder> encoders;<a name="line.26"></a>
+<span class="sourceLineNo">027</span> private BeanContext beanContext = BeanContext.DEFAULT;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span> /**<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * Create an empty encoder group builder.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> */<a name="line.31"></a>
+<span class="sourceLineNo">032</span> public EncoderGroupBuilder() {<a name="line.32"></a>
+<span class="sourceLineNo">033</span> this.encoders = new ArrayList<>();<a name="line.33"></a>
+<span class="sourceLineNo">034</span> }<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span> /**<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * Clone an existing encoder group builder.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * @param copyFrom The encoder group that we're copying settings and encoders from.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> */<a name="line.40"></a>
+<span class="sourceLineNo">041</span> public EncoderGroupBuilder(EncoderGroup copyFrom) {<a name="line.41"></a>
+<span class="sourceLineNo">042</span> this.encoders = new ArrayList<>();<a name="line.42"></a>
+<span class="sourceLineNo">043</span> addReverse(encoders, copyFrom.getEncoders());<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> /**<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * Registers the specified encoders with this group.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> *<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * @param e The encoders to append to this group.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * @return This object (for method chaining).<a name="line.50"></a>
+<span class="sourceLineNo">051</span> */<a name="line.51"></a>
+<span class="sourceLineNo">052</span> public EncoderGroupBuilder append(Class<?>...e) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> for (int i = e.length-1; i >= 0; i--)<a name="line.53"></a>
+<span class="sourceLineNo">054</span> encoders.add(beanContext.newInstance(Encoder.class, e[i]));<a name="line.54"></a>
+<span class="sourceLineNo">055</span> return this;<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> * Registers the specified encoders with this group.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> *<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * @param e The encoders to append to this group.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * @return This object (for method chaining).<a name="line.62"></a>
+<span class="sourceLineNo">063</span> */<a name="line.63"></a>
+<span class="sourceLineNo">064</span> public EncoderGroupBuilder append(Encoder...e) {<a name="line.64"></a>
+<span class="sourceLineNo">065</span> addReverse(encoders, e);<a name="line.65"></a>
+<span class="sourceLineNo">066</span> return this;<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> /**<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * Registers the specified encoders with this group.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> *<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * @param e The encoders to append to this group.<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> */<a name="line.74"></a>
+<span class="sourceLineNo">075</span> public EncoderGroupBuilder append(List<Encoder> e) {<a name="line.75"></a>
+<span class="sourceLineNo">076</span> addReverse(encoders, e);<a name="line.76"></a>
+<span class="sourceLineNo">077</span> return this;<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> * Registers the encoders in the specified group with this group.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> *<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * @param eg The encoders to append to this group.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * @return This object (for method chaining).<a name="line.84"></a>
+<span class="sourceLineNo">085</span> */<a name="line.85"></a>
+<span class="sourceLineNo">086</span> public EncoderGroupBuilder append(EncoderGroup eg) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> append(eg.getEncoders());<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> * Creates a new {@link EncoderGroup} object using a snapshot of the settings defined in this builder.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> *<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <p><a name="line.94"></a>
+<span class="sourceLineNo">095</span> * This method can be called multiple times to produce multiple encoder groups.<a name="line.95"></a>
+<span class="sourceLineNo">096</span> *<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * @return A new {@link EncoderGroup} object.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> */<a name="line.98"></a>
+<span class="sourceLineNo">099</span> public EncoderGroup build() {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> List<Encoder> l = new ArrayList<>();<a name="line.100"></a>
+<span class="sourceLineNo">101</span> for (Object e : encoders)<a name="line.101"></a>
+<span class="sourceLineNo">102</span> l.add(beanContext.newInstance(Encoder.class, e));<a name="line.102"></a>
+<span class="sourceLineNo">103</span> Collections.reverse(l);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> return new EncoderGroup(l.toArray(new Encoder[l.size()]));<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>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/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 c453321..8ed1e58 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
@@ -22,147 +22,146 @@
<span class="sourceLineNo">014</span><a name="line.14"></a>
<span class="sourceLineNo">015</span>import org.apache.juneau.*;<a name="line.15"></a>
<span class="sourceLineNo">016</span>import org.apache.juneau.html.annotation.*;<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><a name="line.18"></a>
-<span class="sourceLineNo">019</span>/**<a name="line.19"></a>
-<span class="sourceLineNo">020</span> * Metadata on bean properties specific to the HTML serializers and parsers pulled from the {@link Html @Html}<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * annotation on the bean property.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> */<a name="line.22"></a>
-<span class="sourceLineNo">023</span>@SuppressWarnings("rawtypes")<a name="line.23"></a>
-<span class="sourceLineNo">024</span>public final class HtmlBeanPropertyMeta extends BeanPropertyMetaExtended {<a name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span> private final boolean asXml, noTables, noTableHeaders, asPlainText;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> private final HtmlRender render;<a name="line.27"></a>
-<span class="sourceLineNo">028</span> private final String link, anchorText;<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> * Constructor.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * @param bpm The metadata of the bean property of this additional metadata.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * @throws Exception If render class could not be instantiated.<a name="line.34"></a>
-<span class="sourceLineNo">035</span> */<a name="line.35"></a>
-<span class="sourceLineNo">036</span> public HtmlBeanPropertyMeta(BeanPropertyMeta bpm) throws Exception {<a name="line.36"></a>
-<span class="sourceLineNo">037</span> super(bpm);<a name="line.37"></a>
-<span class="sourceLineNo">038</span> Builder b = new Builder();<a name="line.38"></a>
-<span class="sourceLineNo">039</span> if (bpm.getField() != null)<a name="line.39"></a>
-<span class="sourceLineNo">040</span> b.findHtmlInfo(bpm.getField().getAnnotation(Html.class));<a name="line.40"></a>
-<span class="sourceLineNo">041</span> if (bpm.getGetter() != null)<a name="line.41"></a>
-<span class="sourceLineNo">042</span> b.findHtmlInfo(bpm.getGetter().getAnnotation(Html.class));<a name="line.42"></a>
-<span class="sourceLineNo">043</span> if (bpm.getSetter() != null)<a name="line.43"></a>
-<span class="sourceLineNo">044</span> b.findHtmlInfo(bpm.getSetter().getAnnotation(Html.class));<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span> this.asXml = b.asXml;<a name="line.46"></a>
-<span class="sourceLineNo">047</span> this.noTables = b.noTables;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> this.noTableHeaders = b.noTableHeaders;<a name="line.48"></a>
-<span class="sourceLineNo">049</span> this.asPlainText = b.asPlainText;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> this.render = ClassUtils.newInstance(HtmlRender.class, b.render);<a name="line.50"></a>
-<span class="sourceLineNo">051</span> this.link = b.link;<a name="line.51"></a>
-<span class="sourceLineNo">052</span> this.anchorText = b.anchorText;<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> private static class Builder {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> boolean asXml, noTables, noTableHeaders, asPlainText;<a name="line.56"></a>
-<span class="sourceLineNo">057</span> Class<? extends HtmlRender> render = HtmlRender.class;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> String link, anchorText;<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span> void findHtmlInfo(Html html) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> if (html == null)<a name="line.61"></a>
-<span class="sourceLineNo">062</span> return;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> if (html.asXml())<a name="line.63"></a>
-<span class="sourceLineNo">064</span> asXml = html.asXml();<a name="line.64"></a>
-<span class="sourceLineNo">065</span> if (html.noTables())<a name="line.65"></a>
-<span class="sourceLineNo">066</span> noTables = html.noTables();<a name="line.66"></a>
-<span class="sourceLineNo">067</span> if (html.noTableHeaders())<a name="line.67"></a>
-<span class="sourceLineNo">068</span> noTableHeaders = html.noTableHeaders();<a name="line.68"></a>
-<span class="sourceLineNo">069</span> if (html.asPlainText())<a name="line.69"></a>
-<span class="sourceLineNo">070</span> asPlainText = html.asPlainText();<a name="line.70"></a>
-<span class="sourceLineNo">071</span> if (html.render() != HtmlRender.class)<a name="line.71"></a>
-<span class="sourceLineNo">072</span> render = html.render();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> if (! html.link().isEmpty())<a name="line.73"></a>
-<span class="sourceLineNo">074</span> link = html.link();<a name="line.74"></a>
-<span class="sourceLineNo">075</span> if (! html.anchorText().isEmpty())<a name="line.75"></a>
-<span class="sourceLineNo">076</span> anchorText = html.anchorText();<a name="line.76"></a>
-<span class="sourceLineNo">077</span> }<a name="line.77"></a>
-<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> /**<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * Returns whether this bean property should be serialized as XML instead of HTML.<a name="line.81"></a>
-<span class="sourceLineNo">082</span> *<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * @return <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#asXml()} is <jk>true</jk>.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> */<a name="line.84"></a>
-<span class="sourceLineNo">085</span> protected boolean isAsXml() {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> return asXml;<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> /**<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * Returns whether this bean property should be serialized as plain text instead of HTML.<a name="line.90"></a>
-<span class="sourceLineNo">091</span> *<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * @return<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#asPlainText()} is<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * <jk>true</jk>.<a name="line.94"></a>
-<span class="sourceLineNo">095</span> */<a name="line.95"></a>
-<span class="sourceLineNo">096</span> protected boolean isAsPlainText() {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> return asPlainText;<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> * Returns whether this bean property should not be serialized as an HTML table.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> *<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * @return<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#noTables()} is<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * <jk>true</jk>.<a name="line.105"></a>
-<span class="sourceLineNo">106</span> */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> protected boolean isNoTables() {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> return noTables;<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 whether this bean property should not include table headers when serialized as an HTML table.<a name="line.112"></a>
-<span class="sourceLineNo">113</span> *<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * @return<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#noTableHeaders()} is<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <jk>true</jk>.<a name="line.116"></a>
-<span class="sourceLineNo">117</span> */<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public boolean isNoTableHeaders() {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> return noTableHeaders;<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 render class for rendering the style and contents of this property value in HTML.<a name="line.123"></a>
-<span class="sourceLineNo">124</span> *<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * <p><a name="line.125"></a>
-<span class="sourceLineNo">126</span> * This value is specified via the {@link Html#render()} annotation.<a name="line.126"></a>
-<span class="sourceLineNo">127</span> *<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * @return The render class, never <jk>null</jk>.<a name="line.128"></a>
-<span class="sourceLineNo">129</span> */<a name="line.129"></a>
-<span class="sourceLineNo">130</span> public HtmlRender getRender() {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> return render;<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> /**<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * Adds a hyperlink to this value in HTML.<a name="line.135"></a>
-<span class="sourceLineNo">136</span> *<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * <p><a name="line.137"></a>
-<span class="sourceLineNo">138</span> * This value is specified via the {@link Html#link()} annotation.<a name="line.138"></a>
-<span class="sourceLineNo">139</span> *<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * @return The link string, or <jk>null</jk> if not specified.<a name="line.140"></a>
-<span class="sourceLineNo">141</span> */<a name="line.141"></a>
-<span class="sourceLineNo">142</span> public String getLink() {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> return link;<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> * Specifies the anchor text for this property.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> *<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * <p><a name="line.149"></a>
-<span class="sourceLineNo">150</span> * This value is specified via the {@link Html#anchorText()} annotation.<a name="line.150"></a>
-<span class="sourceLineNo">151</span> *<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @return The link string, or <jk>null</jk> if not specified.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> */<a name="line.153"></a>
-<span class="sourceLineNo">154</span> public String getAnchorText() {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> return anchorText;<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">017</span><a name="line.17"></a>
+<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}<a name="line.19"></a>
+<span class="sourceLineNo">020</span> * annotation on the bean property.<a name="line.20"></a>
+<span class="sourceLineNo">021</span> */<a name="line.21"></a>
+<span class="sourceLineNo">022</span>@SuppressWarnings("rawtypes")<a name="line.22"></a>
+<span class="sourceLineNo">023</span>public final class HtmlBeanPropertyMeta extends BeanPropertyMetaExtended {<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span> private final boolean asXml, noTables, noTableHeaders, asPlainText;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> private final HtmlRender render;<a name="line.26"></a>
+<span class="sourceLineNo">027</span> private final String link, anchorText;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span> /**<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * Constructor.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> *<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * @param bpm The metadata of the bean property of this additional metadata.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * @throws Exception If render class could not be instantiated.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> */<a name="line.34"></a>
+<span class="sourceLineNo">035</span> public HtmlBeanPropertyMeta(BeanPropertyMeta bpm) throws Exception {<a name="line.35"></a>
+<span class="sourceLineNo">036</span> super(bpm);<a name="line.36"></a>
+<span class="sourceLineNo">037</span> Builder b = new Builder();<a name="line.37"></a>
+<span class="sourceLineNo">038</span> if (bpm.getField() != null)<a name="line.38"></a>
+<span class="sourceLineNo">039</span> b.findHtmlInfo(bpm.getField().getAnnotation(Html.class));<a name="line.39"></a>
+<span class="sourceLineNo">040</span> if (bpm.getGetter() != null)<a name="line.40"></a>
+<span class="sourceLineNo">041</span> b.findHtmlInfo(bpm.getGetter().getAnnotation(Html.class));<a name="line.41"></a>
+<span class="sourceLineNo">042</span> if (bpm.getSetter() != null)<a name="line.42"></a>
+<span class="sourceLineNo">043</span> b.findHtmlInfo(bpm.getSetter().getAnnotation(Html.class));<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span> this.asXml = b.asXml;<a name="line.45"></a>
+<span class="sourceLineNo">046</span> this.noTables = b.noTables;<a name="line.46"></a>
+<span class="sourceLineNo">047</span> this.noTableHeaders = b.noTableHeaders;<a name="line.47"></a>
+<span class="sourceLineNo">048</span> this.asPlainText = b.asPlainText;<a name="line.48"></a>
+<span class="sourceLineNo">049</span> this.render = bpm.getBeanMeta().getClassMeta().getBeanContext().newInstance(HtmlRender.class, b.render);<a name="line.49"></a>
+<span class="sourceLineNo">050</span> this.link = b.link;<a name="line.50"></a>
+<span class="sourceLineNo">051</span> this.anchorText = b.anchorText;<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> static final class Builder {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> boolean asXml, noTables, noTableHeaders, asPlainText;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> Class<? extends HtmlRender> render = HtmlRender.class;<a name="line.56"></a>
+<span class="sourceLineNo">057</span> String link, anchorText;<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span> void findHtmlInfo(Html html) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> if (html == null)<a name="line.60"></a>
+<span class="sourceLineNo">061</span> return;<a name="line.61"></a>
+<span class="sourceLineNo">062</span> if (html.asXml())<a name="line.62"></a>
+<span class="sourceLineNo">063</span> asXml = html.asXml();<a name="line.63"></a>
+<span class="sourceLineNo">064</span> if (html.noTables())<a name="line.64"></a>
+<span class="sourceLineNo">065</span> noTables = html.noTables();<a name="line.65"></a>
+<span class="sourceLineNo">066</span> if (html.noTableHeaders())<a name="line.66"></a>
+<span class="sourceLineNo">067</span> noTableHeaders = html.noTableHeaders();<a name="line.67"></a>
+<span class="sourceLineNo">068</span> if (html.asPlainText())<a name="line.68"></a>
+<span class="sourceLineNo">069</span> asPlainText = html.asPlainText();<a name="line.69"></a>
+<span class="sourceLineNo">070</span> if (html.render() != HtmlRender.class)<a name="line.70"></a>
+<span class="sourceLineNo">071</span> render = html.render();<a name="line.71"></a>
+<span class="sourceLineNo">072</span> if (! html.link().isEmpty())<a name="line.72"></a>
+<span class="sourceLineNo">073</span> link = html.link();<a name="line.73"></a>
+<span class="sourceLineNo">074</span> if (! html.anchorText().isEmpty())<a name="line.74"></a>
+<span class="sourceLineNo">075</span> anchorText = html.anchorText();<a name="line.75"></a>
+<span class="sourceLineNo">076</span> }<a name="line.76"></a>
+<span class="sourceLineNo">077</span> }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> /**<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * Returns whether this bean property should be serialized as XML instead of HTML.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> *<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * @return <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#asXml()} is <jk>true</jk>.<a name="line.82"></a>
+<span class="sourceLineNo">083</span> */<a name="line.83"></a>
+<span class="sourceLineNo">084</span> protected boolean isAsXml() {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> return asXml;<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> /**<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * Returns whether this bean property should be serialized as plain text instead of HTML.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> *<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * @return<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#asPlainText()} is<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <jk>true</jk>.<a name="line.93"></a>
+<span class="sourceLineNo">094</span> */<a name="line.94"></a>
+<span class="sourceLineNo">095</span> protected boolean isAsPlainText() {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> return asPlainText;<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 whether this bean property should not be serialized as an HTML table.<a name="line.100"></a>
+<span class="sourceLineNo">101</span> *<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * @return<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#noTables()} is<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * <jk>true</jk>.<a name="line.104"></a>
+<span class="sourceLineNo">105</span> */<a name="line.105"></a>
+<span class="sourceLineNo">106</span> protected boolean isNoTables() {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> return noTables;<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 whether this bean property should not include table headers when serialized as an HTML table.<a name="line.111"></a>
+<span class="sourceLineNo">112</span> *<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * @return<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#noTableHeaders()} is<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <jk>true</jk>.<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> public boolean isNoTableHeaders() {<a name="line.117"></a>
+<span class="sourceLineNo">118</span> return noTableHeaders;<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 render class for rendering the style and contents of this property value in HTML.<a name="line.122"></a>
+<span class="sourceLineNo">123</span> *<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * <p><a name="line.124"></a>
+<span class="sourceLineNo">125</span> * This value is specified via the {@link Html#render()} annotation.<a name="line.125"></a>
+<span class="sourceLineNo">126</span> *<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @return The render class, never <jk>null</jk>.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public HtmlRender getRender() {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> return render;<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> * Adds a hyperlink to this value in HTML.<a name="line.134"></a>
+<span class="sourceLineNo">135</span> *<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * <p><a name="line.136"></a>
+<span class="sourceLineNo">137</span> * This value is specified via the {@link Html#link()} annotation.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> *<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * @return The link string, or <jk>null</jk> if not specified.<a name="line.139"></a>
+<span class="sourceLineNo">140</span> */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public String getLink() {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> return link;<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> * Specifies the anchor text for this property.<a name="line.146"></a>
+<span class="sourceLineNo">147</span> *<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <p><a name="line.148"></a>
+<span class="sourceLineNo">149</span> * This value is specified via the {@link Html#anchorText()} annotation.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> *<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @return The link string, or <jk>null</jk> if not specified.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> */<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public String getAnchorText() {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return anchorText;<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>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/src-html/org/apache/juneau/html/HtmlClassMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlClassMeta.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlClassMeta.html
index 006ab0e..95f78ff 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlClassMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlClassMeta.html
@@ -47,7 +47,7 @@
<span class="sourceLineNo">039</span> noTables = html.noTables();<a name="line.39"></a>
<span class="sourceLineNo">040</span> noTableHeaders = html.noTableHeaders();<a name="line.40"></a>
<span class="sourceLineNo">041</span> asPlainText = html.asPlainText();<a name="line.41"></a>
-<span class="sourceLineNo">042</span> render = ClassUtils.newInstance(HtmlRender.class, html.render());<a name="line.42"></a>
+<span class="sourceLineNo">042</span> render = cm.getBeanContext().newInstance(HtmlRender.class, html.render());<a name="line.42"></a>
<span class="sourceLineNo">043</span> } else {<a name="line.43"></a>
<span class="sourceLineNo">044</span> asXml = false;<a name="line.44"></a>
<span class="sourceLineNo">045</span> noTables = false;<a name="line.45"></a>