You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/09/02 17:21:33 UTC
[01/19] incubator-juneau-website git commit: Update javadocs.
Repository: incubator-juneau-website
Updated Branches:
refs/heads/asf-site 11de74845 -> 4cba2c2cd
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolver.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolver.html b/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolver.html
index e8b422e..7506193 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolver.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolver.html
@@ -24,192 +24,191 @@
<span class="sourceLineNo">016</span>import java.io.*;<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.ini.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.svl.vars.*;<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> * Utility class for resolving variables of the form <js>"$X{key}"</js> in strings.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> *<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Variables are of the form <code>$X{key}</code>, where <code>X</code> can consist of zero or more ASCII characters.<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * <br>The variable key can contain anything, even nested variables that get recursively resolved.<a name="line.27"></a>
-<span class="sourceLineNo">028</span> *<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <p><a name="line.29"></a>
-<span class="sourceLineNo">030</span> * Variables are defined through the {@link VarResolverBuilder#vars(Class[])} method.<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <p><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * The {@link Var} interface defines how variables are converted to values.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <h5 class='section'>Example:</h5><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <p class='bcode'><a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <jk>public class</jk> SystemPropertiesVar <jk>extends</jk> SimpleVar {<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <jc>// Must have a no-arg constructor!</jc><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <jk>public</jk> SystemPropertiesVar() {<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <jk>super</jk>(<js>"S"</js>);<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> * <ja>@Override</ja><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <jk>public</jk> String resolve(VarResolverSession session, String varVal) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <jk>return</jk> System.<jsm>getProperty</jsm>(varVal);<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * }<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * }<a name="line.48"></a>
-<span class="sourceLineNo">049</span> *<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * <jc>// Create a variable resolver that resolves system properties (e.g. "$S{java.home}")</jc><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * VarResolver r = <jk>new</jk> VarResolver().addVars(SystemPropertiesVar.<js>class</js>);<a name="line.51"></a>
-<span class="sourceLineNo">052</span> *<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <jc>// Use it!</jc><a name="line.53"></a>
-<span class="sourceLineNo">054</span> * System.<jsf>out</jsf>.println(r.resolve(<js>"java.home is set to $S{java.home}"</js>));<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * </p><a name="line.55"></a>
-<span class="sourceLineNo">056</span> *<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <h6 class='topic'>Context objects</h6><a name="line.57"></a>
-<span class="sourceLineNo">058</span> *<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * Var resolvers can have zero or more context objects associated with them.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> *<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * <p><a name="line.61"></a>
-<span class="sourceLineNo">062</span> * Context objects are arbitrary objects associated with this var resolver, such as a {@link ConfigFile} object.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * They can be any class type.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> *<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * <p><a name="line.65"></a>
-<span class="sourceLineNo">066</span> * Context objects can be retrieved by {@link Var} classes through the<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * {@link VarResolverSession#getSessionObject(Class, String)} method.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> *<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * <h6 class='topic'>Session objects</h6><a name="line.69"></a>
-<span class="sourceLineNo">070</span> *<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * Session objects are considered more ephemeral than context objects.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * While a context object is unlikely to ever change, a session object may change on every use of the var resolver.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * For example, the server API defines various <code>Var</code> objects that use the <code>RestRequest</code><a name="line.73"></a>
-<span class="sourceLineNo">074</span> * object as a session object for the duration of a single HTTP request.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> *<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * <p><a name="line.76"></a>
-<span class="sourceLineNo">077</span> * Session objects are used by calling the {@link #createSession()} or {@link #createSession(Map)} methods to create<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * an instance of a {@link VarResolverSession} object that contains {@link VarResolverSession#resolve(String)}<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * and {@link VarResolverSession#resolveTo(String,Writer)} methods that are identical to<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * {@link VarResolver#resolve(String)} and {@link VarResolver#resolveTo(String, Writer)} except that the<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * <code>Var</code> objects have access to the session objects through the<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * {@link VarResolverSession#getSessionObject(Class, String)} method.<a name="line.82"></a>
-<span class="sourceLineNo">083</span> *<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * <p><a name="line.84"></a>
-<span class="sourceLineNo">085</span> * Session objects are specified through either the {@link #createSession(Map)} method or the<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * {@link VarResolverSession#sessionObject(String, Object)} methods.<a name="line.86"></a>
-<span class="sourceLineNo">087</span> *<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * <h6 class='topic'>Cloning</h6><a name="line.88"></a>
-<span class="sourceLineNo">089</span> *<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * Var resolvers can be cloned by using the {@link #builder()} method.<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * Cloning a resolver will copy it's {@link Var} class names and context objects.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> *<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * <h5 class='section'>Example:</h5><a name="line.93"></a>
-<span class="sourceLineNo">094</span> * <p class='bcode'><a name="line.94"></a>
-<span class="sourceLineNo">095</span> * <jc>// Create a resolver that copies the default resolver and adds $C and $ARG vars.</jc><a name="line.95"></a>
-<span class="sourceLineNo">096</span> * VarResolver myVarResolver = VarResolver.<jsf>DEFAULT</jsf>.builder().vars(ConfigVar.<jk>class</jk>,<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * ArgsVar.<jk>class</jk>).build();<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * </p><a name="line.98"></a>
-<span class="sourceLineNo">099</span> *<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @see org.apache.juneau.svl<a name="line.100"></a>
-<span class="sourceLineNo">101</span> */<a name="line.101"></a>
-<span class="sourceLineNo">102</span>public class VarResolver {<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> * Default string variable resolver with support for system properties and environment variables:<a name="line.105"></a>
-<span class="sourceLineNo">106</span> *<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * <ul><a name="line.107"></a>
-<span class="sourceLineNo">108</span> * <li><code>$S{key}</code>,<code>$S{key,default}</code> - System properties.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * <li><code>$E{key}</code>,<code>$E{key,default}</code> - Environment variables.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * <li><code>$IF{booleanValue,thenValue[,elseValue]}</code> - If-else patterns.<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * <li><code>$SW{test,matchPattern,thenValue[,matchPattern,thenValue][,elseValue]}</code> - Switch patterns.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * </ul><a name="line.112"></a>
-<span class="sourceLineNo">113</span> *<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * @see SystemPropertiesVar<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * @see EnvVariablesVar<a name="line.115"></a>
-<span class="sourceLineNo">116</span> */<a name="line.116"></a>
-<span class="sourceLineNo">117</span> public static final VarResolver DEFAULT = new VarResolverBuilder().defaultVars().build();<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> final VarResolverContext ctx;<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> * Constructor.<a name="line.122"></a>
-<span class="sourceLineNo">123</span> *<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @param vars The var classes<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * @param contextObjects<a name="line.125"></a>
-<span class="sourceLineNo">126</span> */<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public VarResolver(Class<? extends Var>[] vars, Map<String,Object> contextObjects) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> this.ctx = new VarResolverContext(vars, contextObjects);<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> * Returns a new builder object using the settings in this resolver as a base.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> *<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * @return A new var resolver builder.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> */<a name="line.135"></a>
-<span class="sourceLineNo">136</span> public VarResolverBuilder builder() {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return new VarResolverBuilder()<a name="line.137"></a>
-<span class="sourceLineNo">138</span> .vars(ctx.getVars())<a name="line.138"></a>
-<span class="sourceLineNo">139</span> .contextObjects(ctx.getContextObjects());<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 read-only properties on this variable resolver.<a name="line.143"></a>
-<span class="sourceLineNo">144</span> *<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * @return The read-only properties on this variable resolver.<a name="line.145"></a>
-<span class="sourceLineNo">146</span> */<a name="line.146"></a>
-<span class="sourceLineNo">147</span> public VarResolverContext getContext() {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> return ctx;<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> * Creates a new resolver session with no session objects.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> *<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * <p><a name="line.154"></a>
-<span class="sourceLineNo">155</span> * Session objects can be associated with the specified session using the {@link VarResolverSession#sessionObject(String, Object)}<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * method.<a name="line.156"></a>
-<span class="sourceLineNo">157</span> *<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * @return A new resolver session.<a name="line.158"></a>
-<span class="sourceLineNo">159</span> */<a name="line.159"></a>
-<span class="sourceLineNo">160</span> public VarResolverSession createSession() {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> return new VarResolverSession(ctx, null);<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> * Same as {@link #createSession()} except allows you to specify session objects as a map.<a name="line.165"></a>
-<span class="sourceLineNo">166</span> *<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * @param sessionObjects The session objects to associate with the session.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * @return A new resolver session.<a name="line.168"></a>
-<span class="sourceLineNo">169</span> */<a name="line.169"></a>
-<span class="sourceLineNo">170</span> public VarResolverSession createSession(Map<String,Object> sessionObjects) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> return new VarResolverSession(ctx, sessionObjects);<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> * Resolve variables in the specified string.<a name="line.175"></a>
-<span class="sourceLineNo">176</span> *<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * <p><a name="line.177"></a>
-<span class="sourceLineNo">178</span> * This is a shortcut for calling <code>createSession(<jk>null</jk>).resolve(s);</code>.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * This method can only be used if the string doesn't contain variables that rely on the existence of session<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * variables.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> *<a name="line.181"></a>
-<span class="sourceLineNo">182</span> * @param s The input string.<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * @return The string with variables resolved, or the same string if it doesn't contain any variables to resolve.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> */<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public String resolve(String s) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> return createSession(null).resolve(s);<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> * Resolve variables in the specified string and sends the results to the specified writer.<a name="line.190"></a>
-<span class="sourceLineNo">191</span> *<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * <p><a name="line.192"></a>
-<span class="sourceLineNo">193</span> * This is a shortcut for calling <code>createSession(<jk>null</jk>).resolveTo(s, w);</code>.<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * This method can only be used if the string doesn't contain variables that rely on the existence of session<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * variables.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> *<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * @param s The input string.<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * @param w The writer to send the result to.<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * @throws IOException<a name="line.199"></a>
-<span class="sourceLineNo">200</span> */<a name="line.200"></a>
-<span class="sourceLineNo">201</span> public void resolveTo(String s, Writer w) throws IOException {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> createSession(null).resolveTo(s, w);<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">019</span>import org.apache.juneau.svl.vars.*;<a name="line.19"></a>
+<span class="sourceLineNo">020</span><a name="line.20"></a>
+<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * Utility class for resolving variables of the form <js>"$X{key}"</js> in strings.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> *<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * <p><a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Variables are of the form <code>$X{key}</code>, where <code>X</code> can consist of zero or more ASCII characters.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <br>The variable key can contain anything, even nested variables that get recursively resolved.<a name="line.26"></a>
+<span class="sourceLineNo">027</span> *<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <p><a name="line.28"></a>
+<span class="sourceLineNo">029</span> * Variables are defined through the {@link VarResolverBuilder#vars(Class[])} method.<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <p><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * The {@link Var} interface defines how variables are converted to values.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> *<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * <h5 class='section'>Example:</h5><a name="line.34"></a>
+<span class="sourceLineNo">035</span> * <p class='bcode'><a name="line.35"></a>
+<span class="sourceLineNo">036</span> * <jk>public class</jk> SystemPropertiesVar <jk>extends</jk> SimpleVar {<a name="line.36"></a>
+<span class="sourceLineNo">037</span> *<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <jc>// Must have a no-arg constructor!</jc><a name="line.38"></a>
+<span class="sourceLineNo">039</span> * <jk>public</jk> SystemPropertiesVar() {<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <jk>super</jk>(<js>"S"</js>);<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> * <ja>@Override</ja><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <jk>public</jk> String resolve(VarResolverSession session, String varVal) {<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <jk>return</jk> System.<jsm>getProperty</jsm>(varVal);<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * }<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * }<a name="line.47"></a>
+<span class="sourceLineNo">048</span> *<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * <jc>// Create a variable resolver that resolves system properties (e.g. "$S{java.home}")</jc><a name="line.49"></a>
+<span class="sourceLineNo">050</span> * VarResolver r = <jk>new</jk> VarResolver().addVars(SystemPropertiesVar.<js>class</js>);<a name="line.50"></a>
+<span class="sourceLineNo">051</span> *<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * <jc>// Use it!</jc><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * System.<jsf>out</jsf>.println(r.resolve(<js>"java.home is set to $S{java.home}"</js>));<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * </p><a name="line.54"></a>
+<span class="sourceLineNo">055</span> *<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <h6 class='topic'>Context objects</h6><a name="line.56"></a>
+<span class="sourceLineNo">057</span> *<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * Var resolvers can have zero or more context objects associated with them.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> *<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * <p><a name="line.60"></a>
+<span class="sourceLineNo">061</span> * Context objects are arbitrary objects associated with this var resolver, such as a <code>ConfigFile</code> object.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * They can be any class type.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> *<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * <p><a name="line.64"></a>
+<span class="sourceLineNo">065</span> * Context objects can be retrieved by {@link Var} classes through the<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * {@link VarResolverSession#getSessionObject(Class, String)} method.<a name="line.66"></a>
+<span class="sourceLineNo">067</span> *<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <h6 class='topic'>Session objects</h6><a name="line.68"></a>
+<span class="sourceLineNo">069</span> *<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * Session objects are considered more ephemeral than context objects.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * While a context object is unlikely to ever change, a session object may change on every use of the var resolver.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * For example, the server API defines various <code>Var</code> objects that use the <code>RestRequest</code><a name="line.72"></a>
+<span class="sourceLineNo">073</span> * object as a session object for the duration of a single HTTP request.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> *<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * <p><a name="line.75"></a>
+<span class="sourceLineNo">076</span> * Session objects are used by calling the {@link #createSession()} or {@link #createSession(Map)} methods to create<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * an instance of a {@link VarResolverSession} object that contains {@link VarResolverSession#resolve(String)}<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * and {@link VarResolverSession#resolveTo(String,Writer)} methods that are identical to<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * {@link VarResolver#resolve(String)} and {@link VarResolver#resolveTo(String, Writer)} except that the<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * <code>Var</code> objects have access to the session objects through the<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * {@link VarResolverSession#getSessionObject(Class, String)} method.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> *<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * <p><a name="line.83"></a>
+<span class="sourceLineNo">084</span> * Session objects are specified through either the {@link #createSession(Map)} method or the<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * {@link VarResolverSession#sessionObject(String, Object)} methods.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> *<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * <h6 class='topic'>Cloning</h6><a name="line.87"></a>
+<span class="sourceLineNo">088</span> *<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * Var resolvers can be cloned by using the {@link #builder()} method.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * Cloning a resolver will copy it's {@link Var} class names and context objects.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> *<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <h5 class='section'>Example:</h5><a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <p class='bcode'><a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <jc>// Create a resolver that copies the default resolver and adds $C and $ARG vars.</jc><a name="line.94"></a>
+<span class="sourceLineNo">095</span> * VarResolver myVarResolver = VarResolver.<jsf>DEFAULT</jsf>.builder().vars(ConfigVar.<jk>class</jk>,<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * ArgsVar.<jk>class</jk>).build();<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * </p><a name="line.97"></a>
+<span class="sourceLineNo">098</span> *<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * @see org.apache.juneau.svl<a name="line.99"></a>
+<span class="sourceLineNo">100</span> */<a name="line.100"></a>
+<span class="sourceLineNo">101</span>public class VarResolver {<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> * Default string variable resolver with support for system properties and environment variables:<a name="line.104"></a>
+<span class="sourceLineNo">105</span> *<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * <ul><a name="line.106"></a>
+<span class="sourceLineNo">107</span> * <li><code>$S{key}</code>,<code>$S{key,default}</code> - System properties.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * <li><code>$E{key}</code>,<code>$E{key,default}</code> - Environment variables.<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <li><code>$IF{booleanValue,thenValue[,elseValue]}</code> - If-else patterns.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * <li><code>$SW{test,matchPattern,thenValue[,matchPattern,thenValue][,elseValue]}</code> - Switch patterns.<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * </ul><a name="line.111"></a>
+<span class="sourceLineNo">112</span> *<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * @see SystemPropertiesVar<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * @see EnvVariablesVar<a name="line.114"></a>
+<span class="sourceLineNo">115</span> */<a name="line.115"></a>
+<span class="sourceLineNo">116</span> public static final VarResolver DEFAULT = new VarResolverBuilder().defaultVars().build();<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> final VarResolverContext ctx;<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> * Constructor.<a name="line.121"></a>
+<span class="sourceLineNo">122</span> *<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * @param vars The var classes<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * @param contextObjects<a name="line.124"></a>
+<span class="sourceLineNo">125</span> */<a name="line.125"></a>
+<span class="sourceLineNo">126</span> public VarResolver(Class<? extends Var>[] vars, Map<String,Object> contextObjects) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> this.ctx = new VarResolverContext(vars, contextObjects);<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 a new builder object using the settings in this resolver as a base.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> *<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * @return A new var resolver builder.<a name="line.133"></a>
+<span class="sourceLineNo">134</span> */<a name="line.134"></a>
+<span class="sourceLineNo">135</span> public VarResolverBuilder builder() {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> return new VarResolverBuilder()<a name="line.136"></a>
+<span class="sourceLineNo">137</span> .vars(ctx.getVars())<a name="line.137"></a>
+<span class="sourceLineNo">138</span> .contextObjects(ctx.getContextObjects());<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> /**<a name="line.141"></a>
+<span class="sourceLineNo">142</span> * Returns the read-only properties on this variable resolver.<a name="line.142"></a>
+<span class="sourceLineNo">143</span> *<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * @return The read-only properties on this variable resolver.<a name="line.144"></a>
+<span class="sourceLineNo">145</span> */<a name="line.145"></a>
+<span class="sourceLineNo">146</span> public VarResolverContext getContext() {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> return ctx;<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> * Creates a new resolver session with no session objects.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> *<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * <p><a name="line.153"></a>
+<span class="sourceLineNo">154</span> * Session objects can be associated with the specified session using the {@link VarResolverSession#sessionObject(String, Object)}<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * method.<a name="line.155"></a>
+<span class="sourceLineNo">156</span> *<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * @return A new resolver session.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> */<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public VarResolverSession createSession() {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> return new VarResolverSession(ctx, null);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> /**<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * Same as {@link #createSession()} except allows you to specify session objects as a map.<a name="line.164"></a>
+<span class="sourceLineNo">165</span> *<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @param sessionObjects The session objects to associate with the session.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * @return A new resolver session.<a name="line.167"></a>
+<span class="sourceLineNo">168</span> */<a name="line.168"></a>
+<span class="sourceLineNo">169</span> public VarResolverSession createSession(Map<String,Object> sessionObjects) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> return new VarResolverSession(ctx, sessionObjects);<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> * Resolve variables in the specified string.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> *<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * <p><a name="line.176"></a>
+<span class="sourceLineNo">177</span> * This is a shortcut for calling <code>createSession(<jk>null</jk>).resolve(s);</code>.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * This method can only be used if the string doesn't contain variables that rely on the existence of session<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * variables.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> *<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * @param s The input string.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * @return The string with variables resolved, or the same string if it doesn't contain any variables to resolve.<a name="line.182"></a>
+<span class="sourceLineNo">183</span> */<a name="line.183"></a>
+<span class="sourceLineNo">184</span> public String resolve(String s) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> return createSession(null).resolve(s);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> /**<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * Resolve variables in the specified string and sends the results to the specified writer.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> *<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * <p><a name="line.191"></a>
+<span class="sourceLineNo">192</span> * This is a shortcut for calling <code>createSession(<jk>null</jk>).resolveTo(s, w);</code>.<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * This method can only be used if the string doesn't contain variables that rely on the existence of session<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * variables.<a name="line.194"></a>
+<span class="sourceLineNo">195</span> *<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * @param s The input string.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * @param w The writer to send the result to.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * @throws IOException<a name="line.198"></a>
+<span class="sourceLineNo">199</span> */<a name="line.199"></a>
+<span class="sourceLineNo">200</span> public void resolveTo(String s, Writer w) throws IOException {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> createSession(null).resolveTo(s, w);<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html
deleted file mode 100644
index 9c24f7a..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../../javadoc.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
-<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *<a name="line.2"></a>
-<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *<a name="line.3"></a>
-<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *<a name="line.4"></a>
-<span class="sourceLineNo">005</span>// * with the License. You may obtain a copy of the License at *<a name="line.5"></a>
-<span class="sourceLineNo">006</span>// * *<a name="line.6"></a>
-<span class="sourceLineNo">007</span>// * http://www.apache.org/licenses/LICENSE-2.0 *<a name="line.7"></a>
-<span class="sourceLineNo">008</span>// * *<a name="line.8"></a>
-<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *<a name="line.9"></a>
-<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *<a name="line.10"></a>
-<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License. *<a name="line.11"></a>
-<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
-<span class="sourceLineNo">013</span>package org.apache.juneau.svl.vars;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import org.apache.juneau.ini.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import org.apache.juneau.svl.*;<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> * Config file variable resolver.<a name="line.19"></a>
-<span class="sourceLineNo">020</span> *<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * <p><a name="line.21"></a>
-<span class="sourceLineNo">022</span> * The format for this var is <js>"$C{key[,defaultValue]}"</js>.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * See {@link ConfigFile#getString(String)} for the format of the key.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> *<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
-<span class="sourceLineNo">026</span> * This variable resolver requires that a {@link ConfigFile} object be set as a context object on the resolver or a<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * session object on the resolver session.<a name="line.27"></a>
-<span class="sourceLineNo">028</span> *<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <h5 class='section'>Example:</h5><a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <p class='bcode'><a name="line.30"></a>
-<span class="sourceLineNo">031</span> * <jc>// Create a config file object.</jc><a name="line.31"></a>
-<span class="sourceLineNo">032</span> * ConfigFile configFile = new ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>);<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <jc>// Create a variable resolver that resolves config file entries (e.g. "$C{MySection/myKey}")</jc><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * VarResolver r = <jk>new</jk> VarResolver().addVars(ConfigVar.<js>class</js>)<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * .addContextObject(<jsf>SESSION_config</jsf>, configFile);<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <jc>// Use it!</jc><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * System.<jsf>out</jsf>.println(r.resolve(<js>"Value for myKey in section MySection is $C{MySection/myKey}"</js>));<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * </p><a name="line.40"></a>
-<span class="sourceLineNo">041</span> *<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <p><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> *<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * @see org.apache.juneau.ini.ConfigFile<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * @see org.apache.juneau.svl<a name="line.47"></a>
-<span class="sourceLineNo">048</span> */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>public class ConfigFileVar extends DefaultingVar {<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 name of the session or context object that identifies the {@link ConfigFile} object.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span> public static final String SESSION_config = "config";<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> /** The name of this variable. */<a name="line.56"></a>
-<span class="sourceLineNo">057</span> public static final String NAME = "C";<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> * Constructor.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public ConfigFileVar() {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> super(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> @Override /* Var */<a name="line.66"></a>
-<span class="sourceLineNo">067</span> public String resolve(VarResolverSession session, String key) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> return session.getSessionObject(ConfigFile.class, SESSION_config).getString(key);<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>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/utils/PojoMerge.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/utils/PojoMerge.html b/content/site/apidocs/src-html/org/apache/juneau/utils/PojoMerge.html
new file mode 100644
index 0000000..76d7df0
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/utils/PojoMerge.html
@@ -0,0 +1,214 @@
+<!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.utils;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import java.lang.reflect.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span><a name="line.16"></a>
+<span class="sourceLineNo">017</span>/**<a name="line.17"></a>
+<span class="sourceLineNo">018</span> * Utility class for merging POJOs behind a single interface.<a name="line.18"></a>
+<span class="sourceLineNo">019</span> *<a name="line.19"></a>
+<span class="sourceLineNo">020</span> * <p><a name="line.20"></a>
+<span class="sourceLineNo">021</span> * Useful in cases where you want to define beans with 'default' values.<a name="line.21"></a>
+<span class="sourceLineNo">022</span> *<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * <p><a name="line.23"></a>
+<span class="sourceLineNo">024</span> * For example, given the following bean classes...<a name="line.24"></a>
+<span class="sourceLineNo">025</span> *<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <p class='bcode'><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * <jk>public interface</jk> IA {<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * String getX();<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * <jk>void</jk> setX(String x);<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> * <jk>public class</jk> A <jk>implements</jk> IA {<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <jk>private</jk> String <jf>x</jf>;<a name="line.33"></a>
+<span class="sourceLineNo">034</span> *<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * <jk>public</jk> A(String x) {<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * <jk>this</jk>.<jf>x</jf> = x;<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> * <jk>public</jk> String getX() {<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <jk>return</jk> <jf>x</jf>;<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> * <jk>public void</jk> setX(String x) {<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <jk>this</jk>.<jf>x</jf> = x;<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> * </p><a name="line.47"></a>
+<span class="sourceLineNo">048</span> *<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
+<span class="sourceLineNo">050</span> * The getters will be called in order until the first non-null value is returned...<a name="line.50"></a>
+<span class="sourceLineNo">051</span> *<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * <p class='bcode'><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * PojoMerge m;<a name="line.53"></a>
+<span class="sourceLineNo">054</span> *<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * m = PojoMerge.<jsm>merge</jsm>(IA.<jk>class</jk>, <jk>new</jk> A(<js>"1"</js>), <jk>new</jk> A(<js>"2"</js>));<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <jsm>assertEquals</jsm>(<js>"1"</js>, m.getX());<a name="line.56"></a>
+<span class="sourceLineNo">057</span> *<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * m = PojoMerge.<jsm>merge</jsm>(IA.<jk>class</jk>, <jk>new</jk> A(<jk>null</jk>), <jk>new</jk> A(<js>"2"</js>));<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <jsm>assertEquals</jsm>(<js>"2"</js>, m.getX());<a name="line.59"></a>
+<span class="sourceLineNo">060</span> *<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * m = PojoMerge.<jsm>merge</jsm>(IA.<jk>class</jk>, <jk>new</jk> A(<jk>null</jk>), <jk>new</jk> A(<jk>null</jk>));<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * <jsm>assertEquals</jsm>(<jk>null</jk>, m.getX());<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * </p><a name="line.63"></a>
+<span class="sourceLineNo">064</span> *<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * <h5 class='section'>Notes:</h5><a name="line.65"></a>
+<span class="sourceLineNo">066</span> * <ul><a name="line.66"></a>
+<span class="sourceLineNo">067</span> * <li>Null POJOs are ignored.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <li>Non-getter methods are either invoked on the first POJO or all POJOs depending on the <code>callAllNonGetters</code> flag<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * passed into the constructor.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * <li>For purposes of this interface, a getter is any method with zero arguments and a non-<code>void</code> return type.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * </ul><a name="line.71"></a>
+<span class="sourceLineNo">072</span> */<a name="line.72"></a>
+<span class="sourceLineNo">073</span>public class PojoMerge {<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> * Create a proxy interface on top of zero or more POJOs.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> *<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <p><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * This is a shortcut to calling <code>merge(interfaceClass, <jk>false</jk>, pojos);</code><a name="line.79"></a>
+<span class="sourceLineNo">080</span> *<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * @param interfaceClass The common interface class.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * @param pojos<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * Zero or more POJOs to merge.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * <br>Can contain nulls.<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * @return A proxy interface over the merged POJOs.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> */<a name="line.86"></a>
+<span class="sourceLineNo">087</span> public static <T> T merge(Class<T> interfaceClass, T...pojos) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> return merge(interfaceClass, false, pojos);<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> * Create a proxy interface on top of zero or more POJOs.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> *<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * @param interfaceClass The common interface class.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * @param callAllNonGetters<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * If <jk>true</jk>, when calling a method that's not a getter, the method will be invoked on all POJOs.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * <br>Otherwise, the method will only be called on the first POJO.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * @param pojos<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * Zero or more POJOs to merge.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * <br>Can contain nulls.<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * @return A proxy interface over the merged POJOs.<a name="line.101"></a>
+<span class="sourceLineNo">102</span> */<a name="line.102"></a>
+<span class="sourceLineNo">103</span> @SuppressWarnings("unchecked")<a name="line.103"></a>
+<span class="sourceLineNo">104</span> public static <T> T merge(Class<T> interfaceClass, boolean callAllNonGetters, T...pojos) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> return (T)Proxy.newProxyInstance(interfaceClass.getClassLoader(), new Class[] { interfaceClass }, new PojoMergeInvocationHandler(callAllNonGetters, pojos));<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> private static class PojoMergeInvocationHandler implements InvocationHandler {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> private final Object[] pojos;<a name="line.109"></a>
+<span class="sourceLineNo">110</span> private final boolean callAllNonGetters;<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> public PojoMergeInvocationHandler(boolean callAllNonGetters, Object...pojos) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> this.callAllNonGetters = callAllNonGetters;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> this.pojos = pojos;<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> * Implemented to handle the method called.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * @throws InvocationTargetException<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * @throws IllegalAccessException<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @throws IllegalArgumentException<a name="line.121"></a>
+<span class="sourceLineNo">122</span> */<a name="line.122"></a>
+<span class="sourceLineNo">123</span> @Override /* InvocationHandler */<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public Object invoke(Object proxy, Method method, Object[] args) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> Object r = null;<a name="line.125"></a>
+<span class="sourceLineNo">126</span> boolean isGetter = args == null && method.getReturnType() != Void.class;<a name="line.126"></a>
+<span class="sourceLineNo">127</span> for (Object pojo : pojos) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> if (pojo != null) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> r = method.invoke(pojo, args);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> if (isGetter) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> if (r != null)<a name="line.131"></a>
+<span class="sourceLineNo">132</span> return r;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> } else {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> if (! callAllNonGetters)<a name="line.134"></a>
+<span class="sourceLineNo">135</span> return r;<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> return r;<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>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/stylesheet.css
----------------------------------------------------------------------
diff --git a/content/site/apidocs/stylesheet.css b/content/site/apidocs/stylesheet.css
new file mode 100644
index 0000000..98055b2
--- /dev/null
+++ b/content/site/apidocs/stylesheet.css
@@ -0,0 +1,574 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+ background-color:#ffffff;
+ color:#353833;
+ font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+ font-size:14px;
+ margin:0;
+}
+a:link, a:visited {
+ text-decoration:none;
+ color:#4A6782;
+}
+a:hover, a:focus {
+ text-decoration:none;
+ color:#bb7a2a;
+}
+a:active {
+ text-decoration:none;
+ color:#4A6782;
+}
+a[name] {
+ color:#353833;
+}
+a[name]:hover {
+ text-decoration:none;
+ color:#353833;
+}
+pre {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+}
+h1 {
+ font-size:20px;
+}
+h2 {
+ font-size:18px;
+}
+h3 {
+ font-size:16px;
+ font-style:italic;
+}
+h4 {
+ font-size:13px;
+}
+h5 {
+ font-size:12px;
+}
+h6 {
+ font-size:11px;
+}
+ul {
+ list-style-type:disc;
+}
+code, tt {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+ padding-top:4px;
+ margin-top:8px;
+ line-height:1.4em;
+}
+dt code {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+ padding-top:4px;
+}
+table tr td dt code {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+ vertical-align:top;
+ padding-top:4px;
+}
+sup {
+ font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+ clear:both;
+ height:0px;
+ overflow:hidden;
+}
+.aboutLanguage {
+ float:right;
+ padding:0px 21px;
+ font-size:11px;
+ z-index:200;
+ margin-top:-9px;
+}
+.legalCopy {
+ margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+ color:#FFFFFF;
+ text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+ color:#bb7a2a;
+}
+.tab {
+ background-color:#0066FF;
+ color:#ffffff;
+ padding:8px;
+ width:5em;
+ font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+ background-color:#4D7A97;
+ color:#FFFFFF;
+ padding:.8em .5em .4em .8em;
+ height:auto;/*height:1.8em;*/
+ font-size:11px;
+ margin:0;
+}
+.topNav {
+ background-color:#4D7A97;
+ color:#FFFFFF;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+ font-size:12px;
+}
+.bottomNav {
+ margin-top:10px;
+ background-color:#4D7A97;
+ color:#FFFFFF;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+ font-size:12px;
+}
+.subNav {
+ background-color:#dee3e9;
+ float:left;
+ width:100%;
+ overflow:hidden;
+ font-size:12px;
+}
+.subNav div {
+ clear:left;
+ float:left;
+ padding:0 0 5px 6px;
+ text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+ float:left;
+ margin:0 25px 0 0;
+ padding:0;
+}
+ul.navList li{
+ list-style:none;
+ float:left;
+ padding: 5px 6px;
+ text-transform:uppercase;
+}
+ul.subNavList li{
+ list-style:none;
+ float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+ color:#FFFFFF;
+ text-decoration:none;
+ text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+ text-decoration:none;
+ color:#bb7a2a;
+ text-transform:uppercase;
+}
+.navBarCell1Rev {
+ background-color:#F8981D;
+ color:#253441;
+ margin: auto 5px;
+}
+.skipNav {
+ position:absolute;
+ top:auto;
+ left:-9999px;
+ overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+ clear:both;
+ margin:0 20px;
+ padding:5px 0 0 0;
+}
+.indexHeader {
+ margin:10px;
+ position:relative;
+}
+.indexHeader span{
+ margin-right:15px;
+}
+.indexHeader h1 {
+ font-size:13px;
+}
+.title {
+ color:#2c4557;
+ margin:10px 0;
+}
+.subTitle {
+ margin:5px 0 0 0;
+}
+.header ul {
+ margin:0 0 15px 0;
+ padding:0;
+}
+.footer ul {
+ margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+ list-style:none;
+ font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+ background-color:#dee3e9;
+ border:1px solid #d0d9e0;
+ margin:0 0 6px -8px;
+ padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+ background-color:#dee3e9;
+ border:1px solid #d0d9e0;
+ margin:0 0 6px -8px;
+ padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+ padding:0;
+ margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+ padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+ clear:both;
+ padding:10px 20px;
+ position:relative;
+}
+.indexContainer {
+ margin:10px;
+ position:relative;
+ font-size:12px;
+}
+.indexContainer h2 {
+ font-size:13px;
+ padding:0 0 3px 0;
+}
+.indexContainer ul {
+ margin:0;
+ padding:0;
+}
+.indexContainer ul li {
+ list-style:none;
+ padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+ font-size:12px;
+ font-weight:bold;
+ margin:10px 0 0 0;
+ color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+ margin:5px 0 10px 0px;
+ font-size:14px;
+ font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+ margin-left:1px;
+ font-size:1.1em;
+ display:inline;
+ font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+ margin:0 0 0 1px;
+ font-size:1.1em;
+ display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+ display:inline;
+ font-size:0.9em;
+}
+ul.inheritance {
+ margin:0;
+ padding:0;
+}
+ul.inheritance li {
+ display:inline;
+ list-style:none;
+}
+ul.inheritance li ul.inheritance {
+ margin-left:15px;
+ padding-left:15px;
+ padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+ margin:10px 0 10px 0;
+ padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+ list-style:none;
+ margin-bottom:15px;
+ line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+ padding:0px 20px 5px 10px;
+ border:1px solid #ededed;
+ background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+ padding:0 0 5px 8px;
+ background-color:#ffffff;
+ border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+ margin-left:0;
+ padding-left:0;
+ padding-bottom:15px;
+ border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+ list-style:none;
+ border-bottom:none;
+ padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+ margin-top:0;
+ margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+ width:100%;
+ border-left:1px solid #EEE;
+ border-right:1px solid #EEE;
+ border-bottom:1px solid #EEE;
+}
+.overviewSummary, .memberSummary {
+ padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+ position:relative;
+ text-align:left;
+ background-repeat:no-repeat;
+ color:#253441;
+ font-weight:bold;
+ clear:none;
+ overflow:hidden;
+ padding:0px;
+ padding-top:10px;
+ padding-left:1px;
+ margin:0px;
+ white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+ color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+ white-space:nowrap;
+ padding-top:5px;
+ padding-left:12px;
+ padding-right:12px;
+ padding-bottom:7px;
+ display:inline-block;
+ float:left;
+ background-color:#F8981D;
+ border: none;
+ height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+ white-space:nowrap;
+ padding-top:5px;
+ padding-left:12px;
+ padding-right:12px;
+ margin-right:3px;
+ display:inline-block;
+ float:left;
+ background-color:#F8981D;
+ height:16px;
+}
+.memberSummary caption span.tableTab span {
+ white-space:nowrap;
+ padding-top:5px;
+ padding-left:12px;
+ padding-right:12px;
+ margin-right:3px;
+ display:inline-block;
+ float:left;
+ background-color:#4D7A97;
+ height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+ padding-top:0px;
+ padding-left:0px;
+ padding-right:0px;
+ background-image:none;
+ float:none;
+ display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+ display:none;
+ width:5px;
+ position:relative;
+ float:left;
+ background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+ display:none;
+ width:5px;
+ margin-right:3px;
+ position:relative;
+ float:left;
+ background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+ display:none;
+ width:5px;
+ margin-right:3px;
+ position:relative;
+ background-color:#4D7A97;
+ float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+ text-align:left;
+ padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+ vertical-align:top;
+ padding-right:0px;
+ padding-top:8px;
+ padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+ background:#dee3e9;
+ text-align:left;
+ padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+ white-space:nowrap;
+ font-size:13px;
+}
+td.colLast, th.colLast {
+ font-size:13px;
+}
+td.colOne, th.colOne {
+ font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+ width:25%;
+ vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+ font-weight:bold;
+}
+.tableSubHeadingColor {
+ background-color:#EEEEFF;
+}
+.altColor {
+ background-color:#FFFFFF;
+}
+.rowColor {
+ background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+ margin-top:0;
+}
+.deprecatedContent {
+ margin:0;
+ padding:10px 0;
+}
+.docSummary {
+ padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+ font-style:normal;
+}
+
+div.block {
+ font-size:14px;
+ font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+ padding-top:0px;
+}
+
+
+td.colLast a {
+ padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+ color:green;
+ padding:0 30px 0 0;
+}
+h1.hidden {
+ visibility:hidden;
+ overflow:hidden;
+ font-size:10px;
+}
+.block {
+ display:block;
+ margin:3px 10px 2px 0px;
+ color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+ font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+ font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+ font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+ padding-bottom:0px;
+}
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/sourceCode.html
----------------------------------------------------------------------
diff --git a/content/sourceCode.html b/content/sourceCode.html
index f710427..c31bc5a 100644
--- a/content/sourceCode.html
+++ b/content/sourceCode.html
@@ -22,7 +22,7 @@
</ul>
<h5 class='toc'>Builds</h5>
<ul class='spaced-list'>
- <li><a class='doclink' href='https://builds.apache.org/job/Juneau-Java-1.7'>Jenkins</a> <a href='https://builds.apache.org/job/Juneau-Java-1.7/'><img src='https://builds.apache.org/job/Juneau-Java-1.7/badge/icon'></a>
+ <li><a class='doclink' href='https://builds.apache.org/job/Juneau-Java-1.8'>Jenkins</a> <a href='https://builds.apache.org/job/Juneau-Java-1.8/'><img src='https://builds.apache.org/job/Juneau-Java-1.8/badge/icon'></a>
</ul>
</body>
</html>
[14/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-tree.html b/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-tree.html
index deab8af..1f6972a 100644
--- a/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-tree.html
@@ -43,7 +43,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/juneau/rest/converters/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/juneau/rest/jaxrs/rdf/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/apache/juneau/rest/labels/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/juneau/rest/jaxrs/package-tree.html" target="_top">Frames</a></li>
@@ -114,7 +114,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/juneau/rest/converters/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/juneau/rest/jaxrs/rdf/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/apache/juneau/rest/labels/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/juneau/rest/jaxrs/package-tree.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html b/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html
deleted file mode 100644
index 8264c77..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DefaultJenaProvider (Apache Juneau (incubating) 6.3.2-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="DefaultJenaProvider (Apache Juneau (incubating) 6.3.2-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>Prev Class</li>
-<li>Next Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" target="_top">Frames</a></li>
-<li><a href="DefaultJenaProvider.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_top");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li>Field | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#methods.inherited.from.class.org.apache.juneau.rest.jaxrs.BaseProvider">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li>Method</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.rest.jaxrs.rdf</div>
-<h2 title="Class DefaultJenaProvider" class="title">Class DefaultJenaProvider</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="../../../../../../org/apache/juneau/rest/jaxrs/BaseProvider.html" title="class in org.apache.juneau.rest.jaxrs">org.apache.juneau.rest.jaxrs.BaseProvider</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.rest.jaxrs.rdf.DefaultJenaProvider</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>javax.ws.rs.ext.MessageBodyReader<<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>>, javax.ws.rs.ext.MessageBodyWriter<<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>></dd>
-</dl>
-<hr>
-<br>
-<pre>@Provider
- <a href="../../../../../../org/apache/juneau/rest/jaxrs/JuneauProvider.html" title="annotation in org.apache.juneau.rest.jaxrs">@JuneauProvider</a>(<a href="../../../../../../org/apache/juneau/rest/jaxrs/JuneauProvider.html#serializers--">serializers</a>={<a href="../../../../../../org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer.class</a>,<a href="../../../../../../org/apache/juneau/json/JsonSerializer.Simple.html" title="class in org.apache.juneau.json">JsonSerializer.Simple.class</a>,<a href="../../../../../../org/apache/juneau/json/JsonSchemaSerializer.html" title="class in org.apache.juneau.json">JsonSchemaSerializer.class</a>,<a href="../../../../../../org/apache/juneau/xml/XmlDocSerializer.Ns.html" title="class in org.apache.juneau.xml">XmlDocSerializer.Ns.class</a>,<a href="../../../../../../org/apache/juneau/xml/XmlSchemaDocSerializer.html" title="class in org.apache.juneau.xml">XmlSchemaDocSerializer.class</a>,<a href="../
../../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html">HtmlDocSerializer.class</a>,<a href="../../../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.class</a>,<a href="../../../../../../org/apache/juneau/soap/SoapXmlSerializer.html" title="class in org.apache.juneau.soap">SoapXmlSerializer.class</a>,<a href="../../../../../../org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in org.apache.juneau.jena">RdfSerializer.Xml.class</a>,<a href="../../../../../../org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html" title="class in org.apache.juneau.jena">RdfSerializer.XmlAbbrev.class</a>,<a href="../../../../../../org/apache/juneau/jena/RdfSerializer.NTriple.html" title="class in org.apache.juneau.jena">RdfSerializer.NTriple.class</a>,<a href="../../../../../../org/apache/juneau/jena/RdfSerializer.Turtle.html" title="class in org.apache.juneau.jena
">RdfSerializer.Turtle.class</a>,<a href="../../../../../../org/apache/juneau/jena/RdfSerializer.N3.html" title="class in org.apache.juneau.jena">RdfSerializer.N3.class</a>,<a href="../../../../../../org/apache/juneau/jso/JsoSerializer.html" title="class in org.apache.juneau.jso">JsoSerializer.class</a>},
- <a href="../../../../../../org/apache/juneau/rest/jaxrs/JuneauProvider.html#parsers--">parsers</a>={<a href="../../../../../../org/apache/juneau/json/JsonParser.html" title="class in org.apache.juneau.json">JsonParser.class</a>,<a href="../../../../../../org/apache/juneau/xml/XmlParser.html" title="class in org.apache.juneau.xml">XmlParser.class</a>,<a href="../../../../../../org/apache/juneau/html/HtmlParser.html" title="class in org.apache.juneau.html">HtmlParser.class</a>,<a href="../../../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html" title="class in org.apache.juneau.urlencoding">UrlEncodingParser.class</a>,<a href="../../../../../../org/apache/juneau/jena/RdfParser.Xml.html" title="class in org.apache.juneau.jena">RdfParser.Xml.class</a>,<a href="../../../../../../org/apache/juneau/jena/RdfParser.NTriple.html" title="class in org.apache.juneau.jena">RdfParser.NTriple.class</a>,<a href="../../../../../../org/apache/juneau/jena/RdfParser.Turtle.ht
ml" title="class in org.apache.juneau.jena">RdfParser.Turtle.class</a>,<a href="../../../../../../org/apache/juneau/jena/RdfParser.N3.html" title="class in org.apache.juneau.jena">RdfParser.N3.class</a>})
-public final class <a href="../../../../../../src-html/org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html#line.88">DefaultJenaProvider</a>
-extends <a href="../../../../../../org/apache/juneau/rest/jaxrs/BaseProvider.html" title="class in org.apache.juneau.rest.jaxrs">BaseProvider</a></pre>
-<div class="block">JAX-RS provider for the same serialize/parse support provided by the <a href="../../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> class.</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!-- -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html#DefaultJenaProvider--">DefaultJenaProvider</a></span>()</code> </td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!-- -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.jaxrs.BaseProvider">
-<!-- -->
-</a>
-<h3>Methods inherited from class org.apache.juneau.rest.jaxrs.<a href="../../../../../../org/apache/juneau/rest/jaxrs/BaseProvider.html" title="class in org.apache.juneau.rest.jaxrs">BaseProvider</a></h3>
-<code><a href="../../../../../../org/apache/juneau/rest/jaxrs/BaseProvider.html#getMethodProperties-java.lang.annotation.Annotation:A-">getMethodProperties</a>, <a href="../../../../../../org/apache/juneau/rest/jaxrs/BaseProvider.html#getSize-java.lang.Object-java.lang.Class-java.lang.reflect.Type-java.lang.annotation.Annotation:A-javax.ws.rs.core.MediaType-">getSize</a>, <a href="../../../../../../org/apache/juneau/rest/jaxrs/BaseProvider.html#isReadable-java.lang.Class-java.lang.reflect.Type-java.lang.annotation.Annotation:A-javax.ws.rs.core.MediaType-">isReadable</a>, <a href="../../../../../../org/apache/juneau/rest/jaxrs/BaseProvider.html#isWriteable-java.lang.Class-java.lang.reflect.Type-java.lang.annotation.Annotation:A-javax.ws.rs.core.MediaType-">isWriteable</a>, <a href="../../../../../../org/apache/juneau/rest/jaxrs/BaseProvider.html#readFrom-java.lang.Class-java.lang.reflect.Type-java.lang.annotation.Annotation:A-javax.ws.rs.core.MediaType-javax.ws.rs.core.MultivaluedMap
-java.io.InputStream-">readFrom</a>, <a href="../../../../../../org/apache/juneau/rest/jaxrs/BaseProvider.html#writeTo-java.lang.Object-java.lang.Class-java.lang.reflect.Type-java.lang.annotation.Annotation:A-javax.ws.rs.core.MediaType-javax.ws.rs.core.MultivaluedMap-java.io.OutputStream-">writeTo</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 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="DefaultJenaProvider--">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>DefaultJenaProvider</h4>
-<pre>public <a href="../../../../../../src-html/org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html#line.88">DefaultJenaProvider</a>()</pre>
-</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>Prev Class</li>
-<li>Next Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" target="_top">Frames</a></li>
-<li><a href="DefaultJenaProvider.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_bottom");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li>Field | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#methods.inherited.from.class.org.apache.juneau.rest.jaxrs.BaseProvider">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-frame.html b/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-frame.html
deleted file mode 100644
index b64e9b1..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-frame.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.juneau.rest.jaxrs.rdf (Apache Juneau (incubating) 6.3.2-incubating-SNAPSHOT)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../../javadoc.css" title="Style">
-<script type="text/javascript" src="../../../../../../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../../../../../../org/apache/juneau/rest/jaxrs/rdf/package-summary.html" target="classFrame">org.apache.juneau.rest.jaxrs.rdf</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf" target="classFrame">DefaultJenaProvider</a></li>
-</ul>
-</div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-summary.html b/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-summary.html
deleted file mode 100644
index 29a9eea..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-summary.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.juneau.rest.jaxrs.rdf (Apache Juneau (incubating) 6.3.2-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="org.apache.juneau.rest.jaxrs.rdf (Apache Juneau (incubating) 6.3.2-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 class="navBarCell1Rev">Package</li>
-<li>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/rest/jaxrs/package-summary.html">Prev Package</a></li>
-<li><a href="../../../../../../org/apache/juneau/rest/jena/package-summary.html">Next Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/juneau/rest/jaxrs/rdf/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_top");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!-- -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package org.apache.juneau.rest.jaxrs.rdf</h1>
-<div class="docSummary">
-<div class="block">JAX-RS integration components with RDF support</div>
-</div>
-<p>See: <a href="#package.description">Description</a></p>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf">DefaultJenaProvider</a></td>
-<td class="colLast">
-<div class="block">JAX-RS provider for the same serialize/parse support provided by the <a href="../../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> class.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-<a name="package.description">
-<!-- -->
-</a>
-<h2 title="Package org.apache.juneau.rest.jaxrs.rdf Description">Package org.apache.juneau.rest.jaxrs.rdf Description</h2>
-<div class="block"><p>JAX-RS integration components with RDF support</p></div>
-</div>
-<!-- ======= 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 class="navBarCell1Rev">Package</li>
-<li>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/rest/jaxrs/package-summary.html">Prev Package</a></li>
-<li><a href="../../../../../../org/apache/juneau/rest/jena/package-summary.html">Next Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/juneau/rest/jaxrs/rdf/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_bottom");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-tree.html b/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-tree.html
deleted file mode 100644
index 2456616..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-tree.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.juneau.rest.jaxrs.rdf Class Hierarchy (Apache Juneau (incubating) 6.3.2-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="org.apache.juneau.rest.jaxrs.rdf Class Hierarchy (Apache Juneau (incubating) 6.3.2-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</li>
-<li class="navBarCell1Rev">Tree</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/rest/jaxrs/package-tree.html">Prev</a></li>
-<li><a href="../../../../../../org/apache/juneau/rest/jena/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/juneau/rest/jaxrs/rdf/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_top");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!-- -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package org.apache.juneau.rest.jaxrs.rdf</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../../../../../../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">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"><span class="typeNameLink">Object</span></a>
-<ul>
-<li type="circle">org.apache.juneau.rest.jaxrs.<a href="../../../../../../org/apache/juneau/rest/jaxrs/BaseProvider.html" title="class in org.apache.juneau.rest.jaxrs"><span class="typeNameLink">BaseProvider</span></a> (implements javax.ws.rs.ext.MessageBodyReader<T>, javax.ws.rs.ext.MessageBodyWriter<T>)
-<ul>
-<li type="circle">org.apache.juneau.rest.jaxrs.rdf.<a href="../../../../../../org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf"><span class="typeNameLink">DefaultJenaProvider</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= 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</li>
-<li class="navBarCell1Rev">Tree</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/rest/jaxrs/package-tree.html">Prev</a></li>
-<li><a href="../../../../../../org/apache/juneau/rest/jena/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/juneau/rest/jaxrs/rdf/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_bottom");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html b/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html
deleted file mode 100644
index 0dcc194..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html
+++ /dev/null
@@ -1,515 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>RestServletJenaDefault (Apache Juneau (incubating) 6.3.2-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="RestServletJenaDefault (Apache Juneau (incubating) 6.3.2-incubating-SNAPSHOT)";
- }
- }
- catch(err) {
- }
-//-->
-var methods = {"i0":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>Prev Class</li>
-<li><a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/jena/RestServletJenaDefault.html" target="_top">Frames</a></li>
-<li><a href="RestServletJenaDefault.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_top");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li>Field | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!-- -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau.rest.jena</div>
-<h2 title="Class RestServletJenaDefault" class="title">Class RestServletJenaDefault</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/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet">javax.servlet.GenericServlet</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http">javax.servlet.http.HttpServlet</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServlet</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.rest.jena.RestServletJenaDefault</li>
-</ul>
-</li>
-</ul>
-</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/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a></dd>
-</dl>
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../../org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice">ResourceJena</a>, <a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaGroupDefault</a></dd>
-</dl>
-<hr>
-<br>
-<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#serializers--">serializers</a>={<a href="../../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html">HtmlDocSerializer.class</a>,<a href="../../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.html" title="class in org.apache.juneau.html">HtmlStrippedDocSerializer.class</a>,<a href="../../../../../org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html">HtmlSchemaDocSerializer.class</a>,<a href="../../../../../org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer.class</a>,<a href="../../../../../org/apache/juneau/json/JsonSerializer.Simple.html" title="class in org.apache.juneau.json">JsonSerializer.Simple.class</a>,<a href=
"../../../../../org/apache/juneau/json/JsonSchemaSerializer.html" title="class in org.apache.juneau.json">JsonSchemaSerializer.class</a>,<a href="../../../../../org/apache/juneau/xml/XmlDocSerializer.html" title="class in org.apache.juneau.xml">XmlDocSerializer.class</a>,<a href="../../../../../org/apache/juneau/xml/XmlSchemaDocSerializer.html" title="class in org.apache.juneau.xml">XmlSchemaDocSerializer.class</a>,<a href="../../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer.class</a>,<a href="../../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.class</a>,<a href="../../../../../org/apache/juneau/msgpack/MsgPackSerializer.html" title="class in org.apache.juneau.msgpack">MsgPackSerializer.class</a>,<a href="../../../../../org/apache/juneau/soap/SoapXmlSerializer.html" title="class in org.apache.juneau.soap">SoapXmlSerializer.class</a>,<a h
ref="../../../../../org/apache/juneau/plaintext/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext">PlainTextSerializer.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in org.apache.juneau.jena">RdfSerializer.Xml.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html" title="class in org.apache.juneau.jena">RdfSerializer.XmlAbbrev.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.N3.html" title="class in org.apache.juneau.jena">RdfSerializer.N3.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.NTriple.html" title="class in org.apache.juneau.jena">RdfSerializer.NTriple.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfSerializer.Turtle.html" title="class in org.apache.juneau.jena">RdfSerializer.Turtle.class</a>},
- <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#parsers--">parsers</a>={<a href="../../../../../org/apache/juneau/json/JsonParser.html" title="class in org.apache.juneau.json">JsonParser.class</a>,<a href="../../../../../org/apache/juneau/xml/XmlParser.html" title="class in org.apache.juneau.xml">XmlParser.class</a>,<a href="../../../../../org/apache/juneau/html/HtmlParser.html" title="class in org.apache.juneau.html">HtmlParser.class</a>,<a href="../../../../../org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon">UonParser.class</a>,<a href="../../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html" title="class in org.apache.juneau.urlencoding">UrlEncodingParser.class</a>,<a href="../../../../../org/apache/juneau/msgpack/MsgPackParser.html" title="class in org.apache.juneau.msgpack">MsgPackParser.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfParser.Xml.html" title="class in org.apache.juneau.
jena">RdfParser.Xml.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfParser.N3.html" title="class in org.apache.juneau.jena">RdfParser.N3.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfParser.NTriple.html" title="class in org.apache.juneau.jena">RdfParser.NTriple.class</a>,<a href="../../../../../org/apache/juneau/jena/RdfParser.Turtle.html" title="class in org.apache.juneau.jena">RdfParser.Turtle.class</a>},
- <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#properties--">properties</a>=<a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation">@Property</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#name--">name</a>="RestServlet.allowMethodParam",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="OPTIONS"),
- <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#htmldoc--">htmldoc</a>=,
- <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#favicon--">favicon</a>="htdocs/juneau.png",
- <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#staticFiles--">staticFiles</a>="{htdocs:\'htdocs\',styles:\'styles\'}")
-public abstract class <a href="../../../../../src-html/org/apache/juneau/rest/jena/RestServletJenaDefault.html#line.258">RestServletJenaDefault</a>
-extends <a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></pre>
-<div class="block">Subclass of <a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> with default sets of serializers and parsers that include RDF support.
-
- <p>
- Extends the <a href="../../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> class with additional RDF support.
-
- <p>
- Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:
- </p>
- <table class='styled'>
- <tr>
- <th>Accept</th>
- <th>Content-Type</th>
- <th>Serializer</th>
- </tr>
- <tr>
- <td class='code'>
- application/json
- <br>text/json
- </td>
- <td class='code'>application/json</td>
- <td><a href="../../../../../org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json"><code>JsonSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>
- application/json+simple
- <br>text/json+simple
- </td>
- <td class='code'>application/json</td>
- <td><a href="../../../../../org/apache/juneau/json/JsonSerializer.Simple.html" title="class in org.apache.juneau.json"><code>JsonSerializer.Simple</code></a></td>
- </tr>
- <tr>
- <td class='code'>
- application/json+schema
- <br>text/json+schema
- </td>
- <td class='code'>application/json</td>
- <td><a href="../../../../../org/apache/juneau/json/JsonSchemaSerializer.html" title="class in org.apache.juneau.json"><code>JsonSchemaSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/xml</td>
- <td class='code'>text/xml</td>
- <td><a href="../../../../../org/apache/juneau/xml/XmlDocSerializer.html" title="class in org.apache.juneau.xml"><code>XmlDocSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/xml+schema</td>
- <td class='code'>text/xml</td>
- <td><a href="../../../../../org/apache/juneau/xml/XmlSchemaDocSerializer.html" title="class in org.apache.juneau.xml"><code>XmlSchemaDocSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/html</td>
- <td class='code'>text/html</td>
- <td><a href="../../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html"><code>HtmlDocSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/html+stripped</td>
- <td class='code'>text/html</td>
- <td><a href="../../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.html" title="class in org.apache.juneau.html"><code>HtmlStrippedDocSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/uon</td>
- <td class='code'>text/uon</td>
- <td><a href="../../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon"><code>UonSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>application/x-www-form-urlencoded</td>
- <td class='code'>application/x-www-form-urlencoded</td>
- <td><a href="../../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/xml+soap</td>
- <td class='code'>text/xml</td>
- <td><a href="../../../../../org/apache/juneau/soap/SoapXmlSerializer.html" title="class in org.apache.juneau.soap"><code>SoapXmlSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/plain</td>
- <td class='code'>text/plain</td>
- <td><a href="../../../../../org/apache/juneau/plaintext/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext"><code>PlainTextSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/plain</td>
- <td class='code'>text/plain</td>
- <td><a href="../../../../../org/apache/juneau/plaintext/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext"><code>PlainTextSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>application/x-java-serialized-object</td>
- <td class='code'>application/x-java-serialized-object</td>
- <td><a href="../../../../../org/apache/juneau/jso/JsoSerializer.html" title="class in org.apache.juneau.jso"><code>JsoSerializer</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/xml+rdf</td>
- <td class='code'>text/xml+rdf</td>
- <td><a href="../../../../../org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in org.apache.juneau.jena"><code>RdfSerializer.Xml</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/xml+rdf+abbrev</td>
- <td class='code'>text/xml+rdf</td>
- <td><a href="../../../../../org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html" title="class in org.apache.juneau.jena"><code>RdfSerializer.XmlAbbrev</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/n3</td>
- <td class='code'>text/n3</td>
- <td><a href="../../../../../org/apache/juneau/jena/RdfSerializer.N3.html" title="class in org.apache.juneau.jena"><code>RdfSerializer.N3</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/n-triple</td>
- <td class='code'>text/n-triple</td>
- <td><a href="../../../../../org/apache/juneau/jena/RdfSerializer.NTriple.html" title="class in org.apache.juneau.jena"><code>RdfSerializer.NTriple</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/turtle</td>
- <td class='code'>text/turtle</td>
- <td><a href="../../../../../org/apache/juneau/jena/RdfSerializer.Turtle.html" title="class in org.apache.juneau.jena"><code>RdfSerializer.Turtle</code></a></td>
- </tr>
- </table>
- <p>
- Supports the following request <code>Content-Type</code> header values:
- </p>
- <table class='styled'>
- <tr>
- <th>Content-Type</th>
- <th>Parser</th>
- </tr>
- <tr>
- <td class='code'>
- application/json
- <br>text/json
- </td>
- <td><a href="../../../../../org/apache/juneau/json/JsonParser.html" title="class in org.apache.juneau.json"><code>JsonParser</code></a></td>
- </tr>
- <tr>
- <td class='code'>
- text/xml
- <br>application/xml
- </td>
- <td><a href="../../../../../org/apache/juneau/xml/XmlParser.html" title="class in org.apache.juneau.xml"><code>XmlParser</code></a></td>
- </tr>
- <tr>
- <td class='code'>
- text/html
- <br>text/html+stripped
- </td>
- <td><a href="../../../../../org/apache/juneau/html/HtmlParser.html" title="class in org.apache.juneau.html"><code>HtmlParser</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/uon</td>
- <td><a href="../../../../../org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon"><code>UonParser</code></a></td>
- </tr>
- <tr>
- <td class='code'>application/x-www-form-urlencoded</td>
- <td><a href="../../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingParser</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/plain</td>
- <td><a href="../../../../../org/apache/juneau/plaintext/PlainTextParser.html" title="class in org.apache.juneau.plaintext"><code>PlainTextParser</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/xml+rdf</td>
- <td><a href="../../../../../org/apache/juneau/jena/RdfParser.Xml.html" title="class in org.apache.juneau.jena"><code>RdfParser.Xml</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/n3</td>
- <td><a href="../../../../../org/apache/juneau/jena/RdfParser.N3.html" title="class in org.apache.juneau.jena"><code>RdfParser.N3</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/n-triple</td>
- <td><a href="../../../../../org/apache/juneau/jena/RdfParser.NTriple.html" title="class in org.apache.juneau.jena"><code>RdfParser.NTriple</code></a></td>
- </tr>
- <tr>
- <td class='code'>text/turtle</td>
- <td><a href="../../../../../org/apache/juneau/jena/RdfParser.Turtle.html" title="class in org.apache.juneau.jena"><code>RdfParser.Turtle</code></a></td>
- </tr>
- </table>
-
- <p>
- Note that the list of serializers and parsers can be appended to using the
- <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#serializers--"><code>@RestResource.serializers()</code></a> and
- <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#parsers--"><code>@RestResource.parsers()</code></a> annotations on subclasses.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../serialized-form.html#org.apache.juneau.rest.jena.RestServletJenaDefault">Serialized Form</a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!-- -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html#RestServletJenaDefault--">RestServletJenaDefault</a></span>()</code> </td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!-- -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions</a></span>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req)</code>
-<div class="block">[OPTIONS /*] - Show resource options.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServlet">
-<!-- -->
-</a>
-<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></h3>
-<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/junea
u/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
-<!-- -->
-</a>
-<h3>Methods inherited from class javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http">HttpServlet</a></h3>
-<code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doDelete-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doDelete</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doGet-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doGet</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doHead-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doHead</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doOptions-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doOptions</a>, <a
href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doPost-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doPost</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doPut-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doPut</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doTrace-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doTrace</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#getLastModified-javax.servlet.http.HttpServletRequest-" title="class or interface in javax.servlet.http">getLastModified</a>, <a href="http://docs.oracle.com/javaee/5/
api/javax/servlet/http/HttpServlet.html?is-external=true#service-javax.servlet.ServletRequest-javax.servlet.ServletResponse-" title="class or interface in javax.servlet.http">service</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.GenericServlet">
-<!-- -->
-</a>
-<h3>Methods inherited from class javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet">GenericServlet</a></h3>
-<code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getInitParameter-java.lang.String-" title="class or interface in javax.servlet">getInitParameter</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getInitParameterNames--" title="class or interface in javax.servlet">getInitParameterNames</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletContext--" title="class or interface in javax.servlet">getServletContext</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletInfo--" title="class or interface in javax.servlet">getServletInfo</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletName--" title="class or interface in javax.servlet">getServletName</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Ge
nericServlet.html?is-external=true#init--" title="class or interface in javax.servlet">init</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#log-java.lang.String-" title="class or interface in javax.servlet">log</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#log-java.lang.String-java.lang.Throwable-" title="class or interface in javax.servlet">log</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 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="RestServletJenaDefault--">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>RestServletJenaDefault</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/jena/RestServletJenaDefault.html#line.258">RestServletJenaDefault</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="getOptions-org.apache.juneau.rest.RestRequest-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getOptions</h4>
-<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="OPTIONS",
- <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",
- <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#htmldoc--">htmldoc</a>=,
- <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#summary--">summary</a>="Swagger documentation",
- <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Auto-generated swagger documentation for this resource")
-public <a href="../../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a> <a href="../../../../../src-html/org/apache/juneau/rest/jena/RestServletJenaDefault.html#line.278">getOptions</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req)</pre>
-<div class="block">[OPTIONS /*] - Show resource options.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The HTTP request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The bean containing the contents of the OPTIONS page.</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>Prev Class</li>
-<li><a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/jena/RestServletJenaDefault.html" target="_top">Frames</a></li>
-<li><a href="RestServletJenaDefault.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_bottom");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li>Field | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
[16/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/sample/HelloWorldResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/sample/HelloWorldResource.html b/content/site/apidocs/org/apache/juneau/microservice/sample/HelloWorldResource.html
new file mode 100644
index 0000000..9ac5d32
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/microservice/sample/HelloWorldResource.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>HelloWorldResource (Apache Juneau (incubating) 6.3.2-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="HelloWorldResource (Apache Juneau (incubating) 6.3.2-incubating-SNAPSHOT)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var methods = {"i0":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>Prev Class</li>
+<li><a href="../../../../../org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/HelloWorldResource.html" target="_top">Frames</a></li>
+<li><a href="HelloWorldResource.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.juneau.microservice.sample</div>
+<h2 title="Class HelloWorldResource" class="title">Class HelloWorldResource</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/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet">javax.servlet.GenericServlet</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http">javax.servlet.http.HttpServlet</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServlet</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletDefault</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">org.apache.juneau.microservice.Resource</a></li>
+<li>
+<ul class="inheritance">
+<li>org.apache.juneau.microservice.sample.HelloWorldResource</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</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/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a></dd>
+</dl>
+<hr>
+<br>
+<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#title--">title</a>="Hello World example",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#path--">path</a>="/helloworld",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#description--">description</a>="Simplest possible REST resource")
+public class <a href="../../../../../src-html/org/apache/juneau/microservice/sample/HelloWorldResource.html#line.27">HelloWorldResource</a>
+extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a></pre>
+<div class="block">Sample REST resource that prints out a simple "Hello world!" message.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../serialized-form.html#org.apache.juneau.microservice.sample.HelloWorldResource">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/sample/HelloWorldResource.html#HelloWorldResource--">HelloWorldResource</a></span>()</code> </td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="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/microservice/sample/HelloWorldResource.html#sayHello--">sayHello</a></span>()</code>
+<div class="block">GET request handler</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.microservice.Resource">
+<!-- -->
+</a>
+<h3>Methods inherited from class org.apache.juneau.microservice.<a href="../../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a></h3>
+<code><a href="../../../../../org/apache/juneau/microservice/Resource.html#addConfigVars-org.apache.juneau.rest.RestConfig-">addConfigVars</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletDefault">
+<!-- -->
+</a>
+<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></h3>
+<code><a href="../../../../../org/apache/juneau/rest/RestServletDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServlet">
+<!-- -->
+</a>
+<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></h3>
+<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/junea
u/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
+<!-- -->
+</a>
+<h3>Methods inherited from class javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http">HttpServlet</a></h3>
+<code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doDelete-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doDelete</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doGet-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doGet</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doHead-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doHead</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doOptions-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doOptions</a>, <a
href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doPost-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doPost</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doPut-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doPut</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doTrace-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doTrace</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#getLastModified-javax.servlet.http.HttpServletRequest-" title="class or interface in javax.servlet.http">getLastModified</a>, <a href="http://docs.oracle.com/javaee/5/
api/javax/servlet/http/HttpServlet.html?is-external=true#service-javax.servlet.ServletRequest-javax.servlet.ServletResponse-" title="class or interface in javax.servlet.http">service</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.GenericServlet">
+<!-- -->
+</a>
+<h3>Methods inherited from class javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet">GenericServlet</a></h3>
+<code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getInitParameter-java.lang.String-" title="class or interface in javax.servlet">getInitParameter</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getInitParameterNames--" title="class or interface in javax.servlet">getInitParameterNames</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletContext--" title="class or interface in javax.servlet">getServletContext</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletInfo--" title="class or interface in javax.servlet">getServletInfo</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletName--" title="class or interface in javax.servlet">getServletName</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Ge
nericServlet.html?is-external=true#init--" title="class or interface in javax.servlet">init</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#log-java.lang.String-" title="class or interface in javax.servlet">log</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#log-java.lang.String-java.lang.Throwable-" title="class or interface in javax.servlet">log</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 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="HelloWorldResource--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>HelloWorldResource</h4>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/microservice/sample/HelloWorldResource.html#line.27">HelloWorldResource</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="sayHello--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>sayHello</h4>
+<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="GET",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*")
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/sample/HelloWorldResource.html#line.32">sayHello</a>()</pre>
+<div class="block">GET request handler</div>
+</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>Prev Class</li>
+<li><a href="../../../../../org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/HelloWorldResource.html" target="_top">Frames</a></li>
+<li><a href="HelloWorldResource.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/sample/RootResources.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/sample/RootResources.html b/content/site/apidocs/org/apache/juneau/microservice/sample/RootResources.html
new file mode 100644
index 0000000..339b3ee
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/microservice/sample/RootResources.html
@@ -0,0 +1,322 @@
+<!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>RootResources (Apache Juneau (incubating) 6.3.2-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="RootResources (Apache Juneau (incubating) 6.3.2-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/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">Prev Class</span></a></li>
+<li>Next Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/RootResources.html" target="_top">Frames</a></li>
+<li><a href="RootResources.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#methods.inherited.from.class.org.apache.juneau.microservice.ResourceGroup">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li>Method</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.microservice.sample</div>
+<h2 title="Class RootResources" class="title">Class RootResources</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/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet">javax.servlet.GenericServlet</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http">javax.servlet.http.HttpServlet</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServlet</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletDefault</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletGroupDefault</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice">org.apache.juneau.microservice.ResourceGroup</a></li>
+<li>
+<ul class="inheritance">
+<li>org.apache.juneau.microservice.sample.RootResources</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</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/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a></dd>
+</dl>
+<hr>
+<br>
+<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#path--">path</a>="/",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#title--">title</a>="Juneau Microservice Template",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#description--">description</a>="Template for creating REST microservices",
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#properties--">properties</a>=<a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation">@Property</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#name--">name</a>="HtmlDocSerializer.links.list",<a href="../../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="{options:\'?method=OPTIONS\'}"),
+ <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#children--">children</a>={<a href="../../../../../org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample">HelloWorldResource.class</a>,<a href="../../../../../org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources">ConfigResource.class</a>,<a href="../../../../../org/apache/juneau/microservice/resources/LogsResource.html" title="class in org.apache.juneau.microservice.resources">LogsResource.class</a>})
+public class <a href="../../../../../src-html/org/apache/juneau/microservice/sample/RootResources.html#line.39">RootResources</a>
+extends <a href="../../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice">ResourceGroup</a></pre>
+<div class="block">Root microservice page.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../serialized-form.html#org.apache.juneau.microservice.sample.RootResources">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/sample/RootResources.html#RootResources--">RootResources</a></span>()</code> </td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.microservice.ResourceGroup">
+<!-- -->
+</a>
+<h3>Methods inherited from class org.apache.juneau.microservice.<a href="../../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice">ResourceGroup</a></h3>
+<code><a href="../../../../../org/apache/juneau/microservice/ResourceGroup.html#addConfigVars-org.apache.juneau.rest.RestConfig-">addConfigVars</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletGroupDefault">
+<!-- -->
+</a>
+<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></h3>
+<code><a href="../../../../../org/apache/juneau/rest/RestServletGroupDefault.html#getChildren-org.apache.juneau.rest.RestRequest-">getChildren</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletDefault">
+<!-- -->
+</a>
+<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></h3>
+<code><a href="../../../../../org/apache/juneau/rest/RestServletDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServlet">
+<!-- -->
+</a>
+<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></h3>
+<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/junea
u/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
+<!-- -->
+</a>
+<h3>Methods inherited from class javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http">HttpServlet</a></h3>
+<code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doDelete-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doDelete</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doGet-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doGet</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doHead-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doHead</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doOptions-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doOptions</a>, <a
href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doPost-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doPost</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doPut-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doPut</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doTrace-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doTrace</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#getLastModified-javax.servlet.http.HttpServletRequest-" title="class or interface in javax.servlet.http">getLastModified</a>, <a href="http://docs.oracle.com/javaee/5/
api/javax/servlet/http/HttpServlet.html?is-external=true#service-javax.servlet.ServletRequest-javax.servlet.ServletResponse-" title="class or interface in javax.servlet.http">service</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.GenericServlet">
+<!-- -->
+</a>
+<h3>Methods inherited from class javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet">GenericServlet</a></h3>
+<code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getInitParameter-java.lang.String-" title="class or interface in javax.servlet">getInitParameter</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getInitParameterNames--" title="class or interface in javax.servlet">getInitParameterNames</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletContext--" title="class or interface in javax.servlet">getServletContext</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletInfo--" title="class or interface in javax.servlet">getServletInfo</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletName--" title="class or interface in javax.servlet">getServletName</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Ge
nericServlet.html?is-external=true#init--" title="class or interface in javax.servlet">init</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#log-java.lang.String-" title="class or interface in javax.servlet">log</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#log-java.lang.String-java.lang.Throwable-" title="class or interface in javax.servlet">log</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 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="RootResources--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>RootResources</h4>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/microservice/sample/RootResources.html#line.39">RootResources</a>()</pre>
+</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/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">Prev Class</span></a></li>
+<li>Next Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/RootResources.html" target="_top">Frames</a></li>
+<li><a href="RootResources.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#methods.inherited.from.class.org.apache.juneau.microservice.ResourceGroup">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/sample/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/sample/package-frame.html b/content/site/apidocs/org/apache/juneau/microservice/sample/package-frame.html
new file mode 100644
index 0000000..10fe465
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/microservice/sample/package-frame.html
@@ -0,0 +1,21 @@
+<!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>org.apache.juneau.microservice.sample (Apache Juneau (incubating) 6.3.2-incubating-SNAPSHOT)</title>
+<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../../../../org/apache/juneau/microservice/sample/package-summary.html" target="classFrame">org.apache.juneau.microservice.sample</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample" target="classFrame">HelloWorldResource</a></li>
+<li><a href="RootResources.html" title="class in org.apache.juneau.microservice.sample" target="classFrame">RootResources</a></li>
+</ul>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html b/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html
new file mode 100644
index 0000000..17df640
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html
@@ -0,0 +1,149 @@
+<!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>org.apache.juneau.microservice.sample (Apache Juneau (incubating) 6.3.2-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="org.apache.juneau.microservice.sample (Apache Juneau (incubating) 6.3.2-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 class="navBarCell1Rev">Package</li>
+<li>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/microservice/resources/package-summary.html">Prev Package</a></li>
+<li><a href="../../../../../org/apache/juneau/msgpack/package-summary.html">Next Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package org.apache.juneau.microservice.sample</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample">HelloWorldResource</a></td>
+<td class="colLast">
+<div class="block">Sample REST resource that prints out a simple "Hello world!" message.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample">RootResources</a></td>
+<td class="colLast">
+<div class="block">Root microservice page.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= 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 class="navBarCell1Rev">Package</li>
+<li>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/microservice/resources/package-summary.html">Prev Package</a></li>
+<li><a href="../../../../../org/apache/juneau/msgpack/package-summary.html">Next Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/sample/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/sample/package-tree.html b/content/site/apidocs/org/apache/juneau/microservice/sample/package-tree.html
new file mode 100644
index 0000000..e04d5dd
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/microservice/sample/package-tree.html
@@ -0,0 +1,165 @@
+<!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>org.apache.juneau.microservice.sample Class Hierarchy (Apache Juneau (incubating) 6.3.2-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="org.apache.juneau.microservice.sample Class Hierarchy (Apache Juneau (incubating) 6.3.2-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</li>
+<li class="navBarCell1Rev">Tree</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/microservice/resources/package-tree.html">Prev</a></li>
+<li><a href="../../../../../org/apache/juneau/msgpack/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package org.apache.juneau.microservice.sample</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">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"><span class="typeNameLink">Object</span></a>
+<ul>
+<li type="circle">javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet"><span class="typeNameLink">GenericServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a>)
+<ul>
+<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a>
+<ul>
+<li type="circle">org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServlet</span></a>
+<ul>
+<li type="circle">org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServletDefault</span></a>
+<ul>
+<li type="circle">org.apache.juneau.microservice.<a href="../../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Resource</span></a>
+<ul>
+<li type="circle">org.apache.juneau.microservice.sample.<a href="../../../../../org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">HelloWorldResource</span></a></li>
+</ul>
+</li>
+<li type="circle">org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServletGroupDefault</span></a>
+<ul>
+<li type="circle">org.apache.juneau.microservice.<a href="../../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceGroup</span></a>
+<ul>
+<li type="circle">org.apache.juneau.microservice.sample.<a href="../../../../../org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">RootResources</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= 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</li>
+<li class="navBarCell1Rev">Tree</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/microservice/resources/package-tree.html">Prev</a></li>
+<li><a href="../../../../../org/apache/juneau/msgpack/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/msgpack/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/msgpack/package-summary.html b/content/site/apidocs/org/apache/juneau/msgpack/package-summary.html
index 80fde4b..6e057ad 100644
--- a/content/site/apidocs/org/apache/juneau/msgpack/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/msgpack/package-summary.html
@@ -42,7 +42,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/resources/package-summary.html">Prev Package</a></li>
+<li><a href="../../../../org/apache/juneau/microservice/sample/package-summary.html">Prev Package</a></li>
<li><a href="../../../../org/apache/juneau/parser/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
@@ -196,7 +196,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/resources/package-summary.html">Prev Package</a></li>
+<li><a href="../../../../org/apache/juneau/microservice/sample/package-summary.html">Prev Package</a></li>
<li><a href="../../../../org/apache/juneau/parser/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/msgpack/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/msgpack/package-tree.html b/content/site/apidocs/org/apache/juneau/msgpack/package-tree.html
index fd65246..031bd27 100644
--- a/content/site/apidocs/org/apache/juneau/msgpack/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/msgpack/package-tree.html
@@ -42,7 +42,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/resources/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/juneau/microservice/sample/package-tree.html">Prev</a></li>
<li><a href="../../../../org/apache/juneau/parser/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
@@ -194,7 +194,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/resources/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/juneau/microservice/sample/package-tree.html">Prev</a></li>
<li><a href="../../../../org/apache/juneau/parser/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/RestConfig.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestConfig.html b/content/site/apidocs/org/apache/juneau/rest/RestConfig.html
index b5d804a..7ce13d8 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestConfig.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestConfig.html
@@ -673,7 +673,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul>
<li><a href="../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>SystemPropertiesVar</code></a>
<li><a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a>
- <li><a href="../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><code>ConfigFileVar</code></a>
+ <li><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>ConfigFileVar</code></a>
<li><a href="../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>IfVar</code></a>
<li><a href="../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>SwitchVar</code></a>
</ul>
@@ -712,8 +712,8 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
information.
<p>
- For example, the <a href="../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><code>ConfigFileVar</code></a> needs access to this resource's <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> through the
- <a href="../../../../org/apache/juneau/svl/vars/ConfigFileVar.html#SESSION_config"><code>ConfigFileVar.SESSION_config</code></a> object that can be specified as either a session object (temporary) or
+ For example, the <a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>ConfigFileVar</code></a> needs access to this resource's <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> through the
+ <a href="../../../../org/apache/juneau/ini/ConfigFileVar.html#SESSION_config"><code>ConfigFileVar.SESSION_config</code></a> object that can be specified as either a session object (temporary) or
context object (permanent).
In this case, we call the following code to add it to the context map:
<p class='bcode'>
@@ -2259,7 +2259,7 @@ implements <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletCon
<ul>
<li><a href="../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>SystemPropertiesVar</code></a>
<li><a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a>
- <li><a href="../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><code>ConfigFileVar</code></a>
+ <li><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>ConfigFileVar</code></a>
<li><a href="../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>IfVar</code></a>
<li><a href="../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>SwitchVar</code></a>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/RestContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestContext.html b/content/site/apidocs/org/apache/juneau/rest/RestContext.html
index b43264c..50534b0 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestContext.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestContext.html
@@ -1026,7 +1026,7 @@ extends <a href="../../../../org/apache/juneau/Context.html" title="class in org
<p>
The following is the default list of supported variables:
<ul>
- <li><code>$C{key[,defaultValue]}</code> - Config file entry. See <a href="../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><code>ConfigFileVar</code></a>.
+ <li><code>$C{key[,defaultValue]}</code> - Config file entry. See <a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>ConfigFileVar</code></a>.
<li><code>$E{envVar[,defaultValue]}</code> - Environment variable. See <a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a>.
<li><code>$F{path[,defaultValue]}</code> - File resource. See <a href="../../../../org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><code>FileVar</code></a>.
<li><code>$I{name[,defaultValue]}</code> - Servlet init parameter. See <a href="../../../../org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars"><code>ServletInitParamVar</code></a>.
[15/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/RestResponse.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestResponse.html b/content/site/apidocs/org/apache/juneau/rest/RestResponse.html
index c17cd6b..8913be4 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestResponse.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestResponse.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.59">RestResponse</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.58">RestResponse</a>
extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServletResponseWrapper.html?is-external=true" title="class or interface in javax.servlet.http">HttpServletResponseWrapper</a></pre>
<div class="block">Represents an HTTP response for a REST resource.
@@ -426,7 +426,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getSerializerGroup</h4>
-<pre>public <a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.131">getSerializerGroup</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.130">getSerializerGroup</a>()</pre>
<div class="block">Gets the serializer group for the response.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -440,7 +440,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getSupportedMediaTypes</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.140">getSupportedMediaTypes</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.139">getSupportedMediaTypes</a>()</pre>
<div class="block">Returns the media types that are valid for <code>Accept</code> headers on the request.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -454,7 +454,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getSupportedEncodings</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.151">getSupportedEncodings</a>()
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.150">getSupportedEncodings</a>()
throws <a href="../../../../org/apache/juneau/rest/RestServletException.html" title="class in org.apache.juneau.rest">RestServletException</a></pre>
<div class="block">Returns the codings that are valid for <code>Accept-Encoding</code> and <code>Content-Encoding</code> headers on
the request.</div>
@@ -472,7 +472,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setOutput</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.177">setOutput</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> output)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.176">setOutput</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> output)</pre>
<div class="block">Sets the HTTP output on the response.
<p>
@@ -504,7 +504,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setProperty</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.199">setProperty</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key,
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.197">setProperty</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Add a serializer property to send to the serializers to override a default value.
@@ -514,7 +514,6 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<li><a href="../../../../org/apache/juneau/serializer/SerializerContext.html" title="class in org.apache.juneau.serializer"><code>SerializerContext</code></a>
<li><a href="../../../../org/apache/juneau/json/JsonSerializerContext.html" title="class in org.apache.juneau.json"><code>JsonSerializerContext</code></a>
<li><a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html" title="class in org.apache.juneau.xml"><code>XmlSerializerContext</code></a>
- <li><a href="../../../../org/apache/juneau/jena/RdfSerializerContext.html" title="class in org.apache.juneau.jena"><code>RdfSerializerContext</code></a>
</ul></div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -531,7 +530,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getProperties</h4>
-<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.209">getProperties</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.207">getProperties</a>()</pre>
<div class="block">Returns the properties set via <a href="../../../../org/apache/juneau/rest/RestResponse.html#setProperty-java.lang.String-java.lang.Object-"><code>setProperty(String, Object)</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -545,7 +544,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setOutputs</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.228">setOutputs</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... output)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.226">setOutputs</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... output)</pre>
<div class="block">Shortcut method that allows you to use var-args to simplify setting array output.
<h5 class='section'>Example:</h5>
@@ -570,7 +569,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getOutput</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.238">getOutput</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.236">getOutput</a>()</pre>
<div class="block">Returns the output that was set by calling <a href="../../../../org/apache/juneau/rest/RestResponse.html#setOutput-java.lang.Object-"><code>setOutput(Object)</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -584,7 +583,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>hasOutput</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.247">hasOutput</a>()</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.245">hasOutput</a>()</pre>
<div class="block">Returns <jk>true</jk> if this response has any output associated with it.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -598,7 +597,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>sendPlainText</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.258">sendPlainText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.256">sendPlainText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Sets the output to a plain-text message regardless of the content type.</div>
<dl>
@@ -617,7 +616,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getNegotiatedOutputStream</h4>
-<pre>public <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletOutputStream.html?is-external=true" title="class or interface in javax.servlet">ServletOutputStream</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.271">getNegotiatedOutputStream</a>()
+<pre>public <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletOutputStream.html?is-external=true" title="class or interface in javax.servlet">ServletOutputStream</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.269">getNegotiatedOutputStream</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Equivalent to <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletResponse.html?is-external=true#getOutputStream--" title="class or interface in javax.servlet"><code>ServletResponse.getOutputStream()</code></a>, except wraps the output stream if an <a href="../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders"><code>Encoder</code></a>
was found that matched the <code>Accept-Encoding</code> header.</div>
@@ -635,7 +634,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getOutputStream</h4>
-<pre>public <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletOutputStream.html?is-external=true" title="class or interface in javax.servlet">ServletOutputStream</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.330">getOutputStream</a>()
+<pre>public <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletOutputStream.html?is-external=true" title="class or interface in javax.servlet">ServletOutputStream</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.328">getOutputStream</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -653,7 +652,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getOutputStreamCalled</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.341">getOutputStreamCalled</a>()</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.339">getOutputStreamCalled</a>()</pre>
<div class="block">Returns <jk>true</jk> if <a href="../../../../org/apache/juneau/rest/RestResponse.html#getOutputStream--"><code>getOutputStream()</code></a> has been called.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -667,7 +666,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getWriter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.353">getWriter</a>()
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.351">getWriter</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Returns the writer to the response body.
@@ -690,7 +689,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getDirectWriter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.368">getDirectWriter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> contentType)
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.366">getDirectWriter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> contentType)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Convenience method meant to be used when rendering directly to a browser with no buffering.
@@ -713,7 +712,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getNegotiatedWriter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.382">getNegotiatedWriter</a>()
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.380">getNegotiatedWriter</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Equivalent to <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletResponse.html?is-external=true#getWriter--" title="class or interface in javax.servlet"><code>ServletResponse.getWriter()</code></a>, except wraps the output stream if an <a href="../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders"><code>Encoder</code></a> was
found that matched the <code>Accept-Encoding</code> header and sets the <code>Content-Encoding</code>
@@ -732,7 +731,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getMediaType</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.410">getMediaType</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.408">getMediaType</a>()</pre>
<div class="block">Returns the <code>Content-Type</code> header stripped of the charset attribute if present.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -746,7 +745,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>sendRedirect</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.422">sendRedirect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.420">sendRedirect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Redirects to the specified URI.
@@ -769,7 +768,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>getUrlEncodingSerializer</h4>
-<pre>public <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.434">getUrlEncodingSerializer</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.432">getUrlEncodingSerializer</a>()</pre>
<div class="block">Returns the URL-encoding serializer associated with this response.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -783,7 +782,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHeader</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.439">setHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.437">setHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> value)</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -799,7 +798,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlHeader</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.479">setHtmlHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.477">setHtmlHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the HTML header section contents.
<p>
@@ -839,7 +838,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlLinks</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.516">setHtmlLinks</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.514">setHtmlLinks</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] value)</pre>
<div class="block">Sets the links in the HTML nav section.
<p>
@@ -881,7 +880,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlNav</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.557">setHtmlNav</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.555">setHtmlNav</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the HTML nav section contents.
<p>
@@ -926,7 +925,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlAside</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.592">setHtmlAside</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.590">setHtmlAside</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the HTML aside section contents.
<p>
@@ -965,7 +964,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlFooter</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.627">setHtmlFooter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.625">setHtmlFooter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the HTML footer section contents.
<p>
@@ -1004,7 +1003,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlStyle</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.659">setHtmlStyle</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.657">setHtmlStyle</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the HTML CSS style section contents.
<p>
@@ -1040,7 +1039,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlStylesheet</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.695">setHtmlStylesheet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.693">setHtmlStylesheet</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the CSS URL in the HTML CSS style section.
<p>
@@ -1080,7 +1079,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlScript</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.727">setHtmlScript</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.725">setHtmlScript</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the HTML script section contents.
<p>
@@ -1116,7 +1115,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlNoWrap</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.741">setHtmlNoWrap</a>(boolean value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.739">setHtmlNoWrap</a>(boolean value)</pre>
<div class="block">Shorthand method for forcing the rendered HTML content to be no-wrap.
<p>
@@ -1135,7 +1134,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlNoResultsMessage</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.756">setHtmlNoResultsMessage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.754">setHtmlNoResultsMessage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Specifies the text to display when serializing an empty array or collection.
<p>
@@ -1155,7 +1154,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlTemplate</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.774">setHtmlTemplate</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/html/HtmlDocTemplate.html" title="interface in org.apache.juneau.html">HtmlDocTemplate</a>> value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.772">setHtmlTemplate</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/html/HtmlDocTemplate.html" title="interface in org.apache.juneau.html">HtmlDocTemplate</a>> value)</pre>
<div class="block">Specifies the template class to use for rendering the HTML page.
<p>
@@ -1178,7 +1177,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockList">
<li class="blockList">
<h4>setHtmlTemplate</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.792">setHtmlTemplate</a>(<a href="../../../../org/apache/juneau/html/HtmlDocTemplate.html" title="interface in org.apache.juneau.html">HtmlDocTemplate</a> value)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a> <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.790">setHtmlTemplate</a>(<a href="../../../../org/apache/juneau/html/HtmlDocTemplate.html" title="interface in org.apache.juneau.html">HtmlDocTemplate</a> value)</pre>
<div class="block">Specifies the template class to use for rendering the HTML page.
<p>
@@ -1201,7 +1200,7 @@ extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServ
<ul class="blockListLast">
<li class="blockList">
<h4>flushBuffer</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.798">flushBuffer</a>()
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RestResponse.html#line.796">flushBuffer</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/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/RestServlet.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestServlet.html b/content/site/apidocs/org/apache/juneau/rest/RestServlet.html
index d553ac6..28f5bc9 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestServlet.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestServlet.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
</dl>
<dl>
<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a>, <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a></dd>
+<dd><a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></dd>
</dl>
<hr>
<br>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html b/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html
index abe9d5c..adf0e40 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html
@@ -127,7 +127,7 @@ var activeTableTab = "activeTableTab";
</dl>
<dl>
<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/rest/remoteable/RemoteableServlet.html" title="class in org.apache.juneau.rest.remoteable">RemoteableServlet</a>, <a href="../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a>, <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></dd>
+<dd><a href="../../../../org/apache/juneau/rest/remoteable/RemoteableServlet.html" title="class in org.apache.juneau.rest.remoteable">RemoteableServlet</a>, <a href="../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a>, <a href="../../../../org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice">ResourceJena</a>, <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></dd>
</dl>
<hr>
<br>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/RestServletGroupDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestServletGroupDefault.html b/content/site/apidocs/org/apache/juneau/rest/RestServletGroupDefault.html
index df6932b..320987e 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestServletGroupDefault.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestServletGroupDefault.html
@@ -132,7 +132,7 @@ var activeTableTab = "activeTableTab";
</dl>
<dl>
<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice">ResourceGroup</a></dd>
+<dd><a href="../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice">ResourceGroup</a>, <a href="../../../../org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice">ResourceJenaGroup</a></dd>
</dl>
<hr>
<br>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/annotation/Property.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Property.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Property.html
index 83cb690..fff7d6e 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Property.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Property.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#ANNOTATION_TYPE" title="class or interface in java.lang.annotation">ANNOTATION_TYPE</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/Property.html#line.55">Property</a></pre>
+public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/Property.html#line.51">Property</a></pre>
<div class="block">Property name/value pair used in the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#properties--"><code>RestResource.properties()</code></a> annotation.
<p>
@@ -106,9 +106,6 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<li><a href="../../../../../org/apache/juneau/serializer/SerializerContext.html" title="class in org.apache.juneau.serializer"><code>SerializerContext</code></a>
<li><a href="../../../../../org/apache/juneau/parser/ParserContext.html" title="class in org.apache.juneau.parser"><code>ParserContext</code></a>
<li><a href="../../../../../org/apache/juneau/json/JsonSerializerContext.html" title="class in org.apache.juneau.json"><code>JsonSerializerContext</code></a>
- <li><a href="../../../../../org/apache/juneau/jena/RdfSerializerContext.html" title="class in org.apache.juneau.jena"><code>RdfSerializerContext</code></a>
- <li><a href="../../../../../org/apache/juneau/jena/RdfParserContext.html" title="class in org.apache.juneau.jena"><code>RdfParserContext</code></a>
- <li><a href="../../../../../org/apache/juneau/jena/RdfCommonContext.html" title="interface in org.apache.juneau.jena"><code>RdfCommonContext</code></a>
<li><a href="../../../../../org/apache/juneau/xml/XmlSerializerContext.html" title="class in org.apache.juneau.xml"><code>XmlSerializerContext</code></a>
<li><a href="../../../../../org/apache/juneau/xml/XmlParserContext.html" title="class in org.apache.juneau.xml"><code>XmlParserContext</code></a>
</ul>
@@ -170,7 +167,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>name</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/Property.html#line.60">name</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/Property.html#line.56">name</a></pre>
<div class="block">Property name.</div>
</li>
</ul>
@@ -183,7 +180,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockListLast">
<li class="blockList">
<h4>value</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/Property.html#line.65">value</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/Property.html#line.61">value</a></pre>
<div class="block">Property value.</div>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html b/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
index 3a9ee26..a7b39da 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
@@ -96,7 +96,7 @@
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#TYPE" title="class or interface in java.lang.annotation">TYPE</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.48">RestResource</a></pre>
+public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.47">RestResource</a></pre>
<div class="block">Used to denote that a class is a REST resource and to associate metadata on it.
<p>
@@ -337,7 +337,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>messages</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.68">messages</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.67">messages</a></pre>
<div class="block">Identifies the location of the resource bundle for this class.
<p>
@@ -369,7 +369,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>guards</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.85">guards</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.84">guards</a></pre>
<div class="block">Class-level guards.
<p>
@@ -398,7 +398,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>converters</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.106">converters</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.105">converters</a></pre>
<div class="block">Class-level converters.
<p>
@@ -431,7 +431,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>beanFilters</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.127">beanFilters</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.126">beanFilters</a></pre>
<div class="block">Class-level bean filters.
<p>
@@ -464,7 +464,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>pojoSwaps</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.147">pojoSwaps</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.146">pojoSwaps</a></pre>
<div class="block">Class-level POJO swaps.
<p>
@@ -496,7 +496,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>paramResolvers</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestParam.html" title="class in org.apache.juneau.rest">RestParam</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.183">paramResolvers</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestParam.html" title="class in org.apache.juneau.rest">RestParam</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.182">paramResolvers</a></pre>
<div class="block">Class-level Java method parameter resolvers.
<p>
@@ -544,7 +544,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>properties</h4>
-<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation">Property</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.222">properties</a></pre>
+<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation">Property</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.218">properties</a></pre>
<div class="block">Class-level properties.
<p>
@@ -562,9 +562,6 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<li><a href="../../../../../org/apache/juneau/serializer/SerializerContext.html" title="class in org.apache.juneau.serializer"><code>SerializerContext</code></a>
<li><a href="../../../../../org/apache/juneau/parser/ParserContext.html" title="class in org.apache.juneau.parser"><code>ParserContext</code></a>
<li><a href="../../../../../org/apache/juneau/json/JsonSerializerContext.html" title="class in org.apache.juneau.json"><code>JsonSerializerContext</code></a>
- <li><a href="../../../../../org/apache/juneau/jena/RdfSerializerContext.html" title="class in org.apache.juneau.jena"><code>RdfSerializerContext</code></a>
- <li><a href="../../../../../org/apache/juneau/jena/RdfParserContext.html" title="class in org.apache.juneau.jena"><code>RdfParserContext</code></a>
- <li><a href="../../../../../org/apache/juneau/jena/RdfCommonContext.html" title="interface in org.apache.juneau.jena"><code>RdfCommonContext</code></a>
<li><a href="../../../../../org/apache/juneau/xml/XmlSerializerContext.html" title="class in org.apache.juneau.xml"><code>XmlSerializerContext</code></a>
<li><a href="../../../../../org/apache/juneau/xml/XmlParserContext.html" title="class in org.apache.juneau.xml"><code>XmlParserContext</code></a>
</ul>
@@ -595,7 +592,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>flags</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.230">flags</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.226">flags</a></pre>
<div class="block">Shortcut for setting <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#properties--"><code>properties()</code></a> of simple boolean types.
<p>
@@ -615,7 +612,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>serializers</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.242">serializers</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.238">serializers</a></pre>
<div class="block">Specifies a list of <a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer"><code>Serializer</code></a> classes to add to the list of serializers available for this servlet.
<p>
@@ -639,7 +636,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>parsers</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.254">parsers</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.250">parsers</a></pre>
<div class="block">Specifies a list of <a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser"><code>Parser</code></a> classes to add to the list of parsers available for this servlet.
<p>
@@ -663,7 +660,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>responseHandlers</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.267">responseHandlers</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.263">responseHandlers</a></pre>
<div class="block">Specifies a list of <a href="../../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest"><code>ResponseHandler</code></a> classes that know how to convert POJOs returned by REST methods or
set via <a href="../../../../../org/apache/juneau/rest/RestResponse.html#setOutput-java.lang.Object-"><code>RestResponse.setOutput(Object)</code></a> into appropriate HTTP responses.
@@ -688,7 +685,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>encoders</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.291">encoders</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a>>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.287">encoders</a></pre>
<div class="block">Specifies a list of <a href="../../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders"><code>Encoder</code></a> to associate with this servlet.
<p>
@@ -724,7 +721,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>defaultRequestHeaders</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.322">defaultRequestHeaders</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.318">defaultRequestHeaders</a></pre>
<div class="block">Specifies default values for request headers.
<p>
@@ -767,7 +764,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>defaultResponseHeaders</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.353">defaultResponseHeaders</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.349">defaultResponseHeaders</a></pre>
<div class="block">Specifies default values for response headers.
<p>
@@ -810,7 +807,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>children</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.402">children</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[] <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.398">children</a></pre>
<div class="block">Defines children of this resource.
<p>
@@ -871,7 +868,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>path</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.419">path</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.415">path</a></pre>
<div class="block">Identifies the URL subpath relative to the parent resource.
<p>
@@ -900,7 +897,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>siteName</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.449">siteName</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.445">siteName</a></pre>
<div class="block">Optional site name.
<p>
@@ -942,7 +939,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>title</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.472">title</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.468">title</a></pre>
<div class="block">Optional servlet title.
<p>
@@ -977,7 +974,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>description</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.495">description</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.491">description</a></pre>
<div class="block">Optional servlet description.
<p>
@@ -1012,7 +1009,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>config</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.510">config</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.506">config</a></pre>
<div class="block">Optional location of configuration file for this servlet.
<p>
@@ -1039,7 +1036,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>favicon</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.548">favicon</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.544">favicon</a></pre>
<div class="block">The favicon to use for HTML views.
<p>
@@ -1089,7 +1086,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>staticFiles</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.587">staticFiles</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.583">staticFiles</a></pre>
<div class="block">Defines paths and locations of statically served files.
<p>
@@ -1140,7 +1137,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>clientVersionHeader</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.602">clientVersionHeader</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.598">clientVersionHeader</a></pre>
<div class="block">Specifies the HTTP header name used to identify the client version.
<p>
@@ -1167,7 +1164,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>resourceResolver</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestResourceResolver.html" title="interface in org.apache.juneau.rest">RestResourceResolver</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.638">resourceResolver</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestResourceResolver.html" title="interface in org.apache.juneau.rest">RestResourceResolver</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.634">resourceResolver</a></pre>
<div class="block">Specifies the resolver class to use for resolving child resources by class name.
<p>
@@ -1215,7 +1212,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>logger</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestLogger.html" title="class in org.apache.juneau.rest">RestLogger</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.651">logger</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestLogger.html" title="class in org.apache.juneau.rest">RestLogger</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.647">logger</a></pre>
<div class="block">Specifies the logger class to use for logging.
<p>
@@ -1240,7 +1237,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>callHandler</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest">RestCallHandler</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.664">callHandler</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest">RestCallHandler</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.660">callHandler</a></pre>
<div class="block">Specifies the REST call handler class.
<p>
@@ -1265,7 +1262,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>infoProvider</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest">RestInfoProvider</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.676">infoProvider</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest">RestInfoProvider</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.672">infoProvider</a></pre>
<div class="block">Specifies the class used to retrieve title/description/swagger information about a resource.
<p>
@@ -1289,7 +1286,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>serializerListener</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/serializer/SerializerListener.html" title="class in org.apache.juneau.serializer">SerializerListener</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.681">serializerListener</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/serializer/SerializerListener.html" title="class in org.apache.juneau.serializer">SerializerListener</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.677">serializerListener</a></pre>
<div class="block">Specifies the serializer listener class to use for listening for non-fatal errors.</div>
<dl>
<dt>Default:</dt>
@@ -1306,7 +1303,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>parserListener</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/parser/ParserListener.html" title="class in org.apache.juneau.parser">ParserListener</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.686">parserListener</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/parser/ParserListener.html" title="class in org.apache.juneau.parser">ParserListener</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.682">parserListener</a></pre>
<div class="block">Specifies the parser listener class to use for listening for non-fatal errors.</div>
<dl>
<dt>Default:</dt>
@@ -1323,7 +1320,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>swagger</h4>
-<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation">ResourceSwagger</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.711">swagger</a></pre>
+<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation">ResourceSwagger</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.707">swagger</a></pre>
<div class="block">Provides swagger-specific metadata on this resource.
<p>
@@ -1360,7 +1357,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>htmldoc</h4>
-<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation">HtmlDoc</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.755">htmldoc</a></pre>
+<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation">HtmlDoc</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.751">htmldoc</a></pre>
<div class="block">Provides HTML-doc-specific metadata on this method.
<p>
@@ -1416,7 +1413,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockListLast">
<li class="blockList">
<h4>contextPath</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.766">contextPath</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.762">contextPath</a></pre>
<div class="block">Overrides the context path value for this resource and any child resources.
<p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/client/RestCallException.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/client/RestCallException.html b/content/site/apidocs/org/apache/juneau/rest/client/RestCallException.html
index e7d0f07..ce45a16 100644
--- a/content/site/apidocs/org/apache/juneau/rest/client/RestCallException.html
+++ b/content/site/apidocs/org/apache/juneau/rest/client/RestCallException.html
@@ -407,7 +407,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.ht
<ul class="blockList">
<li class="blockList">
<h4>setHttpResponse</h4>
-<pre>protected <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.164">setHttpResponse</a>(org.apache.http.HttpResponse httpResponse)</pre>
+<pre>protected <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.166">setHttpResponse</a>(org.apache.http.HttpResponse httpResponse)</pre>
<div class="block">Sets the HTTP response object that caused this exception.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -423,7 +423,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.ht
<ul class="blockList">
<li class="blockList">
<h4>getHttpResponse</h4>
-<pre>public org.apache.http.HttpResponse <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.176">getHttpResponse</a>()</pre>
+<pre>public org.apache.http.HttpResponse <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.178">getHttpResponse</a>()</pre>
<div class="block">Returns the HTTP response object that caused this exception.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -438,7 +438,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.ht
<ul class="blockList">
<li class="blockList">
<h4>getResponseCode</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.185">getResponseCode</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.187">getResponseCode</a>()</pre>
<div class="block">Returns the HTTP response status code.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -452,7 +452,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.ht
<ul class="blockList">
<li class="blockList">
<h4>getResponseMessage</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.194">getResponseMessage</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.196">getResponseMessage</a>()</pre>
<div class="block">Returns the HTTP response message body text.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -466,7 +466,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.ht
<ul class="blockList">
<li class="blockList">
<h4>getResponseStatusMessage</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.203">getResponseStatusMessage</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.205">getResponseStatusMessage</a>()</pre>
<div class="block">Returns the response status message as a plain string.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -480,7 +480,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.ht
<ul class="blockListLast">
<li class="blockList">
<h4>initCause</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.214">initCause</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> cause)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCallException.html#line.216">initCause</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> cause)</pre>
<div class="block">Sets the inner cause for this exception.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jaxrs/BaseProvider.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jaxrs/BaseProvider.html b/content/site/apidocs/org/apache/juneau/rest/jaxrs/BaseProvider.html
index e42398f..00ea23f 100644
--- a/content/site/apidocs/org/apache/juneau/rest/jaxrs/BaseProvider.html
+++ b/content/site/apidocs/org/apache/juneau/rest/jaxrs/BaseProvider.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
</dl>
<dl>
<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../../org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf">DefaultJenaProvider</a>, <a href="../../../../../org/apache/juneau/rest/jaxrs/DefaultProvider.html" title="class in org.apache.juneau.rest.jaxrs">DefaultProvider</a></dd>
+<dd><a href="../../../../../org/apache/juneau/rest/jaxrs/DefaultProvider.html" title="class in org.apache.juneau.rest.jaxrs">DefaultProvider</a></dd>
</dl>
<hr>
<br>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-summary.html b/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-summary.html
index dc5fc26..43bab5c 100644
--- a/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-summary.html
@@ -43,7 +43,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/juneau/rest/converters/package-summary.html">Prev Package</a></li>
-<li><a href="../../../../../org/apache/juneau/rest/jaxrs/rdf/package-summary.html">Next Package</a></li>
+<li><a href="../../../../../org/apache/juneau/rest/labels/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/juneau/rest/jaxrs/package-summary.html" target="_top">Frames</a></li>
@@ -241,7 +241,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/juneau/rest/converters/package-summary.html">Prev Package</a></li>
-<li><a href="../../../../../org/apache/juneau/rest/jaxrs/rdf/package-summary.html">Next Package</a></li>
+<li><a href="../../../../../org/apache/juneau/rest/labels/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/juneau/rest/jaxrs/package-summary.html" target="_top">Frames</a></li>
[03/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html
index 0588f5d..5cba008 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html
@@ -30,749 +30,745 @@
<span class="sourceLineNo">022</span>import org.apache.juneau.*;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import org.apache.juneau.encoders.Encoder;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import org.apache.juneau.ini.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.jena.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.json.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.parser.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.rest.*;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.juneau.serializer.*;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.juneau.transform.*;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.juneau.utils.*;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.juneau.xml.*;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * Used to denote that a class is a REST resource and to associate metadata on it.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <p><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * Usually used on a subclass of {@link RestServlet}, but can be used to annotate any class that you want to expose as<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * a REST resource.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * Refer to <a class='doclink' href='../package-summary.html#TOC'>org.apache.juneau.rest</a> doc for information on<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * using this class.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> */<a name="line.43"></a>
-<span class="sourceLineNo">044</span>@Documented<a name="line.44"></a>
-<span class="sourceLineNo">045</span>@Target(TYPE)<a name="line.45"></a>
-<span class="sourceLineNo">046</span>@Retention(RUNTIME)<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@Inherited<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public @interface RestResource {<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> * Identifies the location of the resource bundle for this class.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> *<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <p><a name="line.53"></a>
-<span class="sourceLineNo">054</span> * This annotation is used to provide localized messages for the following methods:<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <ul><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <li>{@link RestRequest#getMessage(String, Object...)}<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <li>{@link RestContext#getMessages()}<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * </ul><a name="line.58"></a>
-<span class="sourceLineNo">059</span> *<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <p><a name="line.60"></a>
-<span class="sourceLineNo">061</span> * Refer to the {@link MessageBundle} class for a description of the message key formats used in the properties file.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> *<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * <p><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * The value can be a relative path like <js>"nls/Messages"</js>, indicating to look for the resource bundle<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * <js>"com.foo.sample.nls.Messages"</js> if the resource class is in <js>"com.foo.sample"</js>, or it can be an<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * absolute path, like <js>"com.foo.sample.nls.Messages"</js><a name="line.66"></a>
-<span class="sourceLineNo">067</span> */<a name="line.67"></a>
-<span class="sourceLineNo">068</span> String messages() default "";<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> * Class-level guards.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> *<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * <p><a name="line.73"></a>
-<span class="sourceLineNo">074</span> * Associates one or more {@link RestGuard RestGuards} with all REST methods defined in this class.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * These guards get called immediately before execution of any REST method in this class.<a name="line.75"></a>
-<span class="sourceLineNo">076</span> *<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * <p><a name="line.77"></a>
-<span class="sourceLineNo">078</span> * Typically, guards will be used for permissions checking on the user making the request, but it can also be used<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * for other purposes like pre-call validation of a request.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> *<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * <p><a name="line.81"></a>
-<span class="sourceLineNo">082</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addGuards(Class...)}/<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * {@link RestConfig#addGuards(RestGuard...)} methods.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> */<a name="line.84"></a>
-<span class="sourceLineNo">085</span> Class<? extends RestGuard>[] guards() default {};<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> * Class-level converters.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> *<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * <p><a name="line.90"></a>
-<span class="sourceLineNo">091</span> * Associates one or more {@link RestConverter converters} with a resource class.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * These converters get called immediately after execution of the REST method in the same order specified in the<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * annotation.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> *<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * <p><a name="line.95"></a>
-<span class="sourceLineNo">096</span> * Can be used for performing post-processing on the response object before serialization.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> *<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * <p><a name="line.98"></a>
-<span class="sourceLineNo">099</span> * Default converter implementations are provided in the <a class='doclink'<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package.<a name="line.100"></a>
-<span class="sourceLineNo">101</span> *<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * <p><a name="line.102"></a>
-<span class="sourceLineNo">103</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addConverters(Class...)}/<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * {@link RestConfig#addConverters(RestConverter...)} methods.<a name="line.104"></a>
-<span class="sourceLineNo">105</span> */<a name="line.105"></a>
-<span class="sourceLineNo">106</span> Class<? extends RestConverter>[] converters() default {};<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> /**<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * Class-level bean filters.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> *<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * <p><a name="line.111"></a>
-<span class="sourceLineNo">112</span> * Shortcut to add bean filters to the bean contexts of the objects returned by the following methods:<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * <ul><a name="line.113"></a>
-<span class="sourceLineNo">114</span> * <li>{@link RestContext#getBeanContext()}<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * <li>{@link RestContext#getSerializers()}<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <li>{@link RestContext#getParsers()}<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * </ul><a name="line.117"></a>
-<span class="sourceLineNo">118</span> *<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * <p><a name="line.119"></a>
-<span class="sourceLineNo">120</span> * If the specified class is an instance of {@link BeanFilterBuilder}, then a filter built from that builder is added.<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * Any other classes are wrapped in a {@link InterfaceBeanFilterBuilder} to indicate that subclasses should be<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * treated as the specified class type.<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> * The programmatic equivalent to this annotation is the {@link RestConfig#addBeanFilters(Class...)} method.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> */<a name="line.126"></a>
-<span class="sourceLineNo">127</span> Class<?>[] beanFilters() default {};<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * Class-level POJO swaps.<a name="line.130"></a>
-<span class="sourceLineNo">131</span> *<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * <p><a name="line.132"></a>
-<span class="sourceLineNo">133</span> * Shortcut to add POJO swaps to the bean contexts of the objects returned by the following methods:<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * <ul><a name="line.134"></a>
-<span class="sourceLineNo">135</span> * <li>{@link RestContext#getBeanContext()}<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * <li>{@link RestContext#getSerializers()}<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * <li>{@link RestContext#getParsers()}<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * </ul><a name="line.138"></a>
-<span class="sourceLineNo">139</span> *<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * <p><a name="line.140"></a>
-<span class="sourceLineNo">141</span> * If the specified class is an instance of {@link PojoSwap}, then that swap is added.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * Any other classes are wrapped in a {@link SurrogateSwap}.<a name="line.142"></a>
-<span class="sourceLineNo">143</span> *<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * <p><a name="line.144"></a>
-<span class="sourceLineNo">145</span> * The programmatic equivalent to this annotation is the {@link RestConfig#addPojoSwaps(Class...)} method.<a name="line.145"></a>
-<span class="sourceLineNo">146</span> */<a name="line.146"></a>
-<span class="sourceLineNo">147</span> Class<?>[] pojoSwaps() default {};<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> * Class-level Java method parameter resolvers.<a name="line.150"></a>
-<span class="sourceLineNo">151</span> *<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * <p><a name="line.152"></a>
-<span class="sourceLineNo">153</span> * By default, the Juneau framework will automatically Java method parameters of various types (e.g.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * <code>RestRequest</code>, <code>Accept</code>, <code>Reader</code>).<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * This annotation allows you to provide your own resolvers for your own class types that you want resolved.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> *<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * <p><a name="line.157"></a>
-<span class="sourceLineNo">158</span> * For example, if you want to pass in instances of <code>MySpecialObject</code> to your Java method, define<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * the following resolver:<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * <p class='bcode'><a name="line.160"></a>
-<span class="sourceLineNo">161</span> * <jk>public class</jk> MyRestParam <jk>extends</jk> RestParam {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> *<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * <jc>// Must have no-arg constructor!</jc><a name="line.163"></a>
-<span class="sourceLineNo">164</span> * <jk>public</jk> MyRestParam() {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> * <jc>// First two parameters help with Swagger doc generation.</jc><a name="line.165"></a>
-<span class="sourceLineNo">166</span> * <jk>super</jk>(<jsf>QUERY</jsf>, <js>"myparam"</js>, MySpecialObject.<jk>class</jk>);<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> * <jc>// The method that creates our object.<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * // In this case, we're taking in a query parameter and converting it to our object.</jc><a name="line.170"></a>
-<span class="sourceLineNo">171</span> * <jk>public</jk> Object resolve(RestRequest req, RestResponse res) <jk>throws</jk> Exception {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * <jk>return new</jk> MySpecialObject(req.getQuery().get(<js>"myparam"</js>));<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> * </p><a name="line.175"></a>
-<span class="sourceLineNo">176</span> *<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * <p><a name="line.177"></a>
-<span class="sourceLineNo">178</span> * <b>Note:</b>{@link RestParam} classes must have no-arg constructors.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> *<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * <p><a name="line.180"></a>
-<span class="sourceLineNo">181</span> * The programmatic equivalent to this annotation is the {@link RestConfig#addParamResolvers(Class...)} method.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> */<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Class<? extends RestParam>[] paramResolvers() default {};<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> * Class-level properties.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> *<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * <p><a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Shortcut for specifying class-level properties on this servlet to the objects returned by the following methods:<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * <ul><a name="line.190"></a>
-<span class="sourceLineNo">191</span> * <li>{@link RestContext#getBeanContext()}<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * <li>{@link RestContext#getSerializers()}<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * <li>{@link RestContext#getParsers()}<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * </ul><a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <p><a name="line.195"></a>
-<span class="sourceLineNo">196</span> * Any of the following property names can be specified:<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * <ul><a name="line.197"></a>
-<span class="sourceLineNo">198</span> * <li>{@link RestContext}<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * <li>{@link BeanContext}<a name="line.199"></a>
-<span class="sourceLineNo">200</span> * <li>{@link SerializerContext}<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * <li>{@link ParserContext}<a name="line.201"></a>
-<span class="sourceLineNo">202</span> * <li>{@link JsonSerializerContext}<a name="line.202"></a>
-<span class="sourceLineNo">203</span> * <li>{@link RdfSerializerContext}<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * <li>{@link RdfParserContext}<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * <li>{@link RdfCommonContext}<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * <li>{@link XmlSerializerContext}<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * <li>{@link XmlParserContext}<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * </ul><a name="line.208"></a>
-<span class="sourceLineNo">209</span> *<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * <p><a name="line.210"></a>
-<span class="sourceLineNo">211</span> * Property values will be converted to the appropriate type.<a name="line.211"></a>
-<span class="sourceLineNo">212</span> *<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * <p><a name="line.213"></a>
-<span class="sourceLineNo">214</span> * In some cases, properties can be overridden at runtime through the<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * {@link RestResponse#setProperty(String, Object)} method or through a {@link Properties @Properties} annotated<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * method parameter.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> *<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * <p><a name="line.218"></a>
-<span class="sourceLineNo">219</span> * The programmatic equivalent to this annotation are the {@link RestConfig#setProperty(String, Object)}/<a name="line.219"></a>
-<span class="sourceLineNo">220</span> * {@link RestConfig#setProperties(java.util.Map)} methods.<a name="line.220"></a>
-<span class="sourceLineNo">221</span> */<a name="line.221"></a>
-<span class="sourceLineNo">222</span> Property[] properties() default {};<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> * Shortcut for setting {@link #properties()} of simple boolean types.<a name="line.225"></a>
-<span class="sourceLineNo">226</span> *<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * <p><a name="line.227"></a>
-<span class="sourceLineNo">228</span> * Setting a flag is equivalent to setting the same property to <js>"true"</js>.<a name="line.228"></a>
-<span class="sourceLineNo">229</span> */<a name="line.229"></a>
-<span class="sourceLineNo">230</span> String[] flags() default {};<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> * Specifies a list of {@link Serializer} classes to add to the list of serializers available for this servlet.<a name="line.233"></a>
-<span class="sourceLineNo">234</span> *<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * <p><a name="line.235"></a>
-<span class="sourceLineNo">236</span> * This annotation can only be used on {@link Serializer} classes that have no-arg constructors.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> *<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * <p><a name="line.238"></a>
-<span class="sourceLineNo">239</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addSerializers(Class...)}/<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * {@link RestConfig#addSerializers(Serializer...)} methods.<a name="line.240"></a>
-<span class="sourceLineNo">241</span> */<a name="line.241"></a>
-<span class="sourceLineNo">242</span> Class<? extends Serializer>[] serializers() default {};<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> /**<a name="line.244"></a>
-<span class="sourceLineNo">245</span> * Specifies a list of {@link Parser} classes to add to the list of parsers available for this servlet.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> *<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * <p><a name="line.247"></a>
-<span class="sourceLineNo">248</span> * This annotation can only be used on {@link Parser} classes that have no-arg constructors.<a name="line.248"></a>
-<span class="sourceLineNo">249</span> *<a name="line.249"></a>
-<span class="sourceLineNo">250</span> * <p><a name="line.250"></a>
-<span class="sourceLineNo">251</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addParsers(Class...)}/<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * {@link RestConfig#addParsers(Parser...)} methods.<a name="line.252"></a>
-<span class="sourceLineNo">253</span> */<a name="line.253"></a>
-<span class="sourceLineNo">254</span> Class<? extends Parser>[] parsers() default {};<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> * Specifies a list of {@link ResponseHandler} classes that know how to convert POJOs returned by REST methods or<a name="line.257"></a>
-<span class="sourceLineNo">258</span> * set via {@link RestResponse#setOutput(Object)} into appropriate HTTP responses.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> *<a name="line.259"></a>
-<span class="sourceLineNo">260</span> * <p><a name="line.260"></a>
-<span class="sourceLineNo">261</span> * See {@link ResponseHandler} for details.<a name="line.261"></a>
-<span class="sourceLineNo">262</span> *<a name="line.262"></a>
-<span class="sourceLineNo">263</span> * <p><a name="line.263"></a>
-<span class="sourceLineNo">264</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addResponseHandlers(Class...)}/<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * {@link RestConfig#addResponseHandlers(ResponseHandler...)} methods.<a name="line.265"></a>
-<span class="sourceLineNo">266</span> */<a name="line.266"></a>
-<span class="sourceLineNo">267</span> Class<? extends ResponseHandler>[] responseHandlers() default {};<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> * Specifies a list of {@link Encoder} to associate with this servlet.<a name="line.270"></a>
-<span class="sourceLineNo">271</span> *<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * <p><a name="line.272"></a>
-<span class="sourceLineNo">273</span> * These can be used to enable various kinds of compression (e.g. <js>"gzip"</js>) on requests and responses.<a name="line.273"></a>
-<span class="sourceLineNo">274</span> *<a name="line.274"></a>
-<span class="sourceLineNo">275</span> * <p><a name="line.275"></a>
-<span class="sourceLineNo">276</span> * This annotation can only be used on {@link Encoder} classes that have no-arg constructors.<a name="line.276"></a>
-<span class="sourceLineNo">277</span> *<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * <h5 class='section'>Example:</h5><a name="line.278"></a>
-<span class="sourceLineNo">279</span> * <p class='bcode'><a name="line.279"></a>
-<span class="sourceLineNo">280</span> * <jc>// Servlet with automated support for GZIP compression</jc><a name="line.280"></a>
-<span class="sourceLineNo">281</span> * <ja>@RestResource</ja>(encoders={GzipEncoder.<jk>class</jk>})<a name="line.281"></a>
-<span class="sourceLineNo">282</span> * <jk>public</jk> MyRestServlet <jk>extends</jk> RestServlet {<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> * </p><a name="line.285"></a>
-<span class="sourceLineNo">286</span> *<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * <p><a name="line.287"></a>
-<span class="sourceLineNo">288</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addEncoders(Class...)}/<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * {@link RestConfig#addEncoders(Encoder...)} methods.<a name="line.289"></a>
-<span class="sourceLineNo">290</span> */<a name="line.290"></a>
-<span class="sourceLineNo">291</span> Class<? extends Encoder>[] encoders() default {};<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> * Specifies default values for request headers.<a name="line.294"></a>
-<span class="sourceLineNo">295</span> *<a name="line.295"></a>
-<span class="sourceLineNo">296</span> * <p><a name="line.296"></a>
-<span class="sourceLineNo">297</span> * Strings are of the format <js>"Header-Name: header-value"</js>.<a name="line.297"></a>
-<span class="sourceLineNo">298</span> *<a name="line.298"></a>
-<span class="sourceLineNo">299</span> * <p><a name="line.299"></a>
-<span class="sourceLineNo">300</span> * Affects values returned by {@link RestRequest#getHeader(String)} when the header is not present on the request.<a name="line.300"></a>
+<span class="sourceLineNo">025</span>import org.apache.juneau.json.*;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.juneau.parser.*;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.juneau.rest.*;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.juneau.serializer.*;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.juneau.transform.*;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.juneau.utils.*;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.juneau.xml.*;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>/**<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * Used to denote that a class is a REST resource and to associate metadata on it.<a name="line.34"></a>
+<span class="sourceLineNo">035</span> *<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * <p><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * Usually used on a subclass of {@link RestServlet}, but can be used to annotate any class that you want to expose as<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * a REST resource.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * Refer to <a class='doclink' href='../package-summary.html#TOC'>org.apache.juneau.rest</a> doc for information on<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * using this class.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> */<a name="line.42"></a>
+<span class="sourceLineNo">043</span>@Documented<a name="line.43"></a>
+<span class="sourceLineNo">044</span>@Target(TYPE)<a name="line.44"></a>
+<span class="sourceLineNo">045</span>@Retention(RUNTIME)<a name="line.45"></a>
+<span class="sourceLineNo">046</span>@Inherited<a name="line.46"></a>
+<span class="sourceLineNo">047</span>public @interface RestResource {<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span> /**<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * Identifies the location of the resource bundle for this class.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> *<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * <p><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * This annotation is used to provide localized messages for the following methods:<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <ul><a name="line.54"></a>
+<span class="sourceLineNo">055</span> * <li>{@link RestRequest#getMessage(String, Object...)}<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <li>{@link RestContext#getMessages()}<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * </ul><a name="line.57"></a>
+<span class="sourceLineNo">058</span> *<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <p><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * Refer to the {@link MessageBundle} class for a description of the message key formats used in the properties file.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> *<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * <p><a name="line.62"></a>
+<span class="sourceLineNo">063</span> * The value can be a relative path like <js>"nls/Messages"</js>, indicating to look for the resource bundle<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * <js>"com.foo.sample.nls.Messages"</js> if the resource class is in <js>"com.foo.sample"</js>, or it can be an<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * absolute path, like <js>"com.foo.sample.nls.Messages"</js><a name="line.65"></a>
+<span class="sourceLineNo">066</span> */<a name="line.66"></a>
+<span class="sourceLineNo">067</span> String messages() default "";<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> * Class-level guards.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> *<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <p><a name="line.72"></a>
+<span class="sourceLineNo">073</span> * Associates one or more {@link RestGuard RestGuards} with all REST methods defined in this class.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * These guards get called immediately before execution of any REST method in this class.<a name="line.74"></a>
+<span class="sourceLineNo">075</span> *<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <p><a name="line.76"></a>
+<span class="sourceLineNo">077</span> * Typically, guards will be used for permissions checking on the user making the request, but it can also be used<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * for other purposes like pre-call validation of a request.<a name="line.78"></a>
+<span class="sourceLineNo">079</span> *<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * <p><a name="line.80"></a>
+<span class="sourceLineNo">081</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addGuards(Class...)}/<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * {@link RestConfig#addGuards(RestGuard...)} methods.<a name="line.82"></a>
+<span class="sourceLineNo">083</span> */<a name="line.83"></a>
+<span class="sourceLineNo">084</span> Class<? extends RestGuard>[] guards() default {};<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> /**<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * Class-level converters.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> *<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * <p><a name="line.89"></a>
+<span class="sourceLineNo">090</span> * Associates one or more {@link RestConverter converters} with a resource class.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * These converters get called immediately after execution of the REST method in the same order specified in the<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * annotation.<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> * Can be used for performing post-processing on the response object before serialization.<a name="line.95"></a>
+<span class="sourceLineNo">096</span> *<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * <p><a name="line.97"></a>
+<span class="sourceLineNo">098</span> * Default converter implementations are provided in the <a class='doclink'<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> *<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * <p><a name="line.101"></a>
+<span class="sourceLineNo">102</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addConverters(Class...)}/<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * {@link RestConfig#addConverters(RestConverter...)} methods.<a name="line.103"></a>
+<span class="sourceLineNo">104</span> */<a name="line.104"></a>
+<span class="sourceLineNo">105</span> Class<? extends RestConverter>[] converters() default {};<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * Class-level bean filters.<a name="line.108"></a>
+<span class="sourceLineNo">109</span> *<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * <p><a name="line.110"></a>
+<span class="sourceLineNo">111</span> * Shortcut to add bean filters to the bean contexts of the objects returned by the following methods:<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * <ul><a name="line.112"></a>
+<span class="sourceLineNo">113</span> * <li>{@link RestContext#getBeanContext()}<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * <li>{@link RestContext#getSerializers()}<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <li>{@link RestContext#getParsers()}<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * </ul><a name="line.116"></a>
+<span class="sourceLineNo">117</span> *<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <p><a name="line.118"></a>
+<span class="sourceLineNo">119</span> * If the specified class is an instance of {@link BeanFilterBuilder}, then a filter built from that builder is added.<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * Any other classes are wrapped in a {@link InterfaceBeanFilterBuilder} to indicate that subclasses should be<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * treated as the specified class type.<a name="line.121"></a>
+<span class="sourceLineNo">122</span> *<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * <p><a name="line.123"></a>
+<span class="sourceLineNo">124</span> * The programmatic equivalent to this annotation is the {@link RestConfig#addBeanFilters(Class...)} method.<a name="line.124"></a>
+<span class="sourceLineNo">125</span> */<a name="line.125"></a>
+<span class="sourceLineNo">126</span> Class<?>[] beanFilters() default {};<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> * Class-level POJO swaps.<a name="line.129"></a>
+<span class="sourceLineNo">130</span> *<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * <p><a name="line.131"></a>
+<span class="sourceLineNo">132</span> * Shortcut to add POJO swaps to the bean contexts of the objects returned by the following methods:<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * <ul><a name="line.133"></a>
+<span class="sourceLineNo">134</span> * <li>{@link RestContext#getBeanContext()}<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * <li>{@link RestContext#getSerializers()}<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * <li>{@link RestContext#getParsers()}<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * </ul><a name="line.137"></a>
+<span class="sourceLineNo">138</span> *<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * <p><a name="line.139"></a>
+<span class="sourceLineNo">140</span> * If the specified class is an instance of {@link PojoSwap}, then that swap is added.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * Any other classes are wrapped in a {@link SurrogateSwap}.<a name="line.141"></a>
+<span class="sourceLineNo">142</span> *<a name="line.142"></a>
+<span class="sourceLineNo">143</span> * <p><a name="line.143"></a>
+<span class="sourceLineNo">144</span> * The programmatic equivalent to this annotation is the {@link RestConfig#addPojoSwaps(Class...)} method.<a name="line.144"></a>
+<span class="sourceLineNo">145</span> */<a name="line.145"></a>
+<span class="sourceLineNo">146</span> Class<?>[] pojoSwaps() default {};<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> * Class-level Java method parameter resolvers.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> *<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * <p><a name="line.151"></a>
+<span class="sourceLineNo">152</span> * By default, the Juneau framework will automatically Java method parameters of various types (e.g.<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * <code>RestRequest</code>, <code>Accept</code>, <code>Reader</code>).<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * This annotation allows you to provide your own resolvers for your own class types that you want resolved.<a name="line.154"></a>
+<span class="sourceLineNo">155</span> *<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * <p><a name="line.156"></a>
+<span class="sourceLineNo">157</span> * For example, if you want to pass in instances of <code>MySpecialObject</code> to your Java method, define<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * the following resolver:<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * <p class='bcode'><a name="line.159"></a>
+<span class="sourceLineNo">160</span> * <jk>public class</jk> MyRestParam <jk>extends</jk> RestParam {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> *<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * <jc>// Must have no-arg constructor!</jc><a name="line.162"></a>
+<span class="sourceLineNo">163</span> * <jk>public</jk> MyRestParam() {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * <jc>// First two parameters help with Swagger doc generation.</jc><a name="line.164"></a>
+<span class="sourceLineNo">165</span> * <jk>super</jk>(<jsf>QUERY</jsf>, <js>"myparam"</js>, MySpecialObject.<jk>class</jk>);<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> * <jc>// The method that creates our object.<a name="line.168"></a>
+<span class="sourceLineNo">169</span> * // In this case, we're taking in a query parameter and converting it to our object.</jc><a name="line.169"></a>
+<span class="sourceLineNo">170</span> * <jk>public</jk> Object resolve(RestRequest req, RestResponse res) <jk>throws</jk> Exception {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * <jk>return new</jk> MySpecialObject(req.getQuery().get(<js>"myparam"</js>));<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> * </p><a name="line.174"></a>
+<span class="sourceLineNo">175</span> *<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * <p><a name="line.176"></a>
+<span class="sourceLineNo">177</span> * <b>Note:</b>{@link RestParam} classes must have no-arg constructors.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> *<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * <p><a name="line.179"></a>
+<span class="sourceLineNo">180</span> * The programmatic equivalent to this annotation is the {@link RestConfig#addParamResolvers(Class...)} method.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> */<a name="line.181"></a>
+<span class="sourceLineNo">182</span> Class<? extends RestParam>[] paramResolvers() default {};<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> * Class-level properties.<a name="line.185"></a>
+<span class="sourceLineNo">186</span> *<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * <p><a name="line.187"></a>
+<span class="sourceLineNo">188</span> * Shortcut for specifying class-level properties on this servlet to the objects returned by the following methods:<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * <ul><a name="line.189"></a>
+<span class="sourceLineNo">190</span> * <li>{@link RestContext#getBeanContext()}<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * <li>{@link RestContext#getSerializers()}<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * <li>{@link RestContext#getParsers()}<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * </ul><a name="line.193"></a>
+<span class="sourceLineNo">194</span> * <p><a name="line.194"></a>
+<span class="sourceLineNo">195</span> * Any of the following property names can be specified:<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * <ul><a name="line.196"></a>
+<span class="sourceLineNo">197</span> * <li>{@link RestContext}<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * <li>{@link BeanContext}<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * <li>{@link SerializerContext}<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * <li>{@link ParserContext}<a name="line.200"></a>
+<span class="sourceLineNo">201</span> * <li>{@link JsonSerializerContext}<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * <li>{@link XmlSerializerContext}<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * <li>{@link XmlParserContext}<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * </ul><a name="line.204"></a>
+<span class="sourceLineNo">205</span> *<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * <p><a name="line.206"></a>
+<span class="sourceLineNo">207</span> * Property values will be converted to the appropriate type.<a name="line.207"></a>
+<span class="sourceLineNo">208</span> *<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * <p><a name="line.209"></a>
+<span class="sourceLineNo">210</span> * In some cases, properties can be overridden at runtime through the<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * {@link RestResponse#setProperty(String, Object)} method or through a {@link Properties @Properties} annotated<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * method parameter.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> *<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * <p><a name="line.214"></a>
+<span class="sourceLineNo">215</span> * The programmatic equivalent to this annotation are the {@link RestConfig#setProperty(String, Object)}/<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * {@link RestConfig#setProperties(java.util.Map)} methods.<a name="line.216"></a>
+<span class="sourceLineNo">217</span> */<a name="line.217"></a>
+<span class="sourceLineNo">218</span> Property[] properties() default {};<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> * Shortcut for setting {@link #properties()} of simple boolean types.<a name="line.221"></a>
+<span class="sourceLineNo">222</span> *<a name="line.222"></a>
+<span class="sourceLineNo">223</span> * <p><a name="line.223"></a>
+<span class="sourceLineNo">224</span> * Setting a flag is equivalent to setting the same property to <js>"true"</js>.<a name="line.224"></a>
+<span class="sourceLineNo">225</span> */<a name="line.225"></a>
+<span class="sourceLineNo">226</span> String[] flags() default {};<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> * Specifies a list of {@link Serializer} classes to add to the list of serializers available for this servlet.<a name="line.229"></a>
+<span class="sourceLineNo">230</span> *<a name="line.230"></a>
+<span class="sourceLineNo">231</span> * <p><a name="line.231"></a>
+<span class="sourceLineNo">232</span> * This annotation can only be used on {@link Serializer} classes that have no-arg constructors.<a name="line.232"></a>
+<span class="sourceLineNo">233</span> *<a name="line.233"></a>
+<span class="sourceLineNo">234</span> * <p><a name="line.234"></a>
+<span class="sourceLineNo">235</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addSerializers(Class...)}/<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * {@link RestConfig#addSerializers(Serializer...)} methods.<a name="line.236"></a>
+<span class="sourceLineNo">237</span> */<a name="line.237"></a>
+<span class="sourceLineNo">238</span> Class<? extends Serializer>[] serializers() default {};<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> * Specifies a list of {@link Parser} classes to add to the list of parsers available for this servlet.<a name="line.241"></a>
+<span class="sourceLineNo">242</span> *<a name="line.242"></a>
+<span class="sourceLineNo">243</span> * <p><a name="line.243"></a>
+<span class="sourceLineNo">244</span> * This annotation can only be used on {@link Parser} classes that have no-arg constructors.<a name="line.244"></a>
+<span class="sourceLineNo">245</span> *<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * <p><a name="line.246"></a>
+<span class="sourceLineNo">247</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addParsers(Class...)}/<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * {@link RestConfig#addParsers(Parser...)} methods.<a name="line.248"></a>
+<span class="sourceLineNo">249</span> */<a name="line.249"></a>
+<span class="sourceLineNo">250</span> Class<? extends Parser>[] parsers() default {};<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> * Specifies a list of {@link ResponseHandler} classes that know how to convert POJOs returned by REST methods or<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * set via {@link RestResponse#setOutput(Object)} into appropriate HTTP responses.<a name="line.254"></a>
+<span class="sourceLineNo">255</span> *<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * <p><a name="line.256"></a>
+<span class="sourceLineNo">257</span> * See {@link ResponseHandler} for details.<a name="line.257"></a>
+<span class="sourceLineNo">258</span> *<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * <p><a name="line.259"></a>
+<span class="sourceLineNo">260</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addResponseHandlers(Class...)}/<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * {@link RestConfig#addResponseHandlers(ResponseHandler...)} methods.<a name="line.261"></a>
+<span class="sourceLineNo">262</span> */<a name="line.262"></a>
+<span class="sourceLineNo">263</span> Class<? extends ResponseHandler>[] responseHandlers() default {};<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span> /**<a name="line.265"></a>
+<span class="sourceLineNo">266</span> * Specifies a list of {@link Encoder} to associate with this servlet.<a name="line.266"></a>
+<span class="sourceLineNo">267</span> *<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * <p><a name="line.268"></a>
+<span class="sourceLineNo">269</span> * These can be used to enable various kinds of compression (e.g. <js>"gzip"</js>) on requests and responses.<a name="line.269"></a>
+<span class="sourceLineNo">270</span> *<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * <p><a name="line.271"></a>
+<span class="sourceLineNo">272</span> * This annotation can only be used on {@link Encoder} classes that have no-arg constructors.<a name="line.272"></a>
+<span class="sourceLineNo">273</span> *<a name="line.273"></a>
+<span class="sourceLineNo">274</span> * <h5 class='section'>Example:</h5><a name="line.274"></a>
+<span class="sourceLineNo">275</span> * <p class='bcode'><a name="line.275"></a>
+<span class="sourceLineNo">276</span> * <jc>// Servlet with automated support for GZIP compression</jc><a name="line.276"></a>
+<span class="sourceLineNo">277</span> * <ja>@RestResource</ja>(encoders={GzipEncoder.<jk>class</jk>})<a name="line.277"></a>
+<span class="sourceLineNo">278</span> * <jk>public</jk> MyRestServlet <jk>extends</jk> RestServlet {<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> * </p><a name="line.281"></a>
+<span class="sourceLineNo">282</span> *<a name="line.282"></a>
+<span class="sourceLineNo">283</span> * <p><a name="line.283"></a>
+<span class="sourceLineNo">284</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addEncoders(Class...)}/<a name="line.284"></a>
+<span class="sourceLineNo">285</span> * {@link RestConfig#addEncoders(Encoder...)} methods.<a name="line.285"></a>
+<span class="sourceLineNo">286</span> */<a name="line.286"></a>
+<span class="sourceLineNo">287</span> Class<? extends Encoder>[] encoders() default {};<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> * Specifies default values for request headers.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> *<a name="line.291"></a>
+<span class="sourceLineNo">292</span> * <p><a name="line.292"></a>
+<span class="sourceLineNo">293</span> * Strings are of the format <js>"Header-Name: header-value"</js>.<a name="line.293"></a>
+<span class="sourceLineNo">294</span> *<a name="line.294"></a>
+<span class="sourceLineNo">295</span> * <p><a name="line.295"></a>
+<span class="sourceLineNo">296</span> * Affects values returned by {@link RestRequest#getHeader(String)} when the header is not present on the request.<a name="line.296"></a>
+<span class="sourceLineNo">297</span> *<a name="line.297"></a>
+<span class="sourceLineNo">298</span> * <p><a name="line.298"></a>
+<span class="sourceLineNo">299</span> * The most useful reason for this annotation is to provide a default <code>Accept</code> header when one is not<a name="line.299"></a>
+<span class="sourceLineNo">300</span> * specified so that a particular default {@link Serializer} is picked.<a name="line.300"></a>
<span class="sourceLineNo">301</span> *<a name="line.301"></a>
<span class="sourceLineNo">302</span> * <p><a name="line.302"></a>
-<span class="sourceLineNo">303</span> * The most useful reason for this annotation is to provide a default <code>Accept</code> header when one is not<a name="line.303"></a>
-<span class="sourceLineNo">304</span> * specified so that a particular default {@link Serializer} is picked.<a name="line.304"></a>
-<span class="sourceLineNo">305</span> *<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * <p><a name="line.306"></a>
-<span class="sourceLineNo">307</span> * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).<a name="line.307"></a>
-<span class="sourceLineNo">308</span> *<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * <h5 class='section'>Example:</h5><a name="line.309"></a>
-<span class="sourceLineNo">310</span> * <p class='bcode'><a name="line.310"></a>
-<span class="sourceLineNo">311</span> * <jc>// Assume "text/json" Accept value when Accept not specified</jc><a name="line.311"></a>
-<span class="sourceLineNo">312</span> * <ja>@RestResource</ja>(defaultRequestHeaders={<js>"Accept: text/json"</js>})<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * <jk>public</jk> MyRestServlet <jk>extends</jk> RestServlet {<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> * </p><a name="line.316"></a>
-<span class="sourceLineNo">317</span> *<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * <p><a name="line.318"></a>
-<span class="sourceLineNo">319</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addDefaultRequestHeader(String, Object)}/<a name="line.319"></a>
-<span class="sourceLineNo">320</span> * {@link RestConfig#addDefaultRequestHeaders(String...)} methods.<a name="line.320"></a>
-<span class="sourceLineNo">321</span> */<a name="line.321"></a>
-<span class="sourceLineNo">322</span> String[] defaultRequestHeaders() default {};<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> * Specifies default values for response headers.<a name="line.325"></a>
-<span class="sourceLineNo">326</span> *<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * <p><a name="line.327"></a>
-<span class="sourceLineNo">328</span> * Strings are of the format <js>"Header-Name: header-value"</js>.<a name="line.328"></a>
+<span class="sourceLineNo">303</span> * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).<a name="line.303"></a>
+<span class="sourceLineNo">304</span> *<a name="line.304"></a>
+<span class="sourceLineNo">305</span> * <h5 class='section'>Example:</h5><a name="line.305"></a>
+<span class="sourceLineNo">306</span> * <p class='bcode'><a name="line.306"></a>
+<span class="sourceLineNo">307</span> * <jc>// Assume "text/json" Accept value when Accept not specified</jc><a name="line.307"></a>
+<span class="sourceLineNo">308</span> * <ja>@RestResource</ja>(defaultRequestHeaders={<js>"Accept: text/json"</js>})<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * <jk>public</jk> MyRestServlet <jk>extends</jk> RestServlet {<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> * </p><a name="line.312"></a>
+<span class="sourceLineNo">313</span> *<a name="line.313"></a>
+<span class="sourceLineNo">314</span> * <p><a name="line.314"></a>
+<span class="sourceLineNo">315</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addDefaultRequestHeader(String, Object)}/<a name="line.315"></a>
+<span class="sourceLineNo">316</span> * {@link RestConfig#addDefaultRequestHeaders(String...)} methods.<a name="line.316"></a>
+<span class="sourceLineNo">317</span> */<a name="line.317"></a>
+<span class="sourceLineNo">318</span> String[] defaultRequestHeaders() default {};<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> * Specifies default values for response headers.<a name="line.321"></a>
+<span class="sourceLineNo">322</span> *<a name="line.322"></a>
+<span class="sourceLineNo">323</span> * <p><a name="line.323"></a>
+<span class="sourceLineNo">324</span> * Strings are of the format <js>"Header-Name: header-value"</js>.<a name="line.324"></a>
+<span class="sourceLineNo">325</span> *<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * <p><a name="line.326"></a>
+<span class="sourceLineNo">327</span> * This is equivalent to calling {@link RestResponse#setHeader(String, String)} programmatically in each of the Java<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * methods.<a name="line.328"></a>
<span class="sourceLineNo">329</span> *<a name="line.329"></a>
<span class="sourceLineNo">330</span> * <p><a name="line.330"></a>
-<span class="sourceLineNo">331</span> * This is equivalent to calling {@link RestResponse#setHeader(String, String)} programmatically in each of the Java<a name="line.331"></a>
-<span class="sourceLineNo">332</span> * methods.<a name="line.332"></a>
-<span class="sourceLineNo">333</span> *<a name="line.333"></a>
-<span class="sourceLineNo">334</span> * <p><a name="line.334"></a>
-<span class="sourceLineNo">335</span> * The header value will not be set if the header value has already been specified (hence the 'default' in the name).<a name="line.335"></a>
-<span class="sourceLineNo">336</span> *<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * <p><a name="line.337"></a>
-<span class="sourceLineNo">338</span> * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).<a name="line.338"></a>
-<span class="sourceLineNo">339</span> *<a name="line.339"></a>
-<span class="sourceLineNo">340</span> * <h5 class='section'>Example:</h5><a name="line.340"></a>
-<span class="sourceLineNo">341</span> * <p class='bcode'><a name="line.341"></a>
-<span class="sourceLineNo">342</span> * <jc>// Add a version header attribute to all responses</jc><a name="line.342"></a>
-<span class="sourceLineNo">343</span> * <ja>@RestResource</ja>(defaultResponseHeaders={<js>"X-Version: 1.0"</js>})<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * <jk>public</jk> MyRestServlet <jk>extends</jk> RestServlet {<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> * </p><a name="line.347"></a>
-<span class="sourceLineNo">348</span> *<a name="line.348"></a>
-<span class="sourceLineNo">349</span> * <p><a name="line.349"></a>
-<span class="sourceLineNo">350</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addDefaultResponseHeader(String, Object)}/<a name="line.350"></a>
-<span class="sourceLineNo">351</span> * {@link RestConfig#addDefaultResponseHeaders(String...)} methods.<a name="line.351"></a>
-<span class="sourceLineNo">352</span> */<a name="line.352"></a>
-<span class="sourceLineNo">353</span> String[] defaultResponseHeaders() default {};<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> * Defines children of this resource.<a name="line.356"></a>
-<span class="sourceLineNo">357</span> *<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * <p><a name="line.358"></a>
-<span class="sourceLineNo">359</span> * A REST child resource is simply another servlet that is initialized as part of the parent resource and has a<a name="line.359"></a>
-<span class="sourceLineNo">360</span> * servlet path directly under the parent servlet path.<a name="line.360"></a>
-<span class="sourceLineNo">361</span> * The main advantage to defining servlets as REST children is that you do not need to define them in the<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * <code>web.xml</code> file of the web application.<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * This can cut down on the number of entries that show up in the <code>web.xml</code> file if you are defining<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * large numbers of servlets.<a name="line.364"></a>
+<span class="sourceLineNo">331</span> * The header value will not be set if the header value has already been specified (hence the 'default' in the name).<a name="line.331"></a>
+<span class="sourceLineNo">332</span> *<a name="line.332"></a>
+<span class="sourceLineNo">333</span> * <p><a name="line.333"></a>
+<span class="sourceLineNo">334</span> * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).<a name="line.334"></a>
+<span class="sourceLineNo">335</span> *<a name="line.335"></a>
+<span class="sourceLineNo">336</span> * <h5 class='section'>Example:</h5><a name="line.336"></a>
+<span class="sourceLineNo">337</span> * <p class='bcode'><a name="line.337"></a>
+<span class="sourceLineNo">338</span> * <jc>// Add a version header attribute to all responses</jc><a name="line.338"></a>
+<span class="sourceLineNo">339</span> * <ja>@RestResource</ja>(defaultResponseHeaders={<js>"X-Version: 1.0"</js>})<a name="line.339"></a>
+<span class="sourceLineNo">340</span> * <jk>public</jk> MyRestServlet <jk>extends</jk> RestServlet {<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> * </p><a name="line.343"></a>
+<span class="sourceLineNo">344</span> *<a name="line.344"></a>
+<span class="sourceLineNo">345</span> * <p><a name="line.345"></a>
+<span class="sourceLineNo">346</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addDefaultResponseHeader(String, Object)}/<a name="line.346"></a>
+<span class="sourceLineNo">347</span> * {@link RestConfig#addDefaultResponseHeaders(String...)} methods.<a name="line.347"></a>
+<span class="sourceLineNo">348</span> */<a name="line.348"></a>
+<span class="sourceLineNo">349</span> String[] defaultResponseHeaders() default {};<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> * Defines children of this resource.<a name="line.352"></a>
+<span class="sourceLineNo">353</span> *<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * <p><a name="line.354"></a>
+<span class="sourceLineNo">355</span> * A REST child resource is simply another servlet that is initialized as part of the parent resource and has a<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * servlet path directly under the parent servlet path.<a name="line.356"></a>
+<span class="sourceLineNo">357</span> * The main advantage to defining servlets as REST children is that you do not need to define them in the<a name="line.357"></a>
+<span class="sourceLineNo">358</span> * <code>web.xml</code> file of the web application.<a name="line.358"></a>
+<span class="sourceLineNo">359</span> * This can cut down on the number of entries that show up in the <code>web.xml</code> file if you are defining<a name="line.359"></a>
+<span class="sourceLineNo">360</span> * large numbers of servlets.<a name="line.360"></a>
+<span class="sourceLineNo">361</span> *<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * <p><a name="line.362"></a>
+<span class="sourceLineNo">363</span> * Child resources must specify a value for {@link #path()} that identifies the subpath of the child resource<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * relative to the parent path.<a name="line.364"></a>
<span class="sourceLineNo">365</span> *<a name="line.365"></a>
<span class="sourceLineNo">366</span> * <p><a name="line.366"></a>
-<span class="sourceLineNo">367</span> * Child resources must specify a value for {@link #path()} that identifies the subpath of the child resource<a name="line.367"></a>
-<span class="sourceLineNo">368</span> * relative to the parent path.<a name="line.368"></a>
+<span class="sourceLineNo">367</span> * It should be noted that servlets can be nested arbitrarily deep using this technique (i.e. children can also have<a name="line.367"></a>
+<span class="sourceLineNo">368</span> * children).<a name="line.368"></a>
<span class="sourceLineNo">369</span> *<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * <p><a name="line.370"></a>
-<span class="sourceLineNo">371</span> * It should be noted that servlets can be nested arbitrarily deep using this technique (i.e. children can also have<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * children).<a name="line.372"></a>
-<span class="sourceLineNo">373</span> *<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * <dl><a name="line.374"></a>
-<span class="sourceLineNo">375</span> * <dt>Servlet initialization:</dt><a name="line.375"></a>
-<span class="sourceLineNo">376</span> * <dd><a name="line.376"></a>
-<span class="sourceLineNo">377</span> * <p><a name="line.377"></a>
-<span class="sourceLineNo">378</span> * A child resource will be initialized immediately after the parent servlet is initialized.<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * The child resource receives the same servlet config as the parent resource.<a name="line.379"></a>
-<span class="sourceLineNo">380</span> * This allows configuration information such as servlet initialization parameters to filter to child<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * resources.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * </p><a name="line.382"></a>
-<span class="sourceLineNo">383</span> * </dd><a name="line.383"></a>
-<span class="sourceLineNo">384</span> * <dt>Runtime behavior:</dt><a name="line.384"></a>
-<span class="sourceLineNo">385</span> * <dd><a name="line.385"></a>
-<span class="sourceLineNo">386</span> * <p><a name="line.386"></a>
-<span class="sourceLineNo">387</span> * As a rule, methods defined on the <code>HttpServletRequest</code> object will behave as if the child<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * servlet were deployed as a top-level resource under the child's servlet path.<a name="line.388"></a>
-<span class="sourceLineNo">389</span> * For example, the <code>getServletPath()</code> and <code>getPathInfo()</code> methods on the<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * <code>HttpServletRequest</code> object will behave as if the child resource were deployed using the<a name="line.390"></a>
-<span class="sourceLineNo">391</span> * child's servlet path.<a name="line.391"></a>
-<span class="sourceLineNo">392</span> * Therefore, the runtime behavior should be equivalent to deploying the child servlet in the<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * <code>web.xml</code> file of the web application.<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * </p><a name="line.394"></a>
-<span class="sourceLineNo">395</span> * </dd><a name="line.395"></a>
-<span class="sourceLineNo">396</span> * </dl><a name="line.396"></a>
-<span class="sourceLineNo">397</span> *<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * <p><a name="line.398"></a>
-<span class="sourceLineNo">399</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addChildResource(String, Object)}/<a name="line.399"></a>
-<span class="sourceLineNo">400</span> * {@link RestConfig#addChildResources(Class...)}/{@link RestConfig#addChildResources(Object...)} methods.<a name="line.400"></a>
-<span class="sourceLineNo">401</span> */<a name="line.401"></a>
-<span class="sourceLineNo">402</span> Class<?>[] children() default {};<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> * Identifies the URL subpath relative to the parent resource.<a name="line.405"></a>
-<span class="sourceLineNo">406</span> *<a name="line.406"></a>
-<span class="sourceLineNo">407</span> * <p><a name="line.407"></a>
-<span class="sourceLineNo">408</span> * Typically, this annotation is only applicable to resources defined as children through the {@link #children()}<a name="line.408"></a>
-<span class="sourceLineNo">409</span> * annotation.<a name="line.409"></a>
-<span class="sourceLineNo">410</span> * However, it may be used in other ways (e.g. defining paths for top-level resources in microservices).<a name="line.410"></a>
+<span class="sourceLineNo">370</span> * <dl><a name="line.370"></a>
+<span class="sourceLineNo">371</span> * <dt>Servlet initialization:</dt><a name="line.371"></a>
+<span class="sourceLineNo">372</span> * <dd><a name="line.372"></a>
+<span class="sourceLineNo">373</span> * <p><a name="line.373"></a>
+<span class="sourceLineNo">374</span> * A child resource will be initialized immediately after the parent servlet is initialized.<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * The child resource receives the same servlet config as the parent resource.<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * This allows configuration information such as servlet initialization parameters to filter to child<a name="line.376"></a>
+<span class="sourceLineNo">377</span> * resources.<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * </p><a name="line.378"></a>
+<span class="sourceLineNo">379</span> * </dd><a name="line.379"></a>
+<span class="sourceLineNo">380</span> * <dt>Runtime behavior:</dt><a name="line.380"></a>
+<span class="sourceLineNo">381</span> * <dd><a name="line.381"></a>
+<span class="sourceLineNo">382</span> * <p><a name="line.382"></a>
+<span class="sourceLineNo">383</span> * As a rule, methods defined on the <code>HttpServletRequest</code> object will behave as if the child<a name="line.383"></a>
+<span class="sourceLineNo">384</span> * servlet were deployed as a top-level resource under the child's servlet path.<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * For example, the <code>getServletPath()</code> and <code>getPathInfo()</code> methods on the<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * <code>HttpServletRequest</code> object will behave as if the child resource were deployed using the<a name="line.386"></a>
+<span class="sourceLineNo">387</span> * child's servlet path.<a name="line.387"></a>
+<span class="sourceLineNo">388</span> * Therefore, the runtime behavior should be equivalent to deploying the child servlet in the<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * <code>web.xml</code> file of the web application.<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * </p><a name="line.390"></a>
+<span class="sourceLineNo">391</span> * </dd><a name="line.391"></a>
+<span class="sourceLineNo">392</span> * </dl><a name="line.392"></a>
+<span class="sourceLineNo">393</span> *<a name="line.393"></a>
+<span class="sourceLineNo">394</span> * <p><a name="line.394"></a>
+<span class="sourceLineNo">395</span> * The programmatic equivalent to this annotation are the {@link RestConfig#addChildResource(String, Object)}/<a name="line.395"></a>
+<span class="sourceLineNo">396</span> * {@link RestConfig#addChildResources(Class...)}/{@link RestConfig#addChildResources(Object...)} methods.<a name="line.396"></a>
+<span class="sourceLineNo">397</span> */<a name="line.397"></a>
+<span class="sourceLineNo">398</span> Class<?>[] children() default {};<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> * Identifies the URL subpath relative to the parent resource.<a name="line.401"></a>
+<span class="sourceLineNo">402</span> *<a name="line.402"></a>
+<span class="sourceLineNo">403</span> * <p><a name="line.403"></a>
+<span class="sourceLineNo">404</span> * Typically, this annotation is only applicable to resources defined as children through the {@link #children()}<a name="line.404"></a>
+<span class="sourceLineNo">405</span> * annotation.<a name="line.405"></a>
+<span class="sourceLineNo">406</span> * However, it may be used in other ways (e.g. defining paths for top-level resources in microservices).<a name="line.406"></a>
+<span class="sourceLineNo">407</span> *<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * <p><a name="line.408"></a>
+<span class="sourceLineNo">409</span> * This annotation is ignored on top-level servlets (i.e. servlets defined in <code>web.xml</code> files).<a name="line.409"></a>
+<span class="sourceLineNo">410</span> * Therefore, implementers can optionally specify a path value for documentation purposes.<a name="line.410"></a>
<span class="sourceLineNo">411</span> *<a name="line.411"></a>
<span class="sourceLineNo">412</span> * <p><a name="line.412"></a>
-<span class="sourceLineNo">413</span> * This annotation is ignored on top-level servlets (i.e. servlets defined in <code>web.xml</code> files).<a name="line.413"></a>
-<span class="sourceLineNo">414</span> * Therefore, implementers can optionally specify a path value for documentation purposes.<a name="line.414"></a>
-<span class="sourceLineNo">415</span> *<a name="line.415"></a>
-<span class="sourceLineNo">416</span> * <p><a name="line.416"></a>
-<span class="sourceLineNo">417</span> * The programmatic equivalent to this annotation is the {@link RestConfig#setPath(String)} method.<a name="line.417"></a>
-<span class="sourceLineNo">418</span> */<a name="line.418"></a>
-<span class="sourceLineNo">419</span> String path() default "";<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> /**<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * Optional site name.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> *<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * <p><a name="line.424"></a>
-<span class="sourceLineNo">425</span> * The site name is intended to be a title that can be applied to the entire site.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> *<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * <p><a name="line.427"></a>
-<span class="sourceLineNo">428</span> * This value can be retrieved programmatically through the {@link RestRequest#getSiteName()} method.<a name="line.428"></a>
-<span class="sourceLineNo">429</span> *<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * <p><a name="line.430"></a>
-<span class="sourceLineNo">431</span> * One possible use is if you want to add the same title to the top of all pages by defining a header on a<a name="line.431"></a>
-<span class="sourceLineNo">432</span> * common parent class like so:<a name="line.432"></a>
-<span class="sourceLineNo">433</span> * <p class='bcode'><a name="line.433"></a>
-<span class="sourceLineNo">434</span> * htmldoc=<ja>@HtmlDoc</ja>(<a name="line.434"></a>
-<span class="sourceLineNo">435</span> * header={<a name="line.435"></a>
-<span class="sourceLineNo">436</span> * <js>"&lt;h1&gt;$R{siteName}&lt;/h1&gt;"</js>,<a name="line.436"></a>
-<span class="sourceLineNo">437</span> * <js>"&lt;h2&gt;$R{servletTitle}&lt;/h2&gt;"</js><a name="line.437"></a>
-<span class="sourceLineNo">438</span> * }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> * )<a name="line.439"></a>
-<span class="sourceLineNo">440</span> * </p><a name="line.440"></a>
+<span class="sourceLineNo">413</span> * The programmatic equivalent to this annotation is the {@link RestConfig#setPath(String)} method.<a name="line.413"></a>
+<span class="sourceLineNo">414</span> */<a name="line.414"></a>
+<span class="sourceLineNo">415</span> String path() default "";<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> * Optional site name.<a name="line.418"></a>
+<span class="sourceLineNo">419</span> *<a name="line.419"></a>
+<span class="sourceLineNo">420</span> * <p><a name="line.420"></a>
+<span class="sourceLineNo">421</span> * The site name is intended to be a title that can be applied to the entire site.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> *<a name="line.422"></a>
+<span class="sourceLineNo">423</span> * <p><a name="line.423"></a>
+<span class="sourceLineNo">424</span> * This value can be retrieved programmatically through the {@link RestRequest#getSiteName()} method.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> *<a name="line.425"></a>
+<span class="sourceLineNo">426</span> * <p><a name="line.426"></a>
+<span class="sourceLineNo">427</span> * One possible use is if you want to add the same title to the top of all pages by defining a header on a<a name="line.427"></a>
+<span class="sourceLineNo">428</span> * common parent class like so:<a name="line.428"></a>
+<span class="sourceLineNo">429</span> * <p class='bcode'><a name="line.429"></a>
+<span class="sourceLineNo">430</span> * htmldoc=<ja>@HtmlDoc</ja>(<a name="line.430"></a>
+<span class="sourceLineNo">431</span> * header={<a name="line.431"></a>
+<span class="sourceLineNo">432</span> * <js>"&lt;h1&gt;$R{siteName}&lt;/h1&gt;"</js>,<a name="line.432"></a>
+<span class="sourceLineNo">433</span> * <js>"&lt;h2&gt;$R{servletTitle}&lt;/h2&gt;"</js><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> * </p><a name="line.436"></a>
+<span class="sourceLineNo">437</span> *<a name="line.437"></a>
+<span class="sourceLineNo">438</span> * <p><a name="line.438"></a>
+<span class="sourceLineNo">439</span> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).<a name="line.439"></a>
+<span class="sourceLineNo">440</span> * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.440"></a>
<span class="sourceLineNo">441</span> *<a name="line.441"></a>
<span class="sourceLineNo">442</span> * <p><a name="line.442"></a>
-<span class="sourceLineNo">443</span> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).<a name="line.443"></a>
-<span class="sourceLineNo">444</span> * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.444"></a>
-<span class="sourceLineNo">445</span> *<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * <p><a name="line.446"></a>
-<span class="sourceLineNo">447</span> * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getSiteName(RestRequest)} method.<a name="line.447"></a>
-<span class="sourceLineNo">448</span> */<a name="line.448"></a>
-<span class="sourceLineNo">449</span> String siteName() default "";<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> * Optional servlet title.<a name="line.452"></a>
+<span class="sourceLineNo">443</span> * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getSiteName(RestRequest)} method.<a name="line.443"></a>
+<span class="sourceLineNo">444</span> */<a name="line.444"></a>
+<span class="sourceLineNo">445</span> String siteName() default "";<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span> /**<a name="line.447"></a>
+<span class="sourceLineNo">448</span> * Optional servlet title.<a name="line.448"></a>
+<span class="sourceLineNo">449</span> *<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * <p><a name="line.450"></a>
+<span class="sourceLineNo">451</span> * It is used to populate the Swagger title field.<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * This value can be retrieved programmatically through the {@link RestRequest#getServletTitle()} method.<a name="line.452"></a>
<span class="sourceLineNo">453</span> *<a name="line.453"></a>
<span class="sourceLineNo">454</span> * <p><a name="line.454"></a>
-<span class="sourceLineNo">455</span> * It is used to populate the Swagger title field.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * This value can be retrieved programmatically through the {@link RestRequest#getServletTitle()} method.<a name="line.456"></a>
+<span class="sourceLineNo">455</span> * The default value pulls the label from the <code>label</code> entry in the servlet resource bundle.<a name="line.455"></a>
+<span class="sourceLineNo">456</span> * (e.g. <js>"title = foo"</js> or <js>"MyServlet.title = foo"</js>).<a name="line.456"></a>
<span class="sourceLineNo">457</span> *<a name="line.457"></a>
<span class="sourceLineNo">458</span> * <p><a name="line.458"></a>
-<span class="sourceLineNo">459</span> * The default value pulls the label from the <code>label</code> entry in the servlet resource bundle.<a name="line.459"></a>
<TRUNCATED>
[17/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/Microservice.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/Microservice.html b/content/site/apidocs/org/apache/juneau/microservice/Microservice.html
index 4fc588b..96fcc2e 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/Microservice.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/Microservice.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":9,"i2":9,"i3":9,"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 methods = {"i0":10,"i1":9,"i2":9,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":9,"i11":10,"i12":9,"i13":9,"i14":9,"i15":10,"i16":10,"i17":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";
@@ -286,7 +286,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</td>
</tr>
<tr id="i10" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></code></td>
+<td class="colFirst"><code>static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/Microservice.html#setConfig-org.apache.juneau.ini.ConfigFile-">setConfig</a></span>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</code>
<div class="block">Specifies the config file for this microservice.</div>
</td>
@@ -299,20 +299,20 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</td>
</tr>
<tr id="i12" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></code></td>
+<td class="colFirst"><code>static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.lang.Class-">setManifest</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</code>
<div class="block">Same as <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>setManifest(Manifest)</code></a> except finds and loads the manifest file of the jar file that the
specified class is contained within.</div>
</td>
</tr>
<tr id="i13" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></code></td>
+<td class="colFirst"><code>static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.io.File-">setManifest</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)</code>
<div class="block">Same as <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>setManifest(Manifest)</code></a> except specified through a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a> object.</div>
</td>
</tr>
<tr id="i14" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></code></td>
+<td class="colFirst"><code>static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-">setManifest</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/jar/Manifest.html?is-external=true" title="class or interface in java.util.jar">Manifest</a> mf)</code>
<div class="block">Specifies the manifest file of the jar file this microservice is contained within.</div>
</td>
@@ -421,7 +421,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>setConfig</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.162">setConfig</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.161">setConfig</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
<div class="block">Specifies the config file for this microservice.
<p>
@@ -430,8 +430,6 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>cf</code> - The config file for this application, or <jk>null</jk> if no config file is needed.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>This object (for method chaining).</dd>
</dl>
</li>
</ul>
@@ -441,7 +439,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>setManifest</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.182">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/jar/Manifest.html?is-external=true" title="class or interface in java.util.jar">Manifest</a> mf)</pre>
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.179">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/jar/Manifest.html?is-external=true" title="class or interface in java.util.jar">Manifest</a> mf)</pre>
<div class="block">Specifies the manifest file of the jar file this microservice is contained within.
<p>
@@ -455,8 +453,6 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>mf</code> - The manifest file of this microservice.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>This object (for method chaining).</dd>
</dl>
</li>
</ul>
@@ -466,7 +462,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>setManifestContents</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.194">setManifestContents</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... contents)
+<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.190">setManifestContents</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... contents)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Convenience method for specifying the manifest contents directly.</div>
<dl>
@@ -485,14 +481,12 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>setManifest</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.207">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.202">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)
+ throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>setManifest(Manifest)</code></a> except specified through a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a> object.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>f</code> - The manifest file of this microservice.</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="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If a problem occurred while trying to read the manifest file.</dd>
</dl>
@@ -504,15 +498,13 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>setManifest</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.220">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)
- 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>
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.213">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)
+ 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/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>setManifest(Manifest)</code></a> except finds and loads the manifest file of the jar file that the
specified class is contained within.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>c</code> - The class whose jar file contains the manifest to use for this microservice.</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="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If a problem occurred while trying to read the manifest file.</dd>
</dl>
@@ -524,7 +516,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>createVarResolver</h4>
-<pre>protected <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.274">createVarResolver</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.266">createVarResolver</a>()</pre>
<div class="block">Creates the <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a> used to resolve variables in the config file returned by <a href="../../../../org/apache/juneau/microservice/Microservice.html#getConfig--"><code>getConfig()</code></a>.
<p>
@@ -582,7 +574,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getArgs</h4>
-<pre>protected static <a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils">Args</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.296">getArgs</a>()</pre>
+<pre>protected static <a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils">Args</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.288">getArgs</a>()</pre>
<div class="block">Returns the command-line arguments passed into the application.
<p>
@@ -602,7 +594,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getConfig</h4>
-<pre>protected static <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.393">getConfig</a>()</pre>
+<pre>protected static <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.385">getConfig</a>()</pre>
<div class="block">Returns the external INI-style configuration file that can be used to configure your microservice.
<p>
@@ -704,7 +696,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getManifest</h4>
-<pre>protected static <a href="../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils">ManifestFile</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.417">getManifest</a>()</pre>
+<pre>protected static <a href="../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils">ManifestFile</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.409">getManifest</a>()</pre>
<div class="block">Returns the main jar manifest file contents as a simple <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><code>ObjectMap</code></a>.
<p>
@@ -733,7 +725,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>start</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.438">start</a>()
+<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.430">start</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">Start this application.
@@ -756,7 +748,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>join</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.569">join</a>()
+<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.561">join</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Joins the application with the current thread.
@@ -776,7 +768,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>stop</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.584">stop</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.576">stop</a>()</pre>
<div class="block">Stop this application.
<p>
@@ -796,7 +788,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>kill</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.592">kill</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.584">kill</a>()</pre>
<div class="block">Kill the JVM by calling <code>System.exit(2);</code>.</div>
</li>
</ul>
@@ -806,7 +798,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>onStart</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.609">onStart</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.601">onStart</a>()</pre>
<div class="block">Called at the beginning of the <a href="../../../../org/apache/juneau/microservice/Microservice.html#start--"><code>start()</code></a> call.
<p>
@@ -819,7 +811,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>onStop</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.617">onStop</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.609">onStop</a>()</pre>
<div class="block">Called at the end of the <a href="../../../../org/apache/juneau/microservice/Microservice.html#stop--"><code>stop()</code></a> call.
<p>
@@ -832,7 +824,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>onConfigSave</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.627">onConfigSave</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.619">onConfigSave</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
<div class="block">Called if the <a href="../../../../org/apache/juneau/ini/ConfigFile.html#save--"><code>ConfigFile.save()</code></a> is called on the config file.
<p>
@@ -849,7 +841,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>onConfigChange</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.638">onConfigChange</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf,
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.630">onConfigChange</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> changes)</pre>
<div class="block">Called if one or more changes occur in the config file.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/Resource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/Resource.html b/content/site/apidocs/org/apache/juneau/microservice/Resource.html
index 3a91145..5f4f7dc 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/Resource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/Resource.html
@@ -132,7 +132,7 @@ var activeTableTab = "activeTableTab";
</dl>
<dl>
<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources">ConfigResource</a>, <a href="../../../../org/apache/juneau/microservice/resources/DirectoryResource.html" title="class in org.apache.juneau.microservice.resources">DirectoryResource</a>, <a href="../../../../org/apache/juneau/microservice/resources/LogsResource.html" title="class in org.apache.juneau.microservice.resources">LogsResource</a>, <a href="../../../../org/apache/juneau/microservice/resources/ShutdownResource.html" title="class in org.apache.juneau.microservice.resources">ShutdownResource</a></dd>
+<dd><a href="../../../../org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources">ConfigResource</a>, <a href="../../../../org/apache/juneau/microservice/resources/DirectoryResource.html" title="class in org.apache.juneau.microservice.resources">DirectoryResource</a>, <a href="../../../../org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample">HelloWorldResource</a>, <a href="../../../../org/apache/juneau/microservice/resources/LogsResource.html" title="class in org.apache.juneau.microservice.resources">LogsResource</a>, <a href="../../../../org/apache/juneau/microservice/resources/ShutdownResource.html" title="class in org.apache.juneau.microservice.resources">ShutdownResource</a></dd>
</dl>
<hr>
<br>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html b/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
index 8f30bb6..37f0922 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
@@ -137,7 +137,7 @@ var activeTableTab = "activeTableTab";
</dl>
<dl>
<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/microservice/resources/SampleRootResource.html" title="class in org.apache.juneau.microservice.resources">SampleRootResource</a></dd>
+<dd><a href="../../../../org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample">RootResources</a>, <a href="../../../../org/apache/juneau/microservice/resources/SampleRootResource.html" title="class in org.apache.juneau.microservice.resources">SampleRootResource</a></dd>
</dl>
<hr>
<br>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html b/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
index 90def9e..85c7772 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
@@ -70,7 +70,7 @@
<li>Nested | </li>
<li>Field | </li>
<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#methods.inherited.from.class.org.apache.juneau.rest.jena.RestServletJenaDefault">Method</a></li>
+<li><a href="#methods.inherited.from.class.org.apache.juneau.rest.RestServletDefault">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
@@ -102,7 +102,7 @@
<li><a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServlet</a></li>
<li>
<ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">org.apache.juneau.rest.jena.RestServletJenaDefault</a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletDefault</a></li>
<li>
<ul class="inheritance">
<li>org.apache.juneau.microservice.ResourceJena</li>
@@ -127,9 +127,11 @@
<hr>
<br>
<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#htmldoc--">htmldoc</a>=,
- <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#config--">config</a>="$S{juneau.configFile}")
-public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJena.html#line.32">ResourceJena</a>
-extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a></pre>
+ <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#config--">config</a>="$S{juneau.configFile}",
+ <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#serializers--">serializers</a>={<a href="../../../../org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in org.apache.juneau.jena">RdfSerializer.Xml.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html" title="class in org.apache.juneau.jena">RdfSerializer.XmlAbbrev.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.Turtle.html" title="class in org.apache.juneau.jena">RdfSerializer.Turtle.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.NTriple.html" title="class in org.apache.juneau.jena">RdfSerializer.NTriple.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.N3.html" title="class in org.apache.juneau.jena">RdfSerializer.N3.class</a>},
+ <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#parsers--">parsers</a>={<a href="../../../../org/apache/juneau/jena/RdfParser.Xml.html" title="class in org.apache.juneau.jena">RdfParser.Xml.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.Turtle.html" title="class in org.apache.juneau.jena">RdfParser.Turtle.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.NTriple.html" title="class in org.apache.juneau.jena">RdfParser.NTriple.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.N3.html" title="class in org.apache.juneau.jena">RdfParser.N3.class</a>})
+public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJena.html#line.46">ResourceJena</a>
+extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></pre>
<div class="block">Superclass for all REST resources with RDF support.</div>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
@@ -165,11 +167,11 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.
</a>
<h3>Method Summary</h3>
<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.jena.RestServletJenaDefault">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletDefault">
<!-- -->
</a>
-<h3>Methods inherited from class org.apache.juneau.rest.jena.<a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a></h3>
-<code><a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions</a></code></li>
+<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></h3>
+<code><a href="../../../../org/apache/juneau/rest/RestServletDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServlet">
@@ -219,7 +221,7 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.
<ul class="blockListLast">
<li class="blockList">
<h4>ResourceJena</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJena.html#line.32">ResourceJena</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJena.html#line.46">ResourceJena</a>()</pre>
</li>
</ul>
</li>
@@ -277,7 +279,7 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.
<li>Nested | </li>
<li>Field | </li>
<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#methods.inherited.from.class.org.apache.juneau.rest.jena.RestServletJenaDefault">Method</a></li>
+<li><a href="#methods.inherited.from.class.org.apache.juneau.rest.RestServletDefault">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html b/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html
index 1a424d9..39f769b 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html
@@ -108,10 +108,10 @@ var activeTableTab = "activeTableTab";
<li><a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServlet</a></li>
<li>
<ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">org.apache.juneau.rest.jena.RestServletJenaDefault</a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletDefault</a></li>
<li>
<ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">org.apache.juneau.rest.jena.RestServletJenaGroupDefault</a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletGroupDefault</a></li>
<li>
<ul class="inheritance">
<li>org.apache.juneau.microservice.ResourceJenaGroup</li>
@@ -138,9 +138,11 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#htmldoc--">htmldoc</a>=,
- <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#config--">config</a>="$S{juneau.configFile}")
-public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.59">ResourceJenaGroup</a>
-extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaGroupDefault</a></pre>
+ <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#config--">config</a>="$S{juneau.configFile}",
+ <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#serializers--">serializers</a>={<a href="../../../../org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in org.apache.juneau.jena">RdfSerializer.Xml.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html" title="class in org.apache.juneau.jena">RdfSerializer.XmlAbbrev.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.Turtle.html" title="class in org.apache.juneau.jena">RdfSerializer.Turtle.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.NTriple.html" title="class in org.apache.juneau.jena">RdfSerializer.NTriple.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.N3.html" title="class in org.apache.juneau.jena">RdfSerializer.N3.class</a>},
+ <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#parsers--">parsers</a>={<a href="../../../../org/apache/juneau/jena/RdfParser.Xml.html" title="class in org.apache.juneau.jena">RdfParser.Xml.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.Turtle.html" title="class in org.apache.juneau.jena">RdfParser.Turtle.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.NTriple.html" title="class in org.apache.juneau.jena">RdfParser.NTriple.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.N3.html" title="class in org.apache.juneau.jena">RdfParser.N3.class</a>})
+public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.72">ResourceJenaGroup</a>
+extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></pre>
<div class="block">Superclass for all REST resource groups.
<p>
@@ -211,18 +213,18 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDef
</tr>
</table>
<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.jena.RestServletJenaGroupDefault">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletGroupDefault">
<!-- -->
</a>
-<h3>Methods inherited from class org.apache.juneau.rest.jena.<a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaGroupDefault</a></h3>
-<code><a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html#getChildren-org.apache.juneau.rest.RestRequest-">getChildren</a></code></li>
+<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></h3>
+<code><a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html#getChildren-org.apache.juneau.rest.RestRequest-">getChildren</a></code></li>
</ul>
<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.jena.RestServletJenaDefault">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletDefault">
<!-- -->
</a>
-<h3>Methods inherited from class org.apache.juneau.rest.jena.<a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a></h3>
-<code><a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions</a></code></li>
+<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></h3>
+<code><a href="../../../../org/apache/juneau/rest/RestServletDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServlet">
@@ -272,7 +274,7 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDef
<ul class="blockListLast">
<li class="blockList">
<h4>ResourceJenaGroup</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.59">ResourceJenaGroup</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.72">ResourceJenaGroup</a>()</pre>
</li>
</ul>
</li>
@@ -290,7 +292,7 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDef
<li class="blockList">
<h4>addConfigVars</h4>
<pre><a href="../../../../org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation">@RestHook</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestHook.html#value--">value</a>=<a href="../../../../org/apache/juneau/rest/annotation/HookEvent.html#INIT">INIT</a>)
-public void <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.68">addConfigVars</a>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)
+public void <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.81">addConfigVars</a>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Add <code>$ARGS</code> and <code>$MF</code> variable resolvers.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/RestMicroservice.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/RestMicroservice.html b/content/site/apidocs/org/apache/juneau/microservice/RestMicroservice.html
index dad42fa..f8c7329 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/RestMicroservice.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/RestMicroservice.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":9,"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};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":9,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static 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/microservice/RestMicroservice.html#line.74">RestMicroservice</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.73">RestMicroservice</a>
extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></pre>
<div class="block">Entry point for Juneau microservice that implements a REST interface using Jetty on a single port.
@@ -287,61 +287,36 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
</tr>
<tr id="i16" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#setConfig-org.apache.juneau.ini.ConfigFile-">setConfig</a></span>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</code>
-<div class="block">Specifies the config file for this microservice.</div>
-</td>
-</tr>
-<tr id="i17" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#setConfig-java.lang.String-boolean-">setConfig</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> cfPath,
boolean create)</code>
<div class="block">Specifies the path of the config file for this microservice.</div>
</td>
</tr>
-<tr id="i18" class="altColor">
+<tr id="i17" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#setJettyXml-java.lang.Object-">setJettyXml</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> jettyXml)</code>
<div class="block">Sets the <code>jetty.xml</code> used to configure the Jetty server.</div>
</td>
</tr>
-<tr id="i19" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#setManifest-java.lang.Class-">setManifest</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</code>
-<div class="block">Same as <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>Microservice.setManifest(Manifest)</code></a> except finds and loads the manifest file of the jar file that the
- specified class is contained within.</div>
-</td>
-</tr>
-<tr id="i20" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#setManifest-java.io.File-">setManifest</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)</code>
-<div class="block">Same as <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>Microservice.setManifest(Manifest)</code></a> except specified through a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a> object.</div>
-</td>
-</tr>
-<tr id="i21" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#setManifest-java.util.jar.Manifest-">setManifest</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/jar/Manifest.html?is-external=true" title="class or interface in java.util.jar">Manifest</a> mf)</code>
-<div class="block">Specifies the manifest file of the jar file this microservice is contained within.</div>
-</td>
-</tr>
-<tr id="i22" class="altColor">
+<tr id="i18" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#setManifestContents-java.lang.String...-">setManifestContents</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>... contents)</code>
<div class="block">Convenience method for specifying the manifest contents directly.</div>
</td>
</tr>
-<tr id="i23" class="rowColor">
+<tr id="i19" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#start--">start</a></span>()</code>
<div class="block">Start this application.</div>
</td>
</tr>
-<tr id="i24" class="altColor">
+<tr id="i20" class="altColor">
<td class="colFirst"><code>protected int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#startServer--">startServer</a></span>()</code>
<div class="block">Method used to start the Jetty server created by <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#createServer--"><code>createServer()</code></a>.</div>
</td>
</tr>
-<tr id="i25" class="rowColor">
+<tr id="i21" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#stop--">stop</a></span>()</code>
<div class="block">Stop this application.</div>
@@ -353,7 +328,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.microservice.<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></h3>
-<code><a href="../../../../org/apache/juneau/microservice/Microservice.html#createVarResolver--">createVarResolver</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#getArgs--">getArgs</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#getConfig--">getConfig</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#getManifest--">getManifest</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#kill--">kill</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#onConfigChange-org.apache.juneau.ini.ConfigFile-java.util.Set-">onConfigChange</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#onStart--">onStart</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#onStop--">onStop</a></code></li>
+<code><a href="../../../../org/apache/juneau/microservice/Microservice.html#createVarResolver--">createVarResolver</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#getArgs--">getArgs</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#getConfig--">getConfig</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#getManifest--">getManifest</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#kill--">kill</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#onConfigChange-org.apache.juneau.ini.ConfigFile-java.util.Set-">onConfigChange</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#onStart--">onStart</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#onStop--">onStop</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#setConfig-org.apache.juneau.ini.ConfigFile-">setConfig</a>, <a href="../../../../org/
apache/juneau/microservice/Microservice.html#setManifest-java.lang.Class-">setManifest</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.io.File-">setManifest</a>, <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-">setManifest</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -382,7 +357,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockListLast">
<li class="blockList">
<h4>RestMicroservice</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.102">RestMicroservice</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... args)
+<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.101">RestMicroservice</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Constructor.</div>
<dl>
@@ -407,7 +382,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>main</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.92">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.91">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
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">Main method.
@@ -427,7 +402,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>start</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.112">start</a>()
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.111">start</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: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#start--">Microservice</a></code></span></div>
<div class="block">Start this application.
@@ -453,7 +428,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>join</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.126">join</a>()
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.125">join</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#join--">Microservice</a></code></span></div>
<div class="block">Joins the application with the current thread.
@@ -476,7 +451,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>stop</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.132">stop</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.131">stop</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#stop--">Microservice</a></code></span></div>
<div class="block">Stop this application.
@@ -499,7 +474,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>getPort</h4>
-<pre>public int <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.168">getPort</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.167">getPort</a>()</pre>
<div class="block">Returns the port that this microservice started up on.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -513,7 +488,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>getURI</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.176">getURI</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.175">getURI</a>()</pre>
<div class="block">Returns the URI where this microservice is listening on.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -527,7 +502,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>initLogging</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.263">initLogging</a>()
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.262">initLogging</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">Initialize the logging for this microservice.
@@ -610,7 +585,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>createServer</h4>
-<pre>protected org.eclipse.jetty.server.Server <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.324">createServer</a>()
+<pre>protected org.eclipse.jetty.server.Server <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.323">createServer</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">Method used to create (but not start) an instance of a Jetty server.
@@ -652,7 +627,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>addServlet</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.381">addServlet</a>(<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a> servlet,
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.380">addServlet</a>(<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a> servlet,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pathSpec)</pre>
<div class="block">Adds an arbitrary servlet to this microservice.</div>
<dl>
@@ -672,7 +647,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>addServletAttribute</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.397">addServletAttribute</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.396">addServletAttribute</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Adds a servlet attribute to the Jetty server.</div>
<dl>
@@ -692,7 +667,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>getServer</h4>
-<pre>public org.eclipse.jetty.server.Server <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.409">getServer</a>()</pre>
+<pre>public org.eclipse.jetty.server.Server <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.408">getServer</a>()</pre>
<div class="block">Returns the underlying Jetty server.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -706,7 +681,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>startServer</h4>
-<pre>protected int <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.436">startServer</a>()
+<pre>protected int <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.435">startServer</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">Method used to start the Jetty server created by <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#createServer--"><code>createServer()</code></a>.
@@ -726,7 +701,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>getResourceMap</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>>> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.490">getResourceMap</a>()
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>>> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.489">getResourceMap</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/ClassNotFoundException.html?is-external=true" title="class or interface in java.lang">ClassNotFoundException</a>,
<a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Returns the resource map to use for this microservice.
@@ -782,7 +757,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>onConfigSave</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.537">onConfigSave</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.536">onConfigSave</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
<div class="block">Called when <a href="../../../../org/apache/juneau/ini/ConfigFile.html#save--"><code>ConfigFile.save()</code></a> is called on the config file.
<p>
@@ -811,7 +786,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>setJettyXml</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.576">setJettyXml</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> jettyXml)</pre>
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.575">setJettyXml</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> jettyXml)</pre>
<div class="block">Sets the <code>jetty.xml</code> used to configure the Jetty server.
<p></div>
@@ -835,7 +810,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>onCreateServer</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.595">onCreateServer</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.594">onCreateServer</a>()</pre>
<div class="block">Called before <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#createServer--"><code>createServer()</code></a> is called.
<p>
@@ -848,7 +823,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>onStartServer</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.603">onStartServer</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.602">onStartServer</a>()</pre>
<div class="block">Called before <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#startServer--"><code>startServer()</code></a> is called.
<p>
@@ -861,7 +836,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>onPostStartServer</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.611">onPostStartServer</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.610">onPostStartServer</a>()</pre>
<div class="block">Called after the Jetty server is started.
<p>
@@ -874,7 +849,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>onStopServer</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.619">onStopServer</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.618">onStopServer</a>()</pre>
<div class="block">Called before the Jetty server is stopped.
<p>
@@ -887,7 +862,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>onPostStopServer</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.627">onPostStopServer</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.626">onPostStopServer</a>()</pre>
<div class="block">Called after the Jetty server is stopped.
<p>
@@ -900,7 +875,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>setConfig</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.635">setConfig</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> cfPath,
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.634">setConfig</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> cfPath,
boolean create)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setConfig-java.lang.String-boolean-">Microservice</a></code></span></div>
@@ -930,64 +905,13 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
</dl>
</li>
</ul>
-<a name="setConfig-org.apache.juneau.ini.ConfigFile-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setConfig</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.641">setConfig</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setConfig-org.apache.juneau.ini.ConfigFile-">Microservice</a></code></span></div>
-<div class="block">Specifies the config file for this microservice.
-
- <p>
- Note that if you use this method instead of <a href="../../../../org/apache/juneau/microservice/Microservice.html#setConfig-java.lang.String-boolean-"><code>Microservice.setConfig(String,boolean)</code></a>, the config file will not use
- the variable resolver constructed from <a href="../../../../org/apache/juneau/microservice/Microservice.html#createVarResolver--"><code>Microservice.createVarResolver()</code></a>.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setConfig-org.apache.juneau.ini.ConfigFile-">setConfig</a></code> in class <code><a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>cf</code> - The config file for this application, or <jk>null</jk> if no config file is needed.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>This object (for method chaining).</dd>
-</dl>
-</li>
-</ul>
-<a name="setManifest-java.util.jar.Manifest-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setManifest</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.647">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/jar/Manifest.html?is-external=true" title="class or interface in java.util.jar">Manifest</a> mf)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-">Microservice</a></code></span></div>
-<div class="block">Specifies the manifest file of the jar file this microservice is contained within.
-
- <p>
- If you do not specify the manifest file, we attempt to resolve it through the following methods:
- <ol>
- <li>Looking on the file system for a file at <js>"META-INF/MANIFEST.MF"</js>.
- This is primarily to allow for running microservices from within eclipse workspaces where the manifest file
- is located in the project root.
- <li>Using the class loader for this class to find the file at the URL <js>"META-INF/MANIFEST.MF"</js>.
- </ol></div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-">setManifest</a></code> in class <code><a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>mf</code> - The manifest file of this microservice.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>This object (for method chaining).</dd>
-</dl>
-</li>
-</ul>
<a name="setManifestContents-java.lang.String...-">
<!-- -->
</a>
-<ul class="blockList">
+<ul class="blockListLast">
<li class="blockList">
<h4>setManifestContents</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.653">setManifestContents</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... contents)
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.640">setManifestContents</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... contents)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/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: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifestContents-java.lang.String...-">Microservice</a></code></span></div>
<div class="block">Convenience method for specifying the manifest contents directly.</div>
@@ -1003,51 +927,6 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
</dl>
</li>
</ul>
-<a name="setManifest-java.io.File-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setManifest</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.659">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.io.File-">Microservice</a></code></span></div>
-<div class="block">Same as <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>Microservice.setManifest(Manifest)</code></a> except specified through a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a> object.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.io.File-">setManifest</a></code> in class <code><a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>f</code> - The manifest file of this microservice.</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="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If a problem occurred while trying to read the manifest file.</dd>
-</dl>
-</li>
-</ul>
-<a name="setManifest-java.lang.Class-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>setManifest</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.665">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)
- 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: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.lang.Class-">Microservice</a></code></span></div>
-<div class="block">Same as <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>Microservice.setManifest(Manifest)</code></a> except finds and loads the manifest file of the jar file that the
- specified class is contained within.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.lang.Class-">setManifest</a></code> in class <code><a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>c</code> - The class whose jar file contains the manifest to use for this microservice.</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="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If a problem occurred while trying to read the manifest file.</dd>
-</dl>
-</li>
-</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/package-tree.html b/content/site/apidocs/org/apache/juneau/microservice/package-tree.html
index 57ae672..57db26c 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/package-tree.html
@@ -89,18 +89,10 @@
<li type="circle">org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServletDefault</span></a>
<ul>
<li type="circle">org.apache.juneau.microservice.<a href="../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Resource</span></a></li>
+<li type="circle">org.apache.juneau.microservice.<a href="../../../../org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceJena</span></a></li>
<li type="circle">org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServletGroupDefault</span></a>
<ul>
<li type="circle">org.apache.juneau.microservice.<a href="../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceGroup</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li type="circle">org.apache.juneau.rest.jena.<a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">RestServletJenaDefault</span></a>
-<ul>
-<li type="circle">org.apache.juneau.microservice.<a href="../../../../org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceJena</span></a></li>
-<li type="circle">org.apache.juneau.rest.jena.<a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">RestServletJenaGroupDefault</span></a>
-<ul>
<li type="circle">org.apache.juneau.microservice.<a href="../../../../org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceJenaGroup</span></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/resources/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/package-summary.html b/content/site/apidocs/org/apache/juneau/microservice/resources/package-summary.html
index ba839b2..a585abf 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/package-summary.html
@@ -43,7 +43,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/juneau/microservice/package-summary.html">Prev Package</a></li>
-<li><a href="../../../../../org/apache/juneau/msgpack/package-summary.html">Next Package</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/sample/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/juneau/microservice/resources/package-summary.html" target="_top">Frames</a></li>
@@ -164,7 +164,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/juneau/microservice/package-summary.html">Prev Package</a></li>
-<li><a href="../../../../../org/apache/juneau/msgpack/package-summary.html">Next Package</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/sample/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/juneau/microservice/resources/package-summary.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/microservice/resources/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/package-tree.html b/content/site/apidocs/org/apache/juneau/microservice/resources/package-tree.html
index 1e2da2b..cecae98 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/package-tree.html
@@ -43,7 +43,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/juneau/microservice/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/juneau/msgpack/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/sample/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/juneau/microservice/resources/package-tree.html" target="_top">Frames</a></li>
@@ -147,7 +147,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/juneau/microservice/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/juneau/msgpack/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/sample/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/juneau/microservice/resources/package-tree.html" target="_top">Frames</a></li>
[07/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/microservice/RestMicroservice.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/RestMicroservice.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/RestMicroservice.html
index 0a4b457..f0f0cb4 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/RestMicroservice.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/RestMicroservice.html
@@ -27,654 +27,629 @@
<span class="sourceLineNo">019</span>import java.io.*;<a name="line.19"></a>
<span class="sourceLineNo">020</span>import java.net.*;<a name="line.20"></a>
<span class="sourceLineNo">021</span>import java.util.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.util.jar.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.util.logging.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>import javax.servlet.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.ini.*;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.juneau.json.*;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.juneau.microservice.resources.*;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.juneau.parser.*;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.juneau.rest.annotation.*;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.eclipse.jetty.server.*;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.eclipse.jetty.servlet.*;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.eclipse.jetty.xml.*;<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>/**<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * Entry point for Juneau microservice that implements a REST interface using Jetty on a single port.<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <h6 class='topic'>Jetty Server Details</h6><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <a name="line.41"></a>
-<span class="sourceLineNo">042</span> * The Jetty server is created by the {@link #createServer()} method and started with the {@link #startServer()} method.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * These methods can be overridden to provided customized behavior.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> *<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <h6 class='topic'>Defining REST Resources</h6><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <a name="line.46"></a>
-<span class="sourceLineNo">047</span> * Top-level REST resources are defined by the {@link #getResourceMap()} method.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * This method can be overridden to provide a customized list of REST resources.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> *<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * <h6 class='topic'>Logging</h6><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <a name="line.51"></a>
-<span class="sourceLineNo">052</span> * Logging is initialized by the {@link #initLogging()} method.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * This method can be overridden to provide customized logging behavior.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> *<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <h6 class='topic'>Lifecycle Listener Methods</h6><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Subclasses can optionally implement the following event listener methods:<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <ul class='spaced-list'><a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <li><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * {@link #onStart()} - Gets executed before {@link #start()}.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <li><a name="line.60"></a>
-<span class="sourceLineNo">061</span> * {@link #onStop()} - Gets executed before {@link #stop()}.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <li><a name="line.62"></a>
-<span class="sourceLineNo">063</span> * {@link #onCreateServer()} - Gets executed before {@link #createServer()}.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * <li><a name="line.64"></a>
-<span class="sourceLineNo">065</span> * {@link #onStartServer()} - Gets executed before {@link #startServer()}.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * <li><a name="line.66"></a>
-<span class="sourceLineNo">067</span> * {@link #onPostStartServer()} - Gets executed after {@link #startServer()}.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * <li><a name="line.68"></a>
-<span class="sourceLineNo">069</span> * {@link #onStopServer()} - Gets executed before {@link #stop()}.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * <li><a name="line.70"></a>
-<span class="sourceLineNo">071</span> * {@link #onPostStopServer()} - Gets executed after {@link #stop()}.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * </ul><a name="line.72"></a>
-<span class="sourceLineNo">073</span> */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>public class RestMicroservice extends Microservice {<a name="line.74"></a>
-<span class="sourceLineNo">075</span> <a name="line.75"></a>
-<span class="sourceLineNo">076</span> ServletContextHandler servletContextHandler; <a name="line.76"></a>
-<span class="sourceLineNo">077</span> Server server;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> int port;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> String contextPath;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> Logger logger;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> Object jettyXml;<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> * Main method.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * <a name="line.85"></a>
-<span class="sourceLineNo">086</span> * <p><a name="line.86"></a>
-<span class="sourceLineNo">087</span> * Subclasses must also implement this method!<a name="line.87"></a>
-<span class="sourceLineNo">088</span> *<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * @param args Command line arguments.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * @throws Exception<a name="line.90"></a>
-<span class="sourceLineNo">091</span> */<a name="line.91"></a>
-<span class="sourceLineNo">092</span> public static void main(String[] args) throws Exception {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> new RestMicroservice(args).start().join();<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> * Constructor.<a name="line.97"></a>
-<span class="sourceLineNo">098</span> *<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * @param args Command line arguments.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @throws Exception<a name="line.100"></a>
-<span class="sourceLineNo">101</span> */<a name="line.101"></a>
-<span class="sourceLineNo">102</span> public RestMicroservice(String...args) throws Exception {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> super(args);<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">022</span>import java.util.logging.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import javax.servlet.*;<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.juneau.*;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.juneau.ini.*;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.juneau.json.*;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.juneau.microservice.resources.*;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.juneau.parser.*;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.juneau.rest.annotation.*;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.eclipse.jetty.server.*;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.eclipse.jetty.servlet.*;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.eclipse.jetty.xml.*;<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> * Entry point for Juneau microservice that implements a REST interface using Jetty on a single port.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * <h6 class='topic'>Jetty Server Details</h6><a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <a name="line.40"></a>
+<span class="sourceLineNo">041</span> * The Jetty server is created by the {@link #createServer()} method and started with the {@link #startServer()} method.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * These methods can be overridden to provided customized behavior.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> *<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <h6 class='topic'>Defining REST Resources</h6><a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <a name="line.45"></a>
+<span class="sourceLineNo">046</span> * Top-level REST resources are defined by the {@link #getResourceMap()} method.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * This method can be overridden to provide a customized list of REST resources.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> *<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * <h6 class='topic'>Logging</h6><a name="line.49"></a>
+<span class="sourceLineNo">050</span> * <a name="line.50"></a>
+<span class="sourceLineNo">051</span> * Logging is initialized by the {@link #initLogging()} method.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * This method can be overridden to provide customized logging behavior.<a name="line.52"></a>
+<span class="sourceLineNo">053</span> *<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <h6 class='topic'>Lifecycle Listener Methods</h6><a name="line.54"></a>
+<span class="sourceLineNo">055</span> * Subclasses can optionally implement the following event listener methods:<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <ul class='spaced-list'><a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <li><a name="line.57"></a>
+<span class="sourceLineNo">058</span> * {@link #onStart()} - Gets executed before {@link #start()}.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <li><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * {@link #onStop()} - Gets executed before {@link #stop()}.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <li><a name="line.61"></a>
+<span class="sourceLineNo">062</span> * {@link #onCreateServer()} - Gets executed before {@link #createServer()}.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * <li><a name="line.63"></a>
+<span class="sourceLineNo">064</span> * {@link #onStartServer()} - Gets executed before {@link #startServer()}.<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * <li><a name="line.65"></a>
+<span class="sourceLineNo">066</span> * {@link #onPostStartServer()} - Gets executed after {@link #startServer()}.<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * <li><a name="line.67"></a>
+<span class="sourceLineNo">068</span> * {@link #onStopServer()} - Gets executed before {@link #stop()}.<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * <li><a name="line.69"></a>
+<span class="sourceLineNo">070</span> * {@link #onPostStopServer()} - Gets executed after {@link #stop()}.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * </ul><a name="line.71"></a>
+<span class="sourceLineNo">072</span> */<a name="line.72"></a>
+<span class="sourceLineNo">073</span>public class RestMicroservice extends Microservice {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> <a name="line.74"></a>
+<span class="sourceLineNo">075</span> ServletContextHandler servletContextHandler; <a name="line.75"></a>
+<span class="sourceLineNo">076</span> Server server;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> int port;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> String contextPath;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> Logger logger;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> Object jettyXml;<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> * Main method.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * <a name="line.84"></a>
+<span class="sourceLineNo">085</span> * <p><a name="line.85"></a>
+<span class="sourceLineNo">086</span> * Subclasses must also implement this method!<a name="line.86"></a>
+<span class="sourceLineNo">087</span> *<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * @param args Command line arguments.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * @throws Exception<a name="line.89"></a>
+<span class="sourceLineNo">090</span> */<a name="line.90"></a>
+<span class="sourceLineNo">091</span> public static void main(String[] args) throws Exception {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> new RestMicroservice(args).start().join();<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> * Constructor.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> *<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * @param args Command line arguments.<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * @throws Exception<a name="line.99"></a>
+<span class="sourceLineNo">100</span> */<a name="line.100"></a>
+<span class="sourceLineNo">101</span> public RestMicroservice(String...args) throws Exception {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> super(args);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span> //--------------------------------------------------------------------------------<a name="line.107"></a>
-<span class="sourceLineNo">108</span> // Methods implemented on Microservice API<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> @Override /* Microservice */<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public RestMicroservice start() throws Exception {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> super.start();<a name="line.113"></a>
-<span class="sourceLineNo">114</span> try {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> initLogging();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> } catch (Exception e) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span> // If logging can be initialized, just print a stack trace and continue.<a name="line.117"></a>
-<span class="sourceLineNo">118</span> e.printStackTrace();<a name="line.118"></a>
-<span class="sourceLineNo">119</span> }<a name="line.119"></a>
-<span class="sourceLineNo">120</span> createServer();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> startServer();<a name="line.121"></a>
-<span class="sourceLineNo">122</span> return this;<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 /* Microservice */<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public RestMicroservice join() throws Exception {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> server.join();<a name="line.127"></a>
-<span class="sourceLineNo">128</span> return this;<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 /* Microservice */<a name="line.131"></a>
-<span class="sourceLineNo">132</span> public RestMicroservice stop() {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> Thread t = new Thread() {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> @Override /* Thread */<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public void run() {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> try {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> if (server.isStopping() || server.isStopped())<a name="line.137"></a>
-<span class="sourceLineNo">138</span> return;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> onStopServer();<a name="line.139"></a>
-<span class="sourceLineNo">140</span> logger.warning("Stopping server.");<a name="line.140"></a>
-<span class="sourceLineNo">141</span> server.stop();<a name="line.141"></a>
-<span class="sourceLineNo">142</span> logger.warning("Server stopped.");<a name="line.142"></a>
-<span class="sourceLineNo">143</span> onPostStopServer();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> } catch (Exception e) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> logger.log(Level.SEVERE, e.getLocalizedMessage(), e);<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> t.start();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> try {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> t.join();<a name="line.151"></a>
-<span class="sourceLineNo">152</span> } catch (InterruptedException e) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> e.printStackTrace();<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span> super.stop();<a name="line.155"></a>
-<span class="sourceLineNo">156</span> return this;<a name="line.156"></a>
-<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">106</span> //--------------------------------------------------------------------------------<a name="line.106"></a>
+<span class="sourceLineNo">107</span> // Methods implemented on Microservice API<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> @Override /* Microservice */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> public RestMicroservice start() throws Exception {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> super.start();<a name="line.112"></a>
+<span class="sourceLineNo">113</span> try {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> initLogging();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> } catch (Exception e) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> // If logging can be initialized, just print a stack trace and continue.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> e.printStackTrace();<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span> createServer();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> startServer();<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 /* Microservice */<a name="line.124"></a>
+<span class="sourceLineNo">125</span> public RestMicroservice join() throws Exception {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> server.join();<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 /* Microservice */<a name="line.130"></a>
+<span class="sourceLineNo">131</span> public RestMicroservice stop() {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> Thread t = new Thread() {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> @Override /* Thread */<a name="line.133"></a>
+<span class="sourceLineNo">134</span> public void run() {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> try {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> if (server.isStopping() || server.isStopped())<a name="line.136"></a>
+<span class="sourceLineNo">137</span> return;<a name="line.137"></a>
+<span class="sourceLineNo">138</span> onStopServer();<a name="line.138"></a>
+<span class="sourceLineNo">139</span> logger.warning("Stopping server.");<a name="line.139"></a>
+<span class="sourceLineNo">140</span> server.stop();<a name="line.140"></a>
+<span class="sourceLineNo">141</span> logger.warning("Server stopped.");<a name="line.141"></a>
+<span class="sourceLineNo">142</span> onPostStopServer();<a name="line.142"></a>
+<span class="sourceLineNo">143</span> } catch (Exception e) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> logger.log(Level.SEVERE, e.getLocalizedMessage(), e);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> }<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span> };<a name="line.147"></a>
+<span class="sourceLineNo">148</span> t.start();<a name="line.148"></a>
+<span class="sourceLineNo">149</span> try {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> t.join();<a name="line.150"></a>
+<span class="sourceLineNo">151</span> } catch (InterruptedException e) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> e.printStackTrace();<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span> super.stop();<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><a name="line.159"></a>
-<span class="sourceLineNo">160</span> //--------------------------------------------------------------------------------<a name="line.160"></a>
-<span class="sourceLineNo">161</span> // RestMicroservice API methods.<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 port that this microservice started up on.<a name="line.165"></a>
-<span class="sourceLineNo">166</span> * @return The port that this microservice started up on.<a name="line.166"></a>
-<span class="sourceLineNo">167</span> */<a name="line.167"></a>
-<span class="sourceLineNo">168</span> public int getPort() {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> return port;<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> * Returns the URI where this microservice is listening on.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * @return The URI where this microservice is listening on.<a name="line.174"></a>
-<span class="sourceLineNo">175</span> */<a name="line.175"></a>
-<span class="sourceLineNo">176</span> public URI getURI() {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> String scheme = getConfig().getBoolean("REST/useSsl") ? "https" : "http";<a name="line.177"></a>
-<span class="sourceLineNo">178</span> String hostname = "localhost";<a name="line.178"></a>
-<span class="sourceLineNo">179</span> String ctx = "/".equals(contextPath) ? null : contextPath;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> try {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> hostname = InetAddress.getLocalHost().getHostName();<a name="line.181"></a>
-<span class="sourceLineNo">182</span> } catch (UnknownHostException e) {}<a name="line.182"></a>
-<span class="sourceLineNo">183</span> try {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> return new URI(scheme, null, hostname, port, ctx, null, null);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> } catch (URISyntaxException e) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> throw new RuntimeException(e);<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> /**<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * Initialize the logging for this microservice.<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * <a name="line.192"></a>
-<span class="sourceLineNo">193</span> * <p><a name="line.193"></a>
-<span class="sourceLineNo">194</span> * Subclasses can override this method to provide customized logging.<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <a name="line.195"></a>
-<span class="sourceLineNo">196</span> * <p><a name="line.196"></a>
-<span class="sourceLineNo">197</span> * The default implementation uses the <cs>Logging</cs> section in the config file to set up logging:<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * <p class='bcode'><a name="line.198"></a>
-<span class="sourceLineNo">199</span> * <cc>#================================================================================<a name="line.199"></a>
-<span class="sourceLineNo">200</span> * # Logger settings<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * # See FileHandler Java class for details.<a name="line.201"></a>
-<span class="sourceLineNo">202</span> * #================================================================================</cc><a name="line.202"></a>
-<span class="sourceLineNo">203</span> * <cs>[Logging]</cs><a name="line.203"></a>
-<span class="sourceLineNo">204</span> *<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * <cc># The directory where to create the log file.<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * # Default is ".".</cc><a name="line.206"></a>
-<span class="sourceLineNo">207</span> * <ck>logDir</ck> = logs<a name="line.207"></a>
-<span class="sourceLineNo">208</span> *<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * <cc># The name of the log file to create for the main logger.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * # The logDir and logFile make up the pattern that's passed to the FileHandler<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * # constructor.<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * # If value is not specified, then logging to a file will not be set up.</cc><a name="line.212"></a>
-<span class="sourceLineNo">213</span> * <ck>logFile</ck> = microservice.%g.log<a name="line.213"></a>
-<span class="sourceLineNo">214</span> *<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * <cc># Whether to append to the existing log file or create a new one.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * # Default is false.</cc><a name="line.216"></a>
-<span class="sourceLineNo">217</span> * <ck>append</ck> =<a name="line.217"></a>
-<span class="sourceLineNo">218</span> *<a name="line.218"></a>
-<span class="sourceLineNo">219</span> * <cc># The SimpleDateFormat format to use for dates.<a name="line.219"></a>
-<span class="sourceLineNo">220</span> * # Default is "yyyy.MM.dd hh:mm:ss".</cc><a name="line.220"></a>
-<span class="sourceLineNo">221</span> * <ck>dateFormat</ck> =<a name="line.221"></a>
-<span class="sourceLineNo">222</span> *<a name="line.222"></a>
-<span class="sourceLineNo">223</span> * <cc># The log message format.<a name="line.223"></a>
-<span class="sourceLineNo">224</span> * # The value can contain any of the following variables:<a name="line.224"></a>
-<span class="sourceLineNo">225</span> * # {date} - The date, formatted per dateFormat.<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * # {class} - The class name.<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * # {method} - The method name.<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * # {logger} - The logger name.<a name="line.228"></a>
-<span class="sourceLineNo">229</span> * # {level} - The log level name.<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * # {msg} - The log message.<a name="line.230"></a>
-<span class="sourceLineNo">231</span> * # {threadid} - The thread ID.<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * # {exception} - The localized exception message.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * # Default is "[{date} {level}] {msg}%n".</cc><a name="line.233"></a>
-<span class="sourceLineNo">234</span> * <ck>format</ck> =<a name="line.234"></a>
-<span class="sourceLineNo">235</span> *<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * <cc># The maximum log file size.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> * # Suffixes available for numbers.<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * # See ConfigFile.getInt(String,int) for details.<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * # Default is 1M.</cc><a name="line.239"></a>
-<span class="sourceLineNo">240</span> * <ck>limit</ck> = 10M<a name="line.240"></a>
-<span class="sourceLineNo">241</span> *<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * <cc># Max number of log files.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * # Default is 1.</cc><a name="line.243"></a>
-<span class="sourceLineNo">244</span> * <ck>count</ck> = 5<a name="line.244"></a>
-<span class="sourceLineNo">245</span> *<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * <cc># Default log levels.<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * # Keys are logger names.<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * # Values are serialized Level POJOs.</cc><a name="line.248"></a>
-<span class="sourceLineNo">249</span> * <ck>levels</ck> = { org.apache.juneau:'INFO' }<a name="line.249"></a>
-<span class="sourceLineNo">250</span> *<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * <cc># Only print unique stack traces once and then refer to them by a simple 8 character hash identifier.<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * # Useful for preventing log files from filling up with duplicate stack traces.<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * # Default is false.</cc><a name="line.253"></a>
-<span class="sourceLineNo">254</span> * <ck>useStackTraceHashes</ck> = true<a name="line.254"></a>
-<span class="sourceLineNo">255</span> *<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * <cc># The default level for the console logger.<a name="line.256"></a>
-<span class="sourceLineNo">257</span> * # Default is WARNING.</cc><a name="line.257"></a>
-<span class="sourceLineNo">258</span> * <ck>consoleLevel</ck> = WARNING<a name="line.258"></a>
-<span class="sourceLineNo">259</span> * </p><a name="line.259"></a>
-<span class="sourceLineNo">260</span> *<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * @throws Exception<a name="line.261"></a>
-<span class="sourceLineNo">262</span> */<a name="line.262"></a>
-<span class="sourceLineNo">263</span> protected void initLogging() throws Exception {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> ConfigFile cf = getConfig();<a name="line.264"></a>
-<span class="sourceLineNo">265</span> logger = Logger.getLogger("");<a name="line.265"></a>
-<span class="sourceLineNo">266</span> String logFile = cf.getString("Logging/logFile");<a name="line.266"></a>
-<span class="sourceLineNo">267</span> if (! isEmpty(logFile)) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> LogManager.getLogManager().reset();<a name="line.268"></a>
-<span class="sourceLineNo">269</span> String logDir = cf.getString("Logging/logDir", ".");<a name="line.269"></a>
-<span class="sourceLineNo">270</span> mkdirs(new File(logDir), false);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> boolean append = cf.getBoolean("Logging/append");<a name="line.271"></a>
-<span class="sourceLineNo">272</span> int limit = cf.getInt("Logging/limit", 1024*1024);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> int count = cf.getInt("Logging/count", 1);<a name="line.273"></a>
-<span class="sourceLineNo">274</span> FileHandler fh = new FileHandler(logDir + '/' + logFile, limit, count, append);<a name="line.274"></a>
-<span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span> boolean useStackTraceHashes = cf.getBoolean("Logging/useStackTraceHashes");<a name="line.276"></a>
-<span class="sourceLineNo">277</span> String format = cf.getString("Logging/format", "[{date} {level}] {msg}%n");<a name="line.277"></a>
-<span class="sourceLineNo">278</span> String dateFormat = cf.getString("Logging/dateFormat", "yyyy.MM.dd hh:mm:ss");<a name="line.278"></a>
-<span class="sourceLineNo">279</span> fh.setFormatter(new LogEntryFormatter(format, dateFormat, useStackTraceHashes));<a name="line.279"></a>
-<span class="sourceLineNo">280</span> logger.addHandler(fh);<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> ConsoleHandler ch = new ConsoleHandler();<a name="line.282"></a>
-<span class="sourceLineNo">283</span> ch.setLevel(Level.parse(cf.getString("Logging/consoleLevel", "WARNING")));<a name="line.283"></a>
-<span class="sourceLineNo">284</span> ch.setFormatter(new LogEntryFormatter(format, dateFormat, false));<a name="line.284"></a>
-<span class="sourceLineNo">285</span> logger.addHandler(ch);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span> ObjectMap loggerLevels = cf.getObject("Logging/levels", ObjectMap.class);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> if (loggerLevels != null)<a name="line.288"></a>
-<span class="sourceLineNo">289</span> for (String l : loggerLevels.keySet())<a name="line.289"></a>
-<span class="sourceLineNo">290</span> Logger.getLogger(l).setLevel(loggerLevels.get(l, Level.class));<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> * Method used to create (but not start) an instance of a Jetty server.<a name="line.294"></a>
-<span class="sourceLineNo">295</span> * <a name="line.295"></a>
-<span class="sourceLineNo">296</span> * <p><a name="line.296"></a>
-<span class="sourceLineNo">297</span> * Subclasses can override this method to customize the Jetty server before it is started.<a name="line.297"></a>
-<span class="sourceLineNo">298</span> * <a name="line.298"></a>
-<span class="sourceLineNo">299</span> * <p><a name="line.299"></a>
-<span class="sourceLineNo">300</span> * The default implementation is configured by the following values in the config file <a name="line.300"></a>
-<span class="sourceLineNo">301</span> * if a jetty.xml is not specified via a <code>REST/jettyXml</code> setting:<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * <p class='bcode'><a name="line.302"></a>
-<span class="sourceLineNo">303</span> * <cc>#================================================================================<a name="line.303"></a>
-<span class="sourceLineNo">304</span> * # REST settings<a name="line.304"></a>
-<span class="sourceLineNo">305</span> * #================================================================================</cc><a name="line.305"></a>
-<span class="sourceLineNo">306</span> * <cs>[REST]</cs><a name="line.306"></a>
-<span class="sourceLineNo">307</span> *<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * <cc># The HTTP port number to use.<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * # Default is Rest-Port setting in manifest file, or 8000.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * # Can also specify a comma-delimited lists of ports to try, including 0 meaning<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * # try a random port.</cc><a name="line.311"></a>
-<span class="sourceLineNo">312</span> * <ck>port</ck> = 10000<a name="line.312"></a>
-<span class="sourceLineNo">313</span> *<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * <cc># The context root of the Jetty server.<a name="line.314"></a>
-<span class="sourceLineNo">315</span> * # Default is Rest-ContextPath in manifest file, or "/".</cc><a name="line.315"></a>
-<span class="sourceLineNo">316</span> * <ck>contextPath</ck> =<a name="line.316"></a>
-<span class="sourceLineNo">317</span> *<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * <cc># Enable SSL support.</cc><a name="line.318"></a>
-<span class="sourceLineNo">319</span> * <ck>useSsl</ck> = false<a name="line.319"></a>
-<span class="sourceLineNo">320</span> *<a name="line.320"></a>
-<span class="sourceLineNo">321</span> * @return The newly-created server.<a name="line.321"></a>
-<span class="sourceLineNo">322</span> * @throws Exception<a name="line.322"></a>
-<span class="sourceLineNo">323</span> */<a name="line.323"></a>
-<span class="sourceLineNo">324</span> protected Server createServer() throws Exception {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> onCreateServer();<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span> ConfigFile cf = getConfig();<a name="line.327"></a>
-<span class="sourceLineNo">328</span> ObjectMap mf = getManifest();<a name="line.328"></a>
-<span class="sourceLineNo">329</span> if (jettyXml == null)<a name="line.329"></a>
-<span class="sourceLineNo">330</span> jettyXml = cf.getString("REST/jettyXml", mf.getString("Rest-JettyXml", null));<a name="line.330"></a>
-<span class="sourceLineNo">331</span> if (jettyXml != null) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> InputStream is = null;<a name="line.332"></a>
-<span class="sourceLineNo">333</span> if (jettyXml instanceof String) {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> jettyXml = new File(jettyXml.toString());<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span> if (jettyXml instanceof File) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> File f = (File)jettyXml;<a name="line.337"></a>
-<span class="sourceLineNo">338</span> if (f.exists())<a name="line.338"></a>
-<span class="sourceLineNo">339</span> is = new FileInputStream((File)jettyXml);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> else <a name="line.340"></a>
-<span class="sourceLineNo">341</span> throw new FormattedRuntimeException("Jetty.xml file ''{0}'' was specified but not found on the file system.", jettyXml);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> } else if (jettyXml instanceof InputStream) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> is = (InputStream)jettyXml;<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> XmlConfiguration config = new XmlConfiguration(is);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> server = (Server)config.configure();<a name="line.347"></a>
-<span class="sourceLineNo">348</span> <a name="line.348"></a>
-<span class="sourceLineNo">349</span> } else {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> int[] ports = cf.getObjectWithDefault("REST/port", mf.getWithDefault("Rest-Port", new int[]{8000}, int[].class), int[].class);<a name="line.350"></a>
-<span class="sourceLineNo">351</span><a name="line.351"></a>
-<span class="sourceLineNo">352</span> port = findOpenPort(ports);<a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (port == 0) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> System.err.println("Open port not found. Tried " + JsonSerializer.DEFAULT_LAX.toString(ports));<a name="line.354"></a>
-<span class="sourceLineNo">355</span> System.exit(1);<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> contextPath = cf.getString("REST/contextPath", mf.getString("Rest-ContextPath", "/"));<a name="line.358"></a>
-<span class="sourceLineNo">359</span> server = new Server(port);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> <a name="line.360"></a>
-<span class="sourceLineNo">361</span> servletContextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> servletContextHandler.setContextPath(contextPath);<a name="line.363"></a>
-<span class="sourceLineNo">364</span> server.setHandler(servletContextHandler);<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span> for (Map.Entry<String,Class<? extends Servlet>> e : getResourceMap().entrySet())<a name="line.366"></a>
-<span class="sourceLineNo">367</span> servletContextHandler.addServlet(e.getValue(), e.getKey()).setInitOrder(0);<a name="line.367"></a>
-<span class="sourceLineNo">368</span> }<a name="line.368"></a>
-<span class="sourceLineNo">369</span> <a name="line.369"></a>
-<span class="sourceLineNo">370</span> return server;<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> * Adds an arbitrary servlet to this microservice.<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * <a name="line.375"></a>
-<span class="sourceLineNo">376</span> * @param servlet The servlet instance.<a name="line.376"></a>
-<span class="sourceLineNo">377</span> * @param pathSpec The context path of the servlet.<a name="line.377"></a>
-<span class="sourceLineNo">378</span> * @return This object (for method chaining).<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * @throws RuntimeException if {@link #createServer()} has not previously been called.<a name="line.379"></a>
-<span class="sourceLineNo">380</span> */<a name="line.380"></a>
-<span class="sourceLineNo">381</span> public RestMicroservice addServlet(Servlet servlet, String pathSpec) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> if (servletContextHandler == null)<a name="line.382"></a>
-<span class="sourceLineNo">383</span> throw new RuntimeException("Servlet context handler not found. createServer() must be called first.");<a name="line.383"></a>
-<span class="sourceLineNo">384</span> ServletHolder sh = new ServletHolder(servlet);<a name="line.384"></a>
-<span class="sourceLineNo">385</span> servletContextHandler.addServlet(sh, pathSpec);<a name="line.385"></a>
-<span class="sourceLineNo">386</span> return this;<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span> <a name="line.388"></a>
-<span class="sourceLineNo">389</span> /**<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * Adds a servlet attribute to the Jetty server.<a name="line.390"></a>
-<span class="sourceLineNo">391</span> * <a name="line.391"></a>
-<span class="sourceLineNo">392</span> * @param name The server attribute name.<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * @param value The context path of the servlet.<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * @return This object (for method chaining).<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * @throws RuntimeException if {@link #createServer()} has not previously been called.<a name="line.395"></a>
-<span class="sourceLineNo">396</span> */<a name="line.396"></a>
-<span class="sourceLineNo">397</span> public RestMicroservice addServletAttribute(String name, Object value) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> if (server == null)<a name="line.398"></a>
-<span class="sourceLineNo">399</span> throw new RuntimeException("Server not found. createServer() must be called first.");<a name="line.399"></a>
-<span class="sourceLineNo">400</span> server.setAttribute(name, value);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> return this;<a name="line.401"></a>
-<span class="sourceLineNo">402</span> }<a name="line.402"></a>
-<span class="sourceLineNo">403</span> <a name="line.403"></a>
-<span class="sourceLineNo">404</span> /**<a name="line.404"></a>
-<span class="sourceLineNo">405</span> * Returns the underlying Jetty server.<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * <a name="line.406"></a>
-<span class="sourceLineNo">407</span> * @return The underlying Jetty server, or <jk>null</jk> if {@link #createServer()} has not yet been called.<a name="line.407"></a>
-<span class="sourceLineNo">408</span> */<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public Server getServer() {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return server;<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> private static int findOpenPort(int[] ports) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> for (int port : ports) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> try {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> // If port is 0, try a random port between ports[0] and 32767.<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (port == 0)<a name="line.417"></a>
-<span class="sourceLineNo">418</span> port = new Random().nextInt(32767 - ports[0] + 1) + ports[0];<a name="line.418"></a>
-<span class="sourceLineNo">419</span> ServerSocket ss = new ServerSocket(port);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> ss.close();<a name="line.420"></a>
-<span class="sourceLineNo">421</span> return port;<a name="line.421"></a>
-<span class="sourceLineNo">422</span> } catch (IOException e) {}<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
-<span class="sourceLineNo">424</span> return 0;<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> * Method used to start the Jetty server created by {@link #createServer()}.<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * <a name="line.429"></a>
-<span class="sourceLineNo">430</span> * <p><a name="line.430"></a>
-<span class="sourceLineNo">431</span> * Subclasses can override this method to customize server startup.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> *<a name="line.432"></a>
-<span class="sourceLineNo">433</span> * @return The port that this server started on.<a name="line.433"></a>
-<span class="sourceLineNo">434</span> * @throws Exception<a name="line.434"></a>
-<span class="sourceLineNo">435</span> */<a name="line.435"></a>
-<span class="sourceLineNo">436</span> protected int startServer() throws Exception {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> onStartServer();<a name="line.437"></a>
-<span class="sourceLineNo">438</span> server.start();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> this.port = ((ServerConnector)server.getConnectors()[0]).getLocalPort();<a name="line.439"></a>
-<span class="sourceLineNo">440</span> logger.warning("Server started on port " + port);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> onPostStartServer();<a name="line.441"></a>
-<span class="sourceLineNo">442</span> return port;<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> * Returns the resource map to use for this microservice.<a name="line.446"></a>
-<span class="sourceLineNo">447</span> * <a name="line.447"></a>
-<span class="sourceLineNo">448</span> * <p><a name="line.448"></a>
-<span class="sourceLineNo">449</span> * Subclasses can override this method to programmatically specify their resources.<a name="line.449"></a>
-<span class="sourceLineNo">450</span> * <a name="line.450"></a>
-<span class="sourceLineNo">451</span> * <p><a name="line.451"></a>
-<span class="sourceLineNo">452</span> * The default implementation is configured by the following values in the config file:<a name="line.452"></a>
-<span class="sourceLineNo">453</span> * <p class='bcode'><a name="line.453"></a>
-<span class="sourceLineNo">454</span> *<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * <cc>#================================================================================<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * # REST settings<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * #================================================================================</cc><a name="line.457"></a>
-<span class="sourceLineNo">458</span> * <cs>[REST]</cs><a name="line.458"></a>
-<span class="sourceLineNo">459</span> *<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * <cc># A JSON map of servlet paths to servlet classes.<a name="line.460"></a>
-<span class="sourceLineNo">461</span> * # Example:<a name="line.461"></a>
-<span class="sourceLineNo">462</span> * # resourceMap = {'/*':'com.foo.MyServlet'}<a name="line.462"></a>
-<span class="sourceLineNo">463</span> * # Either resourceMap or resources must be specified if it's not defined in<a name="line.463"></a>
-<span class="sourceLineNo">464</span> * # the manifest file.</cc><a name="line.464"></a>
-<span class="sourceLineNo">465</span> * <ck>resourceMap</ck> =<a name="line.465"></a>
-<span class="sourceLineNo">466</span> *<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * <cc># A comma-delimited list of names of classes that extend from Servlet.<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * # Resource paths are pulled from @RestResource.path() annotation, or<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * # "/*" if annotation not specified.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * # Example:<a name="line.470"></a>
-<span class="sourceLineNo">471</span> * # resources = com.foo.MyServlet<a name="line.471"></a>
-<span class="sourceLineNo">472</span> * * # Default is Rest-Resources in manifest file.<a name="line.472"></a>
-<span class="sourceLineNo">473</span> * # Either resourceMap or resources must be specified if it's not defined in<a name="line.473"></a>
-<span class="sourceLineNo">474</span> * # the manifest file.</cc><a name="line.474"></a>
-<span class="sourceLineNo">475</span> * <ck>resources</ck> =<a name="line.475"></a>
-<span class="sourceLineNo">476</span> * </p><a name="line.476"></a>
-<span class="sourceLineNo">477</span> * <a name="line.477"></a>
-<span class="sourceLineNo">478</span> * <p><a name="line.478"></a>
-<span class="sourceLineNo">479</span> * In most cases, the rest resources will be specified in the manifest file since it's not likely to be a <a name="line.479"></a>
-<span class="sourceLineNo">480</span> * configurable property:<a name="line.480"></a>
-<span class="sourceLineNo">481</span> * <p class='bcode'><a name="line.481"></a>
-<span class="sourceLineNo">482</span> * <mk>Rest-Resources:</mk> org.apache.juneau.microservice.sample.RootResources<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * </p><a name="line.483"></a>
-<span class="sourceLineNo">484</span> *<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * @return The map of REST resources.<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * @throws ClassNotFoundException<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * @throws ParseException<a name="line.487"></a>
-<span class="sourceLineNo">488</span> */<a name="line.488"></a>
-<span class="sourceLineNo">489</span> @SuppressWarnings("unchecked")<a name="line.489"></a>
-<span class="sourceLineNo">490</span> protected Map<String,Class<? extends Servlet>> getResourceMap() throws ClassNotFoundException, ParseException {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> ConfigFile cf = getConfig();<a name="line.491"></a>
-<span class="sourceLineNo">492</span> ObjectMap mf = getManifest();<a name="line.492"></a>
-<span class="sourceLineNo">493</span> Map<String,Class<? extends Servlet>> rm = new LinkedHashMap<String,Class<? extends Servlet>>();<a name="line.493"></a>
-<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> ObjectMap resourceMap = cf.getObject("REST/resourceMap", ObjectMap.class);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> String[] resources = cf.getStringArray("REST/resources", mf.getStringArray("Rest-Resources"));<a name="line.496"></a>
-<span class="sourceLineNo">497</span><a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (resourceMap != null && ! resourceMap.isEmpty()) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> for (Map.Entry<String,Object> e : resourceMap.entrySet()) {<a name="line.499"></a>
-<span class="sourceLineNo">500</span> Class<?> c = Class.forName(e.getValue().toString());<a name="line.500"></a>
-<span class="sourceLineNo">501</span> if (! isParentClass(Servlet.class, c))<a name="line.501"></a>
-<span class="sourceLineNo">502</span> throw new ClassNotFoundException("Invalid class specified as resource. Must be a Servlet. Class='"+c.getName()+"'");<a name="line.502"></a>
-<span class="sourceLineNo">503</span> rm.put(e.getKey(), (Class<? extends Servlet>)c);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> } else if (resources.length > 0) {<a name="line.505"></a>
-<span class="sourceLineNo">506</span> for (String resource : resources) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> Class<?> c = Class.forName(resource);<a name="line.507"></a>
-<span class="sourceLineNo">508</span> if (! isParentClass(Servlet.class, c))<a name="line.508"></a>
-<span class="sourceLineNo">509</span> throw new ClassNotFoundException("Invalid class specified as resource. Must be a Servlet. Class='"+c.getName()+"'");<a name="line.509"></a>
-<span class="sourceLineNo">510</span> RestResource rr = c.getAnnotation(RestResource.class);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> String path = rr == null ? "/*" : rr.path();<a name="line.511"></a>
-<span class="sourceLineNo">512</span> if (! path.endsWith("*"))<a name="line.512"></a>
-<span class="sourceLineNo">513</span> path += (path.endsWith("/") ? "*" : "/*");<a name="line.513"></a>
-<span class="sourceLineNo">514</span> rm.put(path, (Class<? extends Servlet>)c);<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> return rm;<a name="line.517"></a>
-<span class="sourceLineNo">518</span> }<a name="line.518"></a>
-<span class="sourceLineNo">519</span><a name="line.519"></a>
-<span class="sourceLineNo">520</span> /**<a name="line.520"></a>
-<span class="sourceLineNo">521</span> * Called when {@link ConfigFile#save()} is called on the config file.<a name="line.521"></a>
-<span class="sourceLineNo">522</span> * <a name="line.522"></a>
-<span class="sourceLineNo">523</span> * <p><a name="line.523"></a>
-<span class="sourceLineNo">524</span> * The default behavior is configured by the following value in the config file:<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * <p class='bcode'><a name="line.525"></a>
-<span class="sourceLineNo">526</span> * <cs>[REST]</cs><a name="line.526"></a>
-<span class="sourceLineNo">527</span> *<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * <cc># What to do when the config file is saved.<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * # Possible values:<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * # NOTHING - Don't do anything. (default)<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * # RESTART_SERVER - Restart the Jetty server.<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * # RESTART_SERVICE - Shutdown and exit with code '3'.</cc><a name="line.532"></a>
-<span class="sourceLineNo">533</span> * <ck>saveConfigAction</ck> = RESTART_SERVER<a name="line.533"></a>
-<span class="sourceLineNo">534</span> * </p><a name="line.534"></a>
-<span class="sourceLineNo">535</span> */<a name="line.535"></a>
-<span class="sourceLineNo">536</span> @Override /* Microservice */<a name="line.536"></a>
-<span class="sourceLineNo">537</span> protected void onConfigSave(ConfigFile cf) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> try {<a name="line.538"></a>
-<span class="sourceLineNo">539</span> String saveConfigAction = cf.getString("REST/saveConfigAction", "NOTHING");<a name="line.539"></a>
-<span class="sourceLineNo">540</span> if (saveConfigAction.equals("RESTART_SERVER")) {<a name="line.540"></a>
-<span class="sourceLineNo">541</span> new Thread() {<a name="line.541"></a>
-<span class="sourceLineNo">542</span> @Override /* Thread */<a name="line.542"></a>
-<span class="sourceLineNo">543</span> public void run() {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> try {<a name="line.544"></a>
-<span class="sourceLineNo">545</span> RestMicroservice.this.stop();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> RestMicroservice.this.start();<a name="line.546"></a>
-<span class="sourceLineNo">547</span> } catch (Exception e) {<a name="line.547"></a>
-<span class="sourceLineNo">548</span> logger.log(Level.SEVERE, e.getLocalizedMessage(), e);<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> }.start();<a name="line.551"></a>
-<span class="sourceLineNo">552</span> } else if (saveConfigAction.equals("RESTART_SERVICE")) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span> stop();<a name="line.553"></a>
-<span class="sourceLineNo">554</span> System.exit(3);<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span> } catch (Exception e) {<a name="line.556"></a>
-<span class="sourceLineNo">557</span> throw new RuntimeException(e);<a name="line.557"></a>
-<span class="sourceLineNo">558</span> }<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span> /**<a name="line.561"></a>
-<span class="sourceLineNo">562</span> * Sets the <code>jetty.xml</code> used to configure the Jetty server.<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * <a name="line.563"></a>
-<span class="sourceLineNo">564</span> * <p><a name="line.564"></a>
-<span class="sourceLineNo">565</span> * <a name="line.565"></a>
-<span class="sourceLineNo">566</span> * @param jettyXml <a name="line.566"></a>
-<span class="sourceLineNo">567</span> * The <code>jetty.xml</code>.<a name="line.567"></a>
-<span class="sourceLineNo">568</span> * <br>Can be any of the following:<a name="line.568"></a>
-<span class="sourceLineNo">569</span> * <ul><a name="line.569"></a>
-<span class="sourceLineNo">570</span> * <li>A {@link File} representing the location on the file system.<a name="line.570"></a>
-<span class="sourceLineNo">571</span> * <li>An {@link InputStream} containing the contents of the file.<a name="line.571"></a>
-<span class="sourceLineNo">572</span> * <li>A {@link String} representing the file system path.<a name="line.572"></a>
-<span class="sourceLineNo">573</span> * </ul><a name="line.573"></a>
-<span class="sourceLineNo">574</span> * @return This object (for method chaining).<a name="line.574"></a>
-<span class="sourceLineNo">575</span> */<a name="line.575"></a>
-<span class="sourceLineNo">576</span> public RestMicroservice setJettyXml(Object jettyXml) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span> if (jettyXml instanceof String || jettyXml instanceof File || jettyXml instanceof InputStream)<a name="line.577"></a>
-<span class="sourceLineNo">578</span> this.jettyXml = jettyXml;<a name="line.578"></a>
-<span class="sourceLineNo">579</span> else<a name="line.579"></a>
-<span class="sourceLineNo">580</span> throw new FormattedRuntimeException("Invalid object type passed to setJettyXml()", jettyXml == null ? null : jettyXml.getClass().getName());<a name="line.580"></a>
-<span class="sourceLineNo">581</span> return this;<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> //--------------------------------------------------------------------------------<a name="line.585"></a>
-<span class="sourceLineNo">586</span> // Lifecycle listener methods.<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> * Called before {@link #createServer()} is called.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * <a name="line.591"></a>
-<span class="sourceLineNo">592</span> * <p><a name="line.592"></a>
-<span class="sourceLineNo">593</span> * Subclasses can override this method to hook into the lifecycle of this application.<a name="line.593"></a>
-<span class="sourceLineNo">594</span> */<a name="line.594"></a>
-<span class="sourceLineNo">595</span> protected void onCreateServer() {}<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> * Called before {@link #startServer()} is called.<a name="line.598"></a>
-<span class="sourceLineNo">599</span> * <a name="line.599"></a>
-<span class="sourceLineNo">600</span> * <p><a name="line.600"></a>
-<span class="sourceLineNo">601</span> * Subclasses can override this method to hook into the lifecycle of this application.<a name="line.601"></a>
-<span class="sourceLineNo">602</span> */<a name="line.602"></a>
-<span class="sourceLineNo">603</span> protected void onStartServer() {}<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> * Called after the Jetty server is started.<a name="line.606"></a>
-<span class="sourceLineNo">607</span> * <a name="line.607"></a>
-<span class="sourceLineNo">608</span> * <p><a name="line.608"></a>
-<span class="sourceLineNo">609</span> * Subclasses can override this method to hook into the lifecycle of this application.<a name="line.609"></a>
-<span class="sourceLineNo">610</span> */<a name="line.610"></a>
-<span class="sourceLineNo">611</span> protected void onPostStartServer() {}<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> * Called before the Jetty server is stopped.<a name="line.614"></a>
-<span class="sourceLineNo">615</span> * <a name="line.615"></a>
-<span class="sourceLineNo">616</span> * <p><a name="line.616"></a>
-<span class="sourceLineNo">617</span> * Subclasses can override this method to hook into the lifecycle of this application.<a name="line.617"></a>
-<span class="sourceLineNo">618</span> */<a name="line.618"></a>
-<span class="sourceLineNo">619</span> protected void onStopServer() {}<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> * Called after the Jetty server is stopped.<a name="line.622"></a>
-<span class="sourceLineNo">623</span> * <a name="line.623"></a>
-<span class="sourceLineNo">624</span> * <p><a name="line.624"></a>
-<span class="sourceLineNo">625</span> * Subclasses can override this method to hook into the lifecycle of this application.<a name="line.625"></a>
-<span class="sourceLineNo">626</span> */<a name="line.626"></a>
-<span class="sourceLineNo">627</span> protected void onPostStopServer() {}<a name="line.627"></a>
+<span class="sourceLineNo">159</span> //--------------------------------------------------------------------------------<a name="line.159"></a>
+<span class="sourceLineNo">160</span> // RestMicroservice API methods.<a name="line.160"></a>
+<span class="sourceLineNo">161</span> //--------------------------------------------------------------------------------<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> /**<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * Returns the port that this microservice started up on.<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * @return The port that this microservice started up on.<a name="line.165"></a>
+<span class="sourceLineNo">166</span> */<a name="line.166"></a>
+<span class="sourceLineNo">167</span> public int getPort() {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return port;<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 URI where this microservice is listening on.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * @return The URI where this microservice is listening on.<a name="line.173"></a>
+<span class="sourceLineNo">174</span> */<a name="line.174"></a>
+<span class="sourceLineNo">175</span> public URI getURI() {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> String scheme = getConfig().getBoolean("REST/useSsl") ? "https" : "http";<a name="line.176"></a>
+<span class="sourceLineNo">177</span> String hostname = "localhost";<a name="line.177"></a>
+<span class="sourceLineNo">178</span> String ctx = "/".equals(contextPath) ? null : contextPath;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> try {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> hostname = InetAddress.getLocalHost().getHostName();<a name="line.180"></a>
+<span class="sourceLineNo">181</span> } catch (UnknownHostException e) {}<a name="line.181"></a>
+<span class="sourceLineNo">182</span> try {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> return new URI(scheme, null, hostname, port, ctx, null, null);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> } catch (URISyntaxException e) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> throw new RuntimeException(e);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span> /**<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * Initialize the logging for this microservice.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * <a name="line.191"></a>
+<span class="sourceLineNo">192</span> * <p><a name="line.192"></a>
+<span class="sourceLineNo">193</span> * Subclasses can override this method to provide customized logging.<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * <a name="line.194"></a>
+<span class="sourceLineNo">195</span> * <p><a name="line.195"></a>
+<span class="sourceLineNo">196</span> * The default implementation uses the <cs>Logging</cs> section in the config file to set up logging:<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * <p class='bcode'><a name="line.197"></a>
+<span class="sourceLineNo">198</span> * <cc>#================================================================================<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * # Logger settings<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * # See FileHandler Java class for details.<a name="line.200"></a>
+<span class="sourceLineNo">201</span> * #================================================================================</cc><a name="line.201"></a>
+<span class="sourceLineNo">202</span> * <cs>[Logging]</cs><a name="line.202"></a>
+<span class="sourceLineNo">203</span> *<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * <cc># The directory where to create the log file.<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * # Default is ".".</cc><a name="line.205"></a>
+<span class="sourceLineNo">206</span> * <ck>logDir</ck> = logs<a name="line.206"></a>
+<span class="sourceLineNo">207</span> *<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * <cc># The name of the log file to create for the main logger.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * # The logDir and logFile make up the pattern that's passed to the FileHandler<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * # constructor.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * # If value is not specified, then logging to a file will not be set up.</cc><a name="line.211"></a>
+<span class="sourceLineNo">212</span> * <ck>logFile</ck> = microservice.%g.log<a name="line.212"></a>
+<span class="sourceLineNo">213</span> *<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * <cc># Whether to append to the existing log file or create a new one.<a name="line.214"></a>
+<span class="sourceLineNo">215</span> * # Default is false.</cc><a name="line.215"></a>
+<span class="sourceLineNo">216</span> * <ck>append</ck> =<a name="line.216"></a>
+<span class="sourceLineNo">217</span> *<a name="line.217"></a>
+<span class="sourceLineNo">218</span> * <cc># The SimpleDateFormat format to use for dates.<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * # Default is "yyyy.MM.dd hh:mm:ss".</cc><a name="line.219"></a>
+<span class="sourceLineNo">220</span> * <ck>dateFormat</ck> =<a name="line.220"></a>
+<span class="sourceLineNo">221</span> *<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * <cc># The log message format.<a name="line.222"></a>
+<span class="sourceLineNo">223</span> * # The value can contain any of the following variables:<a name="line.223"></a>
+<span class="sourceLineNo">224</span> * # {date} - The date, formatted per dateFormat.<a name="line.224"></a>
+<span class="sourceLineNo">225</span> * # {class} - The class name.<a name="line.225"></a>
+<span class="sourceLineNo">226</span> * # {method} - The method name.<a name="line.226"></a>
+<span class="sourceLineNo">227</span> * # {logger} - The logger name.<a name="line.227"></a>
+<span class="sourceLineNo">228</span> * # {level} - The log level name.<a name="line.228"></a>
+<span class="sourceLineNo">229</span> * # {msg} - The log message.<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * # {threadid} - The thread ID.<a name="line.230"></a>
+<span class="sourceLineNo">231</span> * # {exception} - The localized exception message.<a name="line.231"></a>
+<span class="sourceLineNo">232</span> * # Default is "[{date} {level}] {msg}%n".</cc><a name="line.232"></a>
+<span class="sourceLineNo">233</span> * <ck>format</ck> =<a name="line.233"></a>
+<span class="sourceLineNo">234</span> *<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * <cc># The maximum log file size.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * # Suffixes available for numbers.<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * # See ConfigFile.getInt(String,int) for details.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * # Default is 1M.</cc><a name="line.238"></a>
+<span class="sourceLineNo">239</span> * <ck>limit</ck> = 10M<a name="line.239"></a>
+<span class="sourceLineNo">240</span> *<a name="line.240"></a>
+<span class="sourceLineNo">241</span> * <cc># Max number of log files.<a name="line.241"></a>
+<span class="sourceLineNo">242</span> * # Default is 1.</cc><a name="line.242"></a>
+<span class="sourceLineNo">243</span> * <ck>count</ck> = 5<a name="line.243"></a>
+<span class="sourceLineNo">244</span> *<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * <cc># Default log levels.<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * # Keys are logger names.<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * # Values are serialized Level POJOs.</cc><a name="line.247"></a>
+<span class="sourceLineNo">248</span> * <ck>levels</ck> = { org.apache.juneau:'INFO' }<a name="line.248"></a>
+<span class="sourceLineNo">249</span> *<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * <cc># Only print unique stack traces once and then refer to them by a simple 8 character hash identifier.<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * # Useful for preventing log files from filling up with duplicate stack traces.<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * # Default is false.</cc><a name="line.252"></a>
+<span class="sourceLineNo">253</span> * <ck>useStackTraceHashes</ck> = true<a name="line.253"></a>
+<span class="sourceLineNo">254</span> *<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * <cc># The default level for the console logger.<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * # Default is WARNING.</cc><a name="line.256"></a>
+<span class="sourceLineNo">257</span> * <ck>consoleLevel</ck> = WARNING<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * </p><a name="line.258"></a>
+<span class="sourceLineNo">259</span> *<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * @throws Exception<a name="line.260"></a>
+<span class="sourceLineNo">261</span> */<a name="line.261"></a>
+<span class="sourceLineNo">262</span> protected void initLogging() throws Exception {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> ConfigFile cf = getConfig();<a name="line.263"></a>
+<span class="sourceLineNo">264</span> logger = Logger.getLogger("");<a name="line.264"></a>
+<span class="sourceLineNo">265</span> String logFile = cf.getString("Logging/logFile");<a name="line.265"></a>
+<span class="sourceLineNo">266</span> if (! isEmpty(logFile)) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> LogManager.getLogManager().reset();<a name="line.267"></a>
+<span class="sourceLineNo">268</span> String logDir = cf.getString("Logging/logDir", ".");<a name="line.268"></a>
+<span class="sourceLineNo">269</span> mkdirs(new File(logDir), false);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> boolean append = cf.getBoolean("Logging/append");<a name="line.270"></a>
+<span class="sourceLineNo">271</span> int limit = cf.getInt("Logging/limit", 1024*1024);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> int count = cf.getInt("Logging/count", 1);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> FileHandler fh = new FileHandler(logDir + '/' + logFile, limit, count, append);<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> boolean useStackTraceHashes = cf.getBoolean("Logging/useStackTraceHashes");<a name="line.275"></a>
+<span class="sourceLineNo">276</span> String format = cf.getString("Logging/format", "[{date} {level}] {msg}%n");<a name="line.276"></a>
+<span class="sourceLineNo">277</span> String dateFormat = cf.getString("Logging/dateFormat", "yyyy.MM.dd hh:mm:ss");<a name="line.277"></a>
+<span class="sourceLineNo">278</span> fh.setFormatter(new LogEntryFormatter(format, dateFormat, useStackTraceHashes));<a name="line.278"></a>
+<span class="sourceLineNo">279</span> logger.addHandler(fh);<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> ConsoleHandler ch = new ConsoleHandler();<a name="line.281"></a>
+<span class="sourceLineNo">282</span> ch.setLevel(Level.parse(cf.getString("Logging/consoleLevel", "WARNING")));<a name="line.282"></a>
+<span class="sourceLineNo">283</span> ch.setFormatter(new LogEntryFormatter(format, dateFormat, false));<a name="line.283"></a>
+<span class="sourceLineNo">284</span> logger.addHandler(ch);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> ObjectMap loggerLevels = cf.getObject("Logging/levels", ObjectMap.class);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> if (loggerLevels != null)<a name="line.287"></a>
+<span class="sourceLineNo">288</span> for (String l : loggerLevels.keySet())<a name="line.288"></a>
+<span class="sourceLineNo">289</span> Logger.getLogger(l).setLevel(loggerLevels.get(l, Level.class));<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span> /**<a name="line.292"></a>
+<span class="sourceLineNo">293</span> * Method used to create (but not start) an instance of a Jetty server.<a name="line.293"></a>
+<span class="sourceLineNo">294</span> * <a name="line.294"></a>
+<span class="sourceLineNo">295</span> * <p><a name="line.295"></a>
+<span class="sourceLineNo">296</span> * Subclasses can override this method to customize the Jetty server before it is started.<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * <a name="line.297"></a>
+<span class="sourceLineNo">298</span> * <p><a name="line.298"></a>
+<span class="sourceLineNo">299</span> * The default implementation is configured by the following values in the config file <a name="line.299"></a>
+<span class="sourceLineNo">300</span> * if a jetty.xml is not specified via a <code>REST/jettyXml</code> setting:<a name="line.300"></a>
+<span class="sourceLineNo">301</span> * <p class='bcode'><a name="line.301"></a>
+<span class="sourceLineNo">302</span> * <cc>#================================================================================<a name="line.302"></a>
+<span class="sourceLineNo">303</span> * # REST settings<a name="line.303"></a>
+<span class="sourceLineNo">304</span> * #================================================================================</cc><a name="line.304"></a>
+<span class="sourceLineNo">305</span> * <cs>[REST]</cs><a name="line.305"></a>
+<span class="sourceLineNo">306</span> *<a name="line.306"></a>
+<span class="sourceLineNo">307</span> * <cc># The HTTP port number to use.<a name="line.307"></a>
+<span class="sourceLineNo">308</span> * # Default is Rest-Port setting in manifest file, or 8000.<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * # Can also specify a comma-delimited lists of ports to try, including 0 meaning<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * # try a random port.</cc><a name="line.310"></a>
+<span class="sourceLineNo">311</span> * <ck>port</ck> = 10000<a name="line.311"></a>
+<span class="sourceLineNo">312</span> *<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * <cc># The context root of the Jetty server.<a name="line.313"></a>
+<span class="sourceLineNo">314</span> * # Default is Rest-ContextPath in manifest file, or "/".</cc><a name="line.314"></a>
+<span class="sourceLineNo">315</span> * <ck>contextPath</ck> =<a name="line.315"></a>
+<spa
<TRUNCATED>
[19/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
Update javadocs.
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/4cba2c2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/tree/4cba2c2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/diff/4cba2c2c
Branch: refs/heads/asf-site
Commit: 4cba2c2cd3efa0bfd765da2faaaf5a8f574b21d7
Parents: 11de748
Author: JamesBognar <ja...@apache.org>
Authored: Sat Sep 2 13:21:16 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Sat Sep 2 13:21:16 2017 -0400
----------------------------------------------------------------------
content/site/apidocs/allclasses-frame.html | 8 +-
content/site/apidocs/allclasses-noframe.html | 8 +-
content/site/apidocs/constant-values.html | 52 +-
.../doc-files/ReleaseNotes_632_DarkStyle.png | Bin 0 -> 221326 bytes
content/site/apidocs/index-all.html | 100 +-
.../apache/juneau/annotation/NameProperty.html | 7 +-
.../juneau/annotation/ParentProperty.html | 6 +-
.../apidocs/org/apache/juneau/dto/html5/A.html | 26 +-
.../apache/juneau/ini/ConfigFileListener.html | 4 +-
.../org/apache/juneau/ini/ConfigFileVar.html | 418 +++++
.../apache/juneau/ini/ConfigFileWrapped.html | 92 +-
.../org/apache/juneau/ini/package-frame.html | 1 +
.../org/apache/juneau/ini/package-summary.html | 16 +-
.../org/apache/juneau/ini/package-tree.html | 13 +
.../juneau/microservice/Microservice.html | 56 +-
.../apache/juneau/microservice/Resource.html | 2 +-
.../juneau/microservice/ResourceGroup.html | 2 +-
.../juneau/microservice/ResourceJena.html | 22 +-
.../juneau/microservice/ResourceJenaGroup.html | 28 +-
.../juneau/microservice/RestMicroservice.html | 185 +--
.../juneau/microservice/package-tree.html | 10 +-
.../microservice/resources/package-summary.html | 4 +-
.../microservice/resources/package-tree.html | 4 +-
.../microservice/sample/HelloWorldResource.html | 347 ++++
.../microservice/sample/RootResources.html | 322 ++++
.../microservice/sample/package-frame.html | 21 +
.../microservice/sample/package-summary.html | 149 ++
.../microservice/sample/package-tree.html | 165 ++
.../apache/juneau/msgpack/package-summary.html | 4 +-
.../org/apache/juneau/msgpack/package-tree.html | 4 +-
.../org/apache/juneau/rest/RestConfig.html | 8 +-
.../org/apache/juneau/rest/RestContext.html | 2 +-
.../org/apache/juneau/rest/RestResponse.html | 69 +-
.../org/apache/juneau/rest/RestServlet.html | 2 +-
.../apache/juneau/rest/RestServletDefault.html | 2 +-
.../juneau/rest/RestServletGroupDefault.html | 2 +-
.../apache/juneau/rest/annotation/Property.html | 9 +-
.../juneau/rest/annotation/RestResource.html | 69 +-
.../juneau/rest/client/RestCallException.html | 12 +-
.../apache/juneau/rest/jaxrs/BaseProvider.html | 2 +-
.../juneau/rest/jaxrs/package-summary.html | 4 +-
.../apache/juneau/rest/jaxrs/package-tree.html | 4 +-
.../rest/jaxrs/rdf/DefaultJenaProvider.html | 256 ---
.../juneau/rest/jaxrs/rdf/package-frame.html | 20 -
.../juneau/rest/jaxrs/rdf/package-summary.html | 152 --
.../juneau/rest/jaxrs/rdf/package-tree.html | 140 --
.../rest/jena/RestServletJenaDefault.html | 515 ------
.../rest/jena/RestServletJenaGroupDefault.html | 351 ----
.../apache/juneau/rest/jena/package-frame.html | 21 -
.../juneau/rest/jena/package-summary.html | 162 --
.../apache/juneau/rest/jena/package-tree.html | 152 --
.../juneau/rest/labels/package-summary.html | 4 +-
.../apache/juneau/rest/labels/package-tree.html | 4 +-
.../org/apache/juneau/rest/package-summary.html | 16 +-
.../org/apache/juneau/svl/DefaultingVar.html | 2 +-
.../org/apache/juneau/svl/VarResolver.html | 20 +-
.../org/apache/juneau/svl/package-summary.html | 4 +-
.../org/apache/juneau/svl/vars/ArgsVar.html | 4 +-
.../apache/juneau/svl/vars/ConfigFileVar.html | 418 -----
.../apache/juneau/svl/vars/EnvVariablesVar.html | 4 +-
.../apache/juneau/svl/vars/package-frame.html | 1 -
.../apache/juneau/svl/vars/package-summary.html | 14 +-
.../apache/juneau/svl/vars/package-tree.html | 1 -
.../apache/juneau/utils/PojoIntrospector.html | 4 +-
.../org/apache/juneau/utils/PojoMerge.html | 374 +++++
.../org/apache/juneau/utils/PojoQuery.html | 4 +-
.../org/apache/juneau/utils/package-frame.html | 1 +
.../apache/juneau/utils/package-summary.html | 26 +-
.../org/apache/juneau/utils/package-tree.html | 1 +
.../apache/juneau/xml/annotation/XmlFormat.html | 4 +-
content/site/apidocs/overview-frame.html | 3 +-
content/site/apidocs/overview-summary.html | 458 ++---
content/site/apidocs/overview-tree.html | 23 +-
content/site/apidocs/package-list | 3 +-
content/site/apidocs/serialized-form.html | 50 +-
.../apache/juneau/annotation/NameProperty.html | 73 +-
.../juneau/annotation/ParentProperty.html | 64 +-
.../src-html/org/apache/juneau/dto/html5/A.html | 309 ++--
.../org/apache/juneau/http/ContentType.html | 8 +-
.../org/apache/juneau/http/MediaType.html | 4 +-
.../org/apache/juneau/ini/ConfigFileVar.html | 141 ++
.../apache/juneau/ini/ConfigFileWrapped.html | 531 +++---
.../juneau/microservice/Microservice.html | 912 +++++-----
.../juneau/microservice/ResourceJena.html | 50 +-
.../juneau/microservice/ResourceJenaGroup.html | 59 +-
.../juneau/microservice/RestMicroservice.html | 1265 +++++++-------
.../microservice/sample/HelloWorldResource.html | 107 ++
.../microservice/sample/RootResources.html | 113 ++
.../juneau/rest/ReaderResource.Builder.html | 2 +-
.../org/apache/juneau/rest/ReaderResource.html | 2 +-
.../apache/juneau/rest/RequestPathMatch.html | 2 +-
.../org/apache/juneau/rest/RestRequest.html | 2 +-
.../org/apache/juneau/rest/RestResponse.html | 1558 +++++++++---------
.../org/apache/juneau/rest/RestServlet.html | 2 +-
.../org/apache/juneau/rest/RestUtils.html | 2 +-
.../apache/juneau/rest/annotation/Property.html | 84 +-
.../juneau/rest/annotation/RestResource.html | 1406 ++++++++--------
.../juneau/rest/client/RestCallException.html | 136 +-
.../rest/jaxrs/rdf/DefaultJenaProvider.html | 161 --
.../rest/jena/RestServletJenaDefault.html | 353 ----
.../rest/jena/RestServletJenaGroupDefault.html | 115 --
.../org/apache/juneau/svl/VarResolver.html | 371 +++--
.../apache/juneau/svl/vars/ConfigFileVar.html | 142 --
.../org/apache/juneau/utils/PojoMerge.html | 214 +++
content/site/apidocs/stylesheet.css | 574 +++++++
content/sourceCode.html | 2 +-
106 files changed, 7033 insertions(+), 7204 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/allclasses-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/allclasses-frame.html b/content/site/apidocs/allclasses-frame.html
index e7f12aa..98c1eda 100644
--- a/content/site/apidocs/allclasses-frame.html
+++ b/content/site/apidocs/allclasses-frame.html
@@ -137,7 +137,7 @@
<li><a href="org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini" target="classFrame">ConfigFileFormat</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileImpl</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileListener</a></li>
-<li><a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">ConfigFileVar</a></li>
+<li><a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileVar</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileWrapped</a></li>
<li><a href="org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources" target="classFrame">ConfigResource</a></li>
<li><a href="org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigUtils</a></li>
@@ -203,7 +203,6 @@
<li><a href="org/apache/juneau/dto/html5/Dd.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Dd</a></li>
<li><a href="org/apache/juneau/rest/response/DefaultHandler.html" title="class in org.apache.juneau.rest.response" target="classFrame">DefaultHandler</a></li>
<li><a href="org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl" target="classFrame">DefaultingVar</a></li>
-<li><a href="org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf" target="classFrame">DefaultJenaProvider</a></li>
<li><a href="org/apache/juneau/rest/jaxrs/DefaultProvider.html" title="class in org.apache.juneau.rest.jaxrs" target="classFrame">DefaultProvider</a></li>
<li><a href="org/apache/juneau/dto/html5/Del.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Del</a></li>
<li><a href="org/apache/juneau/Delegate.html" title="interface in org.apache.juneau" target="classFrame"><span class="interfaceName">Delegate</span></a></li>
@@ -274,6 +273,7 @@
<li><a href="org/apache/juneau/http/HeaderString.html" title="class in org.apache.juneau.http" target="classFrame">HeaderString</a></li>
<li><a href="org/apache/juneau/http/HeaderStringArray.html" title="class in org.apache.juneau.http" target="classFrame">HeaderStringArray</a></li>
<li><a href="org/apache/juneau/http/HeaderUri.html" title="class in org.apache.juneau.http" target="classFrame">HeaderUri</a></li>
+<li><a href="org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample" target="classFrame">HelloWorldResource</a></li>
<li><a href="org/apache/juneau/rest/annotation/HookEvent.html" title="enum in org.apache.juneau.rest.annotation" target="classFrame">HookEvent</a></li>
<li><a href="org/apache/juneau/http/Host.html" title="class in org.apache.juneau.http" target="classFrame">Host</a></li>
<li><a href="org/apache/juneau/dto/html5/Hr.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Hr</a></li>
@@ -475,6 +475,7 @@
<li><a href="org/apache/juneau/plaintext/PlainTextSerializerSession.html" title="class in org.apache.juneau.plaintext" target="classFrame">PlainTextSerializerSession</a></li>
<li><a href="org/apache/juneau/annotation/Pojo.html" title="annotation in org.apache.juneau.annotation" target="classFrame">Pojo</a></li>
<li><a href="org/apache/juneau/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils" target="classFrame">PojoIntrospector</a></li>
+<li><a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils" target="classFrame">PojoMerge</a></li>
<li><a href="org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils" target="classFrame">PojoQuery</a></li>
<li><a href="org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils" target="classFrame">PojoRest</a></li>
<li><a href="org/apache/juneau/utils/PojoRestException.html" title="class in org.apache.juneau.utils" target="classFrame">PojoRestException</a></li>
@@ -602,13 +603,12 @@
<li><a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest" target="classFrame">RestServletDefault</a></li>
<li><a href="org/apache/juneau/rest/RestServletException.html" title="class in org.apache.juneau.rest" target="classFrame">RestServletException</a></li>
<li><a href="org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest" target="classFrame">RestServletGroupDefault</a></li>
-<li><a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena" target="classFrame">RestServletJenaDefault</a></li>
-<li><a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena" target="classFrame">RestServletJenaGroupDefault</a></li>
<li><a href="org/apache/juneau/rest/RestUtils.html" title="class in org.apache.juneau.rest" target="classFrame">RestUtils</a></li>
<li><a href="org/apache/juneau/dto/ResultSetList.html" title="class in org.apache.juneau.dto" target="classFrame">ResultSetList</a></li>
<li><a href="org/apache/juneau/http/RetryAfter.html" title="class in org.apache.juneau.http" target="classFrame">RetryAfter</a></li>
<li><a href="org/apache/juneau/rest/client/RetryOn.html" title="class in org.apache.juneau.rest.client" target="classFrame">RetryOn</a></li>
<li><a href="org/apache/juneau/remoteable/ReturnValue.html" title="enum in org.apache.juneau.remoteable" target="classFrame">ReturnValue</a></li>
+<li><a href="org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample" target="classFrame">RootResources</a></li>
<li><a href="org/apache/juneau/dto/html5/Rp.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Rp</a></li>
<li><a href="org/apache/juneau/dto/html5/Rt.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Rt</a></li>
<li><a href="org/apache/juneau/dto/html5/Rtc.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Rtc</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/allclasses-noframe.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/allclasses-noframe.html b/content/site/apidocs/allclasses-noframe.html
index 5e35a6b..372b262 100644
--- a/content/site/apidocs/allclasses-noframe.html
+++ b/content/site/apidocs/allclasses-noframe.html
@@ -137,7 +137,7 @@
<li><a href="org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini">ConfigFileFormat</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a></li>
-<li><a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars">ConfigFileVar</a></li>
+<li><a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></li>
<li><a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></li>
<li><a href="org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources">ConfigResource</a></li>
<li><a href="org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini">ConfigUtils</a></li>
@@ -203,7 +203,6 @@
<li><a href="org/apache/juneau/dto/html5/Dd.html" title="class in org.apache.juneau.dto.html5">Dd</a></li>
<li><a href="org/apache/juneau/rest/response/DefaultHandler.html" title="class in org.apache.juneau.rest.response">DefaultHandler</a></li>
<li><a href="org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></li>
-<li><a href="org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf">DefaultJenaProvider</a></li>
<li><a href="org/apache/juneau/rest/jaxrs/DefaultProvider.html" title="class in org.apache.juneau.rest.jaxrs">DefaultProvider</a></li>
<li><a href="org/apache/juneau/dto/html5/Del.html" title="class in org.apache.juneau.dto.html5">Del</a></li>
<li><a href="org/apache/juneau/Delegate.html" title="interface in org.apache.juneau"><span class="interfaceName">Delegate</span></a></li>
@@ -274,6 +273,7 @@
<li><a href="org/apache/juneau/http/HeaderString.html" title="class in org.apache.juneau.http">HeaderString</a></li>
<li><a href="org/apache/juneau/http/HeaderStringArray.html" title="class in org.apache.juneau.http">HeaderStringArray</a></li>
<li><a href="org/apache/juneau/http/HeaderUri.html" title="class in org.apache.juneau.http">HeaderUri</a></li>
+<li><a href="org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample">HelloWorldResource</a></li>
<li><a href="org/apache/juneau/rest/annotation/HookEvent.html" title="enum in org.apache.juneau.rest.annotation">HookEvent</a></li>
<li><a href="org/apache/juneau/http/Host.html" title="class in org.apache.juneau.http">Host</a></li>
<li><a href="org/apache/juneau/dto/html5/Hr.html" title="class in org.apache.juneau.dto.html5">Hr</a></li>
@@ -475,6 +475,7 @@
<li><a href="org/apache/juneau/plaintext/PlainTextSerializerSession.html" title="class in org.apache.juneau.plaintext">PlainTextSerializerSession</a></li>
<li><a href="org/apache/juneau/annotation/Pojo.html" title="annotation in org.apache.juneau.annotation">Pojo</a></li>
<li><a href="org/apache/juneau/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils">PojoIntrospector</a></li>
+<li><a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils">PojoMerge</a></li>
<li><a href="org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils">PojoQuery</a></li>
<li><a href="org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils">PojoRest</a></li>
<li><a href="org/apache/juneau/utils/PojoRestException.html" title="class in org.apache.juneau.utils">PojoRestException</a></li>
@@ -602,13 +603,12 @@
<li><a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></li>
<li><a href="org/apache/juneau/rest/RestServletException.html" title="class in org.apache.juneau.rest">RestServletException</a></li>
<li><a href="org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></li>
-<li><a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a></li>
-<li><a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaGroupDefault</a></li>
<li><a href="org/apache/juneau/rest/RestUtils.html" title="class in org.apache.juneau.rest">RestUtils</a></li>
<li><a href="org/apache/juneau/dto/ResultSetList.html" title="class in org.apache.juneau.dto">ResultSetList</a></li>
<li><a href="org/apache/juneau/http/RetryAfter.html" title="class in org.apache.juneau.http">RetryAfter</a></li>
<li><a href="org/apache/juneau/rest/client/RetryOn.html" title="class in org.apache.juneau.rest.client">RetryOn</a></li>
<li><a href="org/apache/juneau/remoteable/ReturnValue.html" title="enum in org.apache.juneau.remoteable">ReturnValue</a></li>
+<li><a href="org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample">RootResources</a></li>
<li><a href="org/apache/juneau/dto/html5/Rp.html" title="class in org.apache.juneau.dto.html5">Rp</a></li>
<li><a href="org/apache/juneau/dto/html5/Rt.html" title="class in org.apache.juneau.dto.html5">Rt</a></li>
<li><a href="org/apache/juneau/dto/html5/Rtc.html" title="class in org.apache.juneau.dto.html5">Rtc</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/constant-values.html b/content/site/apidocs/constant-values.html
index 4d280ed..0d608a4 100644
--- a/content/site/apidocs/constant-values.html
+++ b/content/site/apidocs/constant-values.html
@@ -664,6 +664,32 @@
</tbody>
</table>
</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.juneau.ini.ConfigFileVar.NAME">
+<!-- -->
+</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/juneau/ini/ConfigFileVar.html#NAME">NAME</a></code></td>
+<td class="colLast"><code>"C"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="org.apache.juneau.ini.ConfigFileVar.SESSION_config">
+<!-- -->
+</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/juneau/ini/ConfigFileVar.html#SESSION_config">SESSION_config</a></code></td>
+<td class="colLast"><code>"config"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
</ul>
<ul class="blockList">
<li class="blockList">
@@ -1647,32 +1673,6 @@
</li>
<li class="blockList">
<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars">ConfigFileVar</a></span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="org.apache.juneau.svl.vars.ConfigFileVar.NAME">
-<!-- -->
-</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td><code><a href="org/apache/juneau/svl/vars/ConfigFileVar.html#NAME">NAME</a></code></td>
-<td class="colLast"><code>"C"</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.apache.juneau.svl.vars.ConfigFileVar.SESSION_config">
-<!-- -->
-</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td><code><a href="org/apache/juneau/svl/vars/ConfigFileVar.html#SESSION_config">SESSION_config</a></code></td>
-<td class="colLast"><code>"config"</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
<caption><span>org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars">EnvVariablesVar</a></span><span class="tabEnd"> </span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/doc-files/ReleaseNotes_632_DarkStyle.png
----------------------------------------------------------------------
diff --git a/content/site/apidocs/doc-files/ReleaseNotes_632_DarkStyle.png b/content/site/apidocs/doc-files/ReleaseNotes_632_DarkStyle.png
new file mode 100644
index 0000000..73732dc
Binary files /dev/null and b/content/site/apidocs/doc-files/ReleaseNotes_632_DarkStyle.png differ
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/index-all.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/index-all.html b/content/site/apidocs/index-all.html
index ad57076..5eeb8b5 100644
--- a/content/site/apidocs/index-all.html
+++ b/content/site/apidocs/index-all.html
@@ -4526,11 +4526,11 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileListener.html#ConfigFileListener--">ConfigFileListener()</a></span> - Constructor for class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a></dt>
<dd> </dd>
-<dt><a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ConfigFileVar</span></a> - Class in <a href="org/apache/juneau/svl/vars/package-summary.html">org.apache.juneau.svl.vars</a></dt>
+<dt><a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileVar</span></a> - Class in <a href="org/apache/juneau/ini/package-summary.html">org.apache.juneau.ini</a></dt>
<dd>
<div class="block">Config file variable resolver.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ConfigFileVar.html#ConfigFileVar--">ConfigFileVar()</a></span> - Constructor for class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars">ConfigFileVar</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileVar.html#ConfigFileVar--">ConfigFileVar()</a></span> - Constructor for class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></dt>
<dd>
<div class="block">Constructor.</div>
</dd>
@@ -5883,12 +5883,6 @@
<dd>
<div class="block">Constructor.</div>
</dd>
-<dt><a href="org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf"><span class="typeNameLink">DefaultJenaProvider</span></a> - Class in <a href="org/apache/juneau/rest/jaxrs/rdf/package-summary.html">org.apache.juneau.rest.jaxrs.rdf</a></dt>
-<dd>
-<div class="block">JAX-RS provider for the same serialize/parse support provided by the <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> class.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html#DefaultJenaProvider--">DefaultJenaProvider()</a></span> - Constructor for class org.apache.juneau.rest.jaxrs.rdf.<a href="org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf">DefaultJenaProvider</a></dt>
-<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlSerializerBuilder.html#defaultNamespace-java.lang.String-">defaultNamespace(String)</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlSerializerBuilder.html" title="class in org.apache.juneau.html">HtmlSerializerBuilder</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/soap/SoapXmlSerializerBuilder.html#defaultNamespace-java.lang.String-">defaultNamespace(String)</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>
@@ -8629,10 +8623,6 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/html5/Pre.html#getChildren--">getChildren()</a></span> - Method in class org.apache.juneau.dto.html5.<a href="org/apache/juneau/dto/html5/Pre.html" title="class in org.apache.juneau.dto.html5">Pre</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html#getChildren-org.apache.juneau.rest.RestRequest-">getChildren(RestRequest)</a></span> - Method in class org.apache.juneau.rest.jena.<a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaGroupDefault</a></dt>
-<dd>
-<div class="block">[GET /] - Get child resources.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestServletGroupDefault.html#getChildren-org.apache.juneau.rest.RestRequest-">getChildren(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></dt>
<dd>
<div class="block">[GET /] - Get child resources.</div>
@@ -10490,10 +10480,6 @@
<dd>
<div class="block">Bean property getter: <property>operationId</property>.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions(RestRequest)</a></span> - Method in class org.apache.juneau.rest.jena.<a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a></dt>
-<dd>
-<div class="block">[OPTIONS /*] - Show resource options.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestServletDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></dt>
<dd>
<div class="block">[OPTIONS /*] - Show resource options.</div>
@@ -12709,6 +12695,12 @@
<div class="block"><a class="./org/apache/juneau/dto/html5/doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a>
attribute.</div>
</dd>
+<dt><a href="org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">HelloWorldResource</span></a> - Class in <a href="org/apache/juneau/microservice/sample/package-summary.html">org.apache.juneau.microservice.sample</a></dt>
+<dd>
+<div class="block">Sample REST resource that prints out a simple "Hello world!" message.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/sample/HelloWorldResource.html#HelloWorldResource--">HelloWorldResource()</a></span> - Constructor for class org.apache.juneau.microservice.sample.<a href="org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample">HelloWorldResource</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/html5/HtmlElement.html#hidden-java.lang.Object-">hidden(Object)</a></span> - Method in class org.apache.juneau.dto.html5.<a href="org/apache/juneau/dto/html5/HtmlElement.html" title="class in org.apache.juneau.dto.html5">HtmlElement</a></dt>
<dd>
<div class="block"><a class="./org/apache/juneau/dto/html5/doclink" href="https://www.w3.org/TR/html5/editing.html#the-hidden-attribute">hidden</a> attribute.</div>
@@ -16614,6 +16606,14 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileWrapped.html#merge-org.apache.juneau.ini.ConfigFile-">merge(ConfigFile)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/PojoMerge.html#merge-java.lang.Class-T...-">merge(Class<T>, T...)</a></span> - Static method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils">PojoMerge</a></dt>
+<dd>
+<div class="block">Create a proxy interface on top of zero or more POJOs.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/PojoMerge.html#merge-java.lang.Class-boolean-T...-">merge(Class<T>, boolean, T...)</a></span> - Static method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils">PojoMerge</a></dt>
+<dd>
+<div class="block">Create a proxy interface on top of zero or more POJOs.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/ProcBuilder.html#merge--">merge()</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">Merge STDOUT and STDERR into a single stream.</div>
@@ -17106,6 +17106,10 @@
<dd>
<div class="block">Synonym for <a href="org/apache/juneau/dto/swagger/Xml.html#setName-java.lang.String-"><code>Xml.setName(String)</code></a>.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileVar.html#NAME">NAME</a></span> - Static variable in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></dt>
+<dd>
+<div class="block">The name of this variable.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/resources/LogsResource.FileResource.html#name">name</a></span> - Variable in class org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/LogsResource.FileResource.html" title="class in org.apache.juneau.microservice.resources">LogsResource.FileResource</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/remoteable/RemoteMethodArg.html#name">name</a></span> - Variable in class org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a></dt>
@@ -17152,10 +17156,6 @@
<dd>
<div class="block">The name of this variable.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ConfigFileVar.html#NAME">NAME</a></span> - Static variable in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars">ConfigFileVar</a></dt>
-<dd>
-<div class="block">The name of this variable.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/EnvVariablesVar.html#NAME">NAME</a></span> - Static variable in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars">EnvVariablesVar</a></dt>
<dd>
<div class="block">The name of this variable.</div>
@@ -18321,6 +18321,8 @@
<dd>
<div class="block">Predefined Microservice Resources</div>
</dd>
+<dt><a href="org/apache/juneau/microservice/sample/package-summary.html">org.apache.juneau.microservice.sample</a> - package org.apache.juneau.microservice.sample</dt>
+<dd> </dd>
<dt><a href="org/apache/juneau/msgpack/package-summary.html">org.apache.juneau.msgpack</a> - package org.apache.juneau.msgpack</dt>
<dd>
<div class="block">JSON serialization and parsing support</div>
@@ -18357,14 +18359,6 @@
<dd>
<div class="block">JAX-RS integration components</div>
</dd>
-<dt><a href="org/apache/juneau/rest/jaxrs/rdf/package-summary.html">org.apache.juneau.rest.jaxrs.rdf</a> - package org.apache.juneau.rest.jaxrs.rdf</dt>
-<dd>
-<div class="block">JAX-RS integration components with RDF support</div>
-</dd>
-<dt><a href="org/apache/juneau/rest/jena/package-summary.html">org.apache.juneau.rest.jena</a> - package org.apache.juneau.rest.jena</dt>
-<dd>
-<div class="block">RET servlet API with Jena components</div>
-</dd>
<dt><a href="org/apache/juneau/rest/labels/package-summary.html">org.apache.juneau.rest.labels</a> - package org.apache.juneau.rest.labels</dt>
<dd>
<div class="block">Various REST interface label classes</div>
@@ -19225,6 +19219,12 @@
<dd>
<div class="block">Shortcut for calling <code><jk>new</jk> PojoIntrospector(o, <jk>null</jk>);</code></div>
</dd>
+<dt><a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoMerge</span></a> - Class in <a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></dt>
+<dd>
+<div class="block">Utility class for merging POJOs behind a single interface.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/PojoMerge.html#PojoMerge--">PojoMerge()</a></span> - Constructor for class org.apache.juneau.utils.<a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils">PojoMerge</a></dt>
+<dd> </dd>
<dt><a href="org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoQuery</span></a> - Class in <a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></dt>
<dd>
<div class="block">Designed to provide search/view/sort/paging filtering on tabular in-memory POJO models.</div>
@@ -21693,6 +21693,8 @@
<dd>
<div class="block">If this schema is a reference to another schema (i.e.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestParam.html#resolve-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">resolve(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestParam.html" title="class in org.apache.juneau.rest">RestParam</a></dt>
<dd>
<div class="block">Resolves the parameter object.</div>
@@ -21741,8 +21743,6 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ArgsVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ConfigFileVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars">ConfigFileVar</a></dt>
-<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/EnvVariablesVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars">EnvVariablesVar</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/IfVar.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/IfVar.html" title="class in org.apache.juneau.svl.vars">IfVar</a></dt>
@@ -22166,18 +22166,6 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestServletGroupDefault.html#RestServletGroupDefault--">RestServletGroupDefault()</a></span> - Constructor for class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></dt>
<dd> </dd>
-<dt><a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">RestServletJenaDefault</span></a> - Class in <a href="org/apache/juneau/rest/jena/package-summary.html">org.apache.juneau.rest.jena</a></dt>
-<dd>
-<div class="block">Subclass of <a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> with default sets of serializers and parsers that include RDF support.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html#RestServletJenaDefault--">RestServletJenaDefault()</a></span> - Constructor for class org.apache.juneau.rest.jena.<a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a></dt>
-<dd> </dd>
-<dt><a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">RestServletJenaGroupDefault</span></a> - Class in <a href="org/apache/juneau/rest/jena/package-summary.html">org.apache.juneau.rest.jena</a></dt>
-<dd>
-<div class="block">Specialized subclass of <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> for showing "group" pages.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html#RestServletJenaGroupDefault--">RestServletJenaGroupDefault()</a></span> - Constructor for class org.apache.juneau.rest.jena.<a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaGroupDefault</a></dt>
-<dd> </dd>
<dt><a href="org/apache/juneau/rest/RestUtils.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestUtils</span></a> - Class in <a href="org/apache/juneau/rest/package-summary.html">org.apache.juneau.rest</a></dt>
<dd>
<div class="block">Various reusable utility methods.</div>
@@ -22269,6 +22257,12 @@
<dd>
<div class="block">The root file to base the entry paths on.</div>
</dd>
+<dt><a href="org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">RootResources</span></a> - Class in <a href="org/apache/juneau/microservice/sample/package-summary.html">org.apache.juneau.microservice.sample</a></dt>
+<dd>
+<div class="block">Root microservice page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/sample/RootResources.html#RootResources--">RootResources()</a></span> - Constructor for class org.apache.juneau.microservice.sample.<a href="org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample">RootResources</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#rootUrl-java.lang.Object-">rootUrl(Object)</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">Set a root URL for this client.</div>
@@ -22436,6 +22430,10 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileWrapped.html#save--">save()</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/sample/HelloWorldResource.html#sayHello--">sayHello()</a></span> - Method in class org.apache.juneau.microservice.sample.<a href="org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample">HelloWorldResource</a></dt>
+<dd>
+<div class="block">GET request handler</div>
+</dd>
<dt><a href="org/apache/juneau/dto/jsonschema/Schema.html" title="class in org.apache.juneau.dto.jsonschema"><span class="typeNameLink">Schema</span></a> - Class in <a href="org/apache/juneau/dto/jsonschema/package-summary.html">org.apache.juneau.dto.jsonschema</a></dt>
<dd>
<div class="block">Represents a top-level schema object bean in the JSON-Schema core specification.</div>
@@ -23041,7 +23039,7 @@
<dd>
<div class="block">The name of the session or context object that identifies the <a href="org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a> object.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ConfigFileVar.html#SESSION_config">SESSION_config</a></span> - Static variable in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars">ConfigFileVar</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileVar.html#SESSION_config">SESSION_config</a></span> - Static variable in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></dt>
<dd>
<div class="block">The name of the session or context object that identifies the <a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.</div>
</dd>
@@ -23469,14 +23467,12 @@
<dd>
<div class="block">Specifies the path of the config file for this microservice.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/Microservice.html#setConfig-org.apache.juneau.ini.ConfigFile-">setConfig(ConfigFile)</a></span> - Method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/Microservice.html#setConfig-org.apache.juneau.ini.ConfigFile-">setConfig(ConfigFile)</a></span> - Static method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></dt>
<dd>
<div class="block">Specifies the config file for this microservice.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/RestMicroservice.html#setConfig-java.lang.String-boolean-">setConfig(String, boolean)</a></span> - Method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/RestMicroservice.html#setConfig-org.apache.juneau.ini.ConfigFile-">setConfig(ConfigFile)</a></span> - Method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></dt>
-<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#setConfig-org.apache.http.client.config.RequestConfig-">setConfig(RequestConfig)</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">Set configuration settings on this request.</div>
@@ -23955,25 +23951,19 @@
<dd>
<div class="block">Overrides the logger for the resource.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-">setManifest(Manifest)</a></span> - Method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-">setManifest(Manifest)</a></span> - Static method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></dt>
<dd>
<div class="block">Specifies the manifest file of the jar file this microservice is contained within.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/Microservice.html#setManifest-java.io.File-">setManifest(File)</a></span> - Method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/Microservice.html#setManifest-java.io.File-">setManifest(File)</a></span> - Static method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></dt>
<dd>
<div class="block">Same as <a href="org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>Microservice.setManifest(Manifest)</code></a> except specified through a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a> object.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/Microservice.html#setManifest-java.lang.Class-">setManifest(Class<?>)</a></span> - Method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/Microservice.html#setManifest-java.lang.Class-">setManifest(Class<?>)</a></span> - Static method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></dt>
<dd>
<div class="block">Same as <a href="org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>Microservice.setManifest(Manifest)</code></a> except finds and loads the manifest file of the jar file that the
specified class is contained within.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/RestMicroservice.html#setManifest-java.util.jar.Manifest-">setManifest(Manifest)</a></span> - Method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/RestMicroservice.html#setManifest-java.io.File-">setManifest(File)</a></span> - Method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/RestMicroservice.html#setManifest-java.lang.Class-">setManifest(Class<?>)</a></span> - Method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></dt>
-<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/Microservice.html#setManifestContents-java.lang.String...-">setManifestContents(String...)</a></span> - Method in class org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></dt>
<dd>
<div class="block">Convenience method for specifying the manifest contents directly.</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html b/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
index 7f11689..6f326e7 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
@@ -95,13 +95,12 @@
<pre><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#METHOD" title="class or interface in java.lang.annotation">METHOD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</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/annotation/NameProperty.html#line.57">NameProperty</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/NameProperty.html#line.54">NameProperty</a></pre>
<div class="block">Identifies a setter as a method for setting the name of a POJO as it's known by its parent object.
<p>
- For example, the <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini"><code>Section</code></a> class must know the name it's known by it's parent <a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><code>ConfigFileImpl</code></a> class,
- so parsers will call this method with the section name
- using the <a href="../../../../org/apache/juneau/ini/Section.html#setName-java.lang.String-"><code>Section.setName(String)</code></a> method.
+ For example, the <code>Section</code> class must know the name it's known by it's parent <code>ConfigFileImpl</code> class,
+ so parsers will call this method with the section name using the <code>Section.setName(String)</code> method.
<p>
A commonly-used case is when you're parsing a JSON map containing beans where one of the bean properties is the key
used in the map.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html b/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
index 243e20c..2376fcf 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
@@ -95,13 +95,13 @@
<pre><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#METHOD" title="class or interface in java.lang.annotation">METHOD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</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/annotation/ParentProperty.html#line.52">ParentProperty</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/ParentProperty.html#line.50">ParentProperty</a></pre>
<div class="block">Identifies a setter as a method for adding a parent reference to a child object.
<p>
Used by the parsers to add references to parent objects in child objects.
- For example, the <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini"><code>Section</code></a> class cannot exist outside the scope of a parent <a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><code>ConfigFileImpl</code></a> class, so
- parsers will add a reference to the config file using the <a href="../../../../org/apache/juneau/ini/Section.html#setParent-org.apache.juneau.ini.ConfigFileImpl-"><code>Section.setParent(ConfigFileImpl)</code></a> method.
+ For example, the <code>Section</code> class cannot exist outside the scope of a parent <code>ConfigFileImpl</code> class, so
+ parsers will add a reference to the config file using the <code>Section.setParent(ConfigFileImpl)</code> method.
<p>
A commonly-used case is when you're parsing beans, and a child bean has a reference to a parent bean.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/dto/html5/A.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/html5/A.html b/content/site/apidocs/org/apache/juneau/dto/html5/A.html
index 2367be0..eafe546 100644
--- a/content/site/apidocs/org/apache/juneau/dto/html5/A.html
+++ b/content/site/apidocs/org/apache/juneau/dto/html5/A.html
@@ -119,7 +119,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre><a href="../../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation">@Bean</a>(<a href="../../../../../org/apache/juneau/annotation/Bean.html#typeName--">typeName</a>="a")
-public class <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.39">A</a>
+public class <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.38">A</a>
extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.html" title="class in org.apache.juneau.dto.html5">HtmlElementMixed</a></pre>
<div class="block">DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-a-element"><a></a>
element.
@@ -278,7 +278,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockListLast">
<li class="blockList">
<h4>A</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.39">A</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.38">A</a>()</pre>
</li>
</ul>
</li>
@@ -295,7 +295,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockList">
<li class="blockList">
<h4>download</h4>
-<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.52">download</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> download)</pre>
+<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.51">download</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> download)</pre>
<div class="block"><a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-download">download</a> attribute.
<p>
@@ -315,7 +315,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockList">
<li class="blockList">
<h4>href</h4>
-<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.75">href</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> href)</pre>
+<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.74">href</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> href)</pre>
<div class="block"><a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-href">href</a> attribute.
<p>
@@ -342,7 +342,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockList">
<li class="blockList">
<h4>hreflang</h4>
-<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.89">hreflang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hreflang)</pre>
+<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.88">hreflang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hreflang)</pre>
<div class="block"><a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-hreflang">hreflang</a> attribute.
<p>
@@ -361,7 +361,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockList">
<li class="blockList">
<h4>rel</h4>
-<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.103">rel</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> rel)</pre>
+<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.102">rel</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> rel)</pre>
<div class="block"><a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-rel">rel</a> attribute.
<p>
@@ -380,7 +380,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockList">
<li class="blockList">
<h4>target</h4>
-<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.117">target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> target)</pre>
+<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.116">target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> target)</pre>
<div class="block"><a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-target">target</a> attribute.
<p>
@@ -399,7 +399,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockList">
<li class="blockList">
<h4>type</h4>
-<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.131">type</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> type)</pre>
+<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.130">type</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> type)</pre>
<div class="block"><a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-type">type</a> attribute.
<p>
@@ -418,7 +418,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockList">
<li class="blockList">
<h4>_class</h4>
-<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.142">_class</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> _class)</pre>
+<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.141">_class</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> _class)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/html5/HtmlElement.html#Z:Z_class-java.lang.String-">HtmlElement</a></code></span></div>
<div class="block"><a class="doclink" href="https://www.w3.org/TR/html5/dom.html#classes">class</a> attribute.</div>
<dl>
@@ -437,7 +437,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockList">
<li class="blockList">
<h4>id</h4>
-<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.148">id</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> id)</pre>
+<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.147">id</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> id)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/html5/HtmlElement.html#id-java.lang.String-">HtmlElement</a></code></span></div>
<div class="block"><a class="doclink" href="https://www.w3.org/TR/html5/dom.html#the-id-attribute">id</a> attribute.</div>
<dl>
@@ -456,7 +456,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockList">
<li class="blockList">
<h4>style</h4>
-<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.154">style</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> style)</pre>
+<pre>public final <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.153">style</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> style)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/html5/HtmlElement.html#style-java.lang.String-">HtmlElement</a></code></span></div>
<div class="block"><a class="doclink" href="https://www.w3.org/TR/html5/dom.html#the-style-attribute">style</a> attribute.</div>
<dl>
@@ -475,7 +475,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockList">
<li class="blockList">
<h4>children</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.160">children</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... children)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.159">children</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... children)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.html#children-java.lang.Object...-">HtmlElementMixed</a></code></span></div>
<div class="block">Adds one or more child elements to this element.</div>
<dl>
@@ -496,7 +496,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.htm
<ul class="blockListLast">
<li class="blockList">
<h4>child</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.166">child</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> child)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/dto/html5/A.html" title="class in org.apache.juneau.dto.html5">A</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/A.html#line.165">child</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> child)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/html5/HtmlElementMixed.html#child-java.lang.Object-">HtmlElementMixed</a></code></span></div>
<div class="block">Adds a child element to this element.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/ini/ConfigFileListener.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigFileListener.html b/content/site/apidocs/org/apache/juneau/ini/ConfigFileListener.html
index bce8066..b0aaa4d 100644
--- a/content/site/apidocs/org/apache/juneau/ini/ConfigFileListener.html
+++ b/content/site/apidocs/org/apache/juneau/ini/ConfigFileListener.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFileListener.html" target="_top">Frames</a></li>
@@ -283,7 +283,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFileListener.html" target="_top">Frames</a></li>
[09/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
index 1b12b9b..e482aef 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
@@ -165,486 +165,478 @@
<span class="sourceLineNo">157</span> * the variable resolver constructed from {@link #createVarResolver()}.<a name="line.157"></a>
<span class="sourceLineNo">158</span> *<a name="line.158"></a>
<span class="sourceLineNo">159</span> * @param cf The config file for this application, or <jk>null</jk> if no config file is needed.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * @return This object (for method chaining).<a name="line.160"></a>
-<span class="sourceLineNo">161</span> */<a name="line.161"></a>
-<span class="sourceLineNo">162</span> public Microservice setConfig(ConfigFile cf) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> Microservice.cf = cf;<a name="line.163"></a>
-<span class="sourceLineNo">164</span> return this;<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> * Specifies the manifest file of the jar file this microservice is contained within.<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * <a name="line.169"></a>
-<span class="sourceLineNo">170</span> * <p><a name="line.170"></a>
-<span class="sourceLineNo">171</span> * If you do not specify the manifest file, we attempt to resolve it through the following methods:<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * <ol><a name="line.172"></a>
-<span class="sourceLineNo">173</span> * <li>Looking on the file system for a file at <js>"META-INF/MANIFEST.MF"</js>.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * This is primarily to allow for running microservices from within eclipse workspaces where the manifest file<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * is located in the project root.<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * <li>Using the class loader for this class to find the file at the URL <js>"META-INF/MANIFEST.MF"</js>.<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * </ol><a name="line.177"></a>
-<span class="sourceLineNo">178</span> *<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * @param mf The manifest file of this microservice.<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> public Microservice setManifest(Manifest mf) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Microservice.mf = new ManifestFile(mf);<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> /**<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * Convenience method for specifying the manifest contents directly.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> *<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * @param contents The lines in the manifest file.<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * @return This object (for method chaining).<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * @throws IOException<a name="line.192"></a>
-<span class="sourceLineNo">193</span> */<a name="line.193"></a>
-<span class="sourceLineNo">194</span> public Microservice setManifestContents(String...contents) throws IOException {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> String s = StringUtils.join(contents, "\n") + "\n";<a name="line.195"></a>
-<span class="sourceLineNo">196</span> Microservice.mf = new ManifestFile(new Manifest(new ByteArrayInputStream(s.getBytes("UTF-8"))));<a name="line.196"></a>
-<span class="sourceLineNo">197</span> return this;<a name="line.197"></a>
-<span class="sourceLineNo">198</span> }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> /**<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * Same as {@link #setManifest(Manifest)} except specified through a {@link File} object.<a name="line.201"></a>
-<span class="sourceLineNo">202</span> *<a name="line.202"></a>
-<span class="sourceLineNo">203</span> * @param f The manifest file of this microservice.<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * @return This object (for method chaining).<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * @throws IOException If a problem occurred while trying to read the manifest file.<a name="line.205"></a>
-<span class="sourceLineNo">206</span> */<a name="line.206"></a>
-<span class="sourceLineNo">207</span> public Microservice setManifest(File f) throws IOException {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> Microservice.mf = new ManifestFile(f);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> return this;<a name="line.209"></a>
-<span class="sourceLineNo">210</span> }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span> /**<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * Same as {@link #setManifest(Manifest)} except finds and loads the manifest file of the jar file that the <a name="line.213"></a>
-<span class="sourceLineNo">214</span> * specified class is contained within.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> *<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * @param c The class whose jar file contains the manifest to use for this microservice.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> * @return This object (for method chaining).<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * @throws IOException If a problem occurred while trying to read the manifest file.<a name="line.218"></a>
-<span class="sourceLineNo">219</span> */<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public Microservice setManifest(Class<?> c) throws IOException {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> Microservice.mf = new ManifestFile(c);<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> /**<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * Creates the {@link VarResolver} used to resolve variables in the config file returned by {@link #getConfig()}.<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * <a name="line.227"></a>
-<span class="sourceLineNo">228</span> * <p><a name="line.228"></a>
-<span class="sourceLineNo">229</span> * The default implementation resolves the following variables:<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * <ul><a name="line.230"></a>
-<span class="sourceLineNo">231</span> * <li><code>$S{key}</code>, <code>$S{key,default}</code> - System properties.<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * <li><code>$E{key}</code>, <code>$E{key,default}</code> - Environment variables.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * <li><code>$C{key}</code>, <code>$C{key,default}</code> - Config file entries.<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * <li><code>$MF{key}</code>, <code>$MF{key,default}</code> - Manifest file entries.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * <li><code>$ARG{key}</code>, <code>$ARG{key,default}</code> - Command-line arguments.<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * <li><code>$IF{boolArg,thenValue}</code>, <code>$IF{boolArg,thenValue,elseValue}</code> - If-block logic.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> * <li><code>$SW{stringArg,pattern,thenVal...}</code>, <a name="line.237"></a>
-<span class="sourceLineNo">238</span> * <code>$SW{stringArg,pattern,thenVal,elseVal...}</code> - Switch-block logic.<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * </ul><a name="line.239"></a>
-<span class="sourceLineNo">240</span> * <a name="line.240"></a>
-<span class="sourceLineNo">241</span> * <p><a name="line.241"></a>
-<span class="sourceLineNo">242</span> * Subclasses can override this method to provide their own variables.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> *<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * <h5 class='section'>Example:</h5><a name="line.244"></a>
-<span class="sourceLineNo">245</span> * <p class='bcode'><a name="line.245"></a>
-<span class="sourceLineNo">246</span> * <jd>/**<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * * Augment default var resolver with a custom $B{...} variable that simply wraps strings inside square brackets.<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * * /</jd><a name="line.248"></a>
-<span class="sourceLineNo">249</span> * <ja>@Override</ja> <jc>// Microservice</jc><a name="line.249"></a>
-<span class="sourceLineNo">250</span> * <jk>protected</jk> StringVarResolver createVarResolver() {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * <jk>return super</jk>.createVarResolver()<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * .addVar(<js>"B"</js>,<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * <jk>new</jk> StringVarWithDefault() {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * <ja>@Override</ja> <jc>// StringVar</jc><a name="line.254"></a>
-<span class="sourceLineNo">255</span> * <jk>public</jk> String resolve(String varVal) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * <jk>return</jk> <js>'['</js> + varVal + <js>']'</js>;<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> * }<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * </p><a name="line.261"></a>
-<span class="sourceLineNo">262</span> * <p class='bcode'><a name="line.262"></a>
-<span class="sourceLineNo">263</span> * <cc># Example config file</cc><a name="line.263"></a>
-<span class="sourceLineNo">264</span> * <cs>[MySection]</cs><a name="line.264"></a>
-<span class="sourceLineNo">265</span> * <ck>myEntry</ck> = $B{foo}<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * </p><a name="line.266"></a>
-<span class="sourceLineNo">267</span> * <p class='bcode'><a name="line.267"></a>
-<span class="sourceLineNo">268</span> * <jc>// Example java code</jc><a name="line.268"></a>
-<span class="sourceLineNo">269</span> * String myentry = getConfig().getString(<js>"MySection/myEntry"</js>); <jc>// == "[foo]"</js><a name="line.269"></a>
-<span class="sourceLineNo">270</span> * </p><a name="line.270"></a>
-<span class="sourceLineNo">271</span> *<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * @return A new {@link VarResolver}.<a name="line.272"></a>
-<span class="sourceLineNo">273</span> */<a name="line.273"></a>
-<span class="sourceLineNo">274</span> protected VarResolverBuilder createVarResolver() {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> VarResolverBuilder b = new VarResolverBuilder()<a name="line.275"></a>
-<span class="sourceLineNo">276</span> .defaultVars()<a name="line.276"></a>
-<span class="sourceLineNo">277</span> .vars(ConfigFileVar.class, ManifestFileVar.class, ArgsVar.class, SwitchVar.class, IfVar.class)<a name="line.277"></a>
-<span class="sourceLineNo">278</span> .contextObject(ManifestFileVar.SESSION_manifest, mf)<a name="line.278"></a>
-<span class="sourceLineNo">279</span> .contextObject(ArgsVar.SESSION_args, args);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (cf != null)<a name="line.280"></a>
-<span class="sourceLineNo">281</span> b.contextObject(ConfigFileVar.SESSION_config, cf);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> return b;<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> * Returns the command-line arguments passed into the application.<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * <a name="line.287"></a>
-<span class="sourceLineNo">288</span> * <p><a name="line.288"></a>
-<span class="sourceLineNo">289</span> * This method can be called from the class constructor.<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * <a name="line.290"></a>
-<span class="sourceLineNo">291</span> * <p><a name="line.291"></a>
-<span class="sourceLineNo">292</span> * See {@link Args} for details on using this method.<a name="line.292"></a>
-<span class="sourceLineNo">293</span> *<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * @return The command-line arguments passed into the application.<a name="line.294"></a>
-<span class="sourceLineNo">295</span> */<a name="line.295"></a>
-<span class="sourceLineNo">296</span> protected static Args getArgs() {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> return args;<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 external INI-style configuration file that can be used to configure your microservice.<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * <a name="line.302"></a>
-<span class="sourceLineNo">303</span> * <p><a name="line.303"></a>
-<span class="sourceLineNo">304</span> * The config file location is determined in the following order:<a name="line.304"></a>
-<span class="sourceLineNo">305</span> * <ol class='spaced-list'><a name="line.305"></a>
-<span class="sourceLineNo">306</span> * <li><a name="line.306"></a>
-<span class="sourceLineNo">307</span> * The first argument passed to the microservice jar.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * <li><a name="line.308"></a>
-<span class="sourceLineNo">309</span> * The <code>Main-ConfigFile</code> entry in the microservice jar manifest file.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * <li><a name="line.310"></a>
-<span class="sourceLineNo">311</span> * The name of the microservice jar with a <js>".cfg"</js> suffix (e.g. <a name="line.311"></a>
-<span class="sourceLineNo">312</span> * <js>"mymicroservice.jar"</js>-&gt;<js>"mymicroservice.cfg"</js>).<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * </ol><a name="line.313"></a>
-<span class="sourceLineNo">314</span> * <a name="line.314"></a>
-<span class="sourceLineNo">315</span> * <p><a name="line.315"></a>
-<span class="sourceLineNo">316</span> * If all methods for locating the config file fail, then this method returns <jk>null</jk>.<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * <a name="line.317"></a>
-<span class="sourceLineNo">318</span> * <p><a name="line.318"></a>
-<span class="sourceLineNo">319</span> * Subclasses can set their own config file by calling the {@link #setConfig(ConfigFile)} method.<a name="line.319"></a>
-<span class="sourceLineNo">320</span> * <a name="line.320"></a>
-<span class="sourceLineNo">321</span> * <p><a name="line.321"></a>
-<span class="sourceLineNo">322</span> * String variables defined by {@link #createVarResolver()} are automatically resolved when using this method.<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * <a name="line.323"></a>
-<span class="sourceLineNo">324</span> * <p><a name="line.324"></a>
-<span class="sourceLineNo">325</span> * This method can be called from the class constructor.<a name="line.325"></a>
-<span class="sourceLineNo">326</span> *<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * <h5 class='section'>Example:</h5><a name="line.327"></a>
-<span class="sourceLineNo">328</span> * <p class='bcode'><a name="line.328"></a>
-<span class="sourceLineNo">329</span> * <cc>#--------------------------</cc><a name="line.329"></a>
-<span class="sourceLineNo">330</span> * <cc># My section</cc><a name="line.330"></a>
-<span class="sourceLineNo">331</span> * <cc>#--------------------------</cc><a name="line.331"></a>
-<span class="sourceLineNo">332</span> * <cs>[MySection]</cs><a name="line.332"></a>
-<span class="sourceLineNo">333</span> *<a name="line.333"></a>
-<span class="sourceLineNo">334</span> * <cc># An integer</cc><a name="line.334"></a>
-<span class="sourceLineNo">335</span> * <ck>anInt</ck> = 1<a name="line.335"></a>
-<span class="sourceLineNo">336</span> *<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * <cc># A boolean</cc><a name="line.337"></a>
-<span class="sourceLineNo">338</span> * <ck>aBoolean</ck> = true<a name="line.338"></a>
-<span class="sourceLineNo">339</span> *<a name="line.339"></a>
-<span class="sourceLineNo">340</span> * <cc># An int array</cc><a name="line.340"></a>
-<span class="sourceLineNo">341</span> * <ck>anIntArray</ck> = 1,2,3<a name="line.341"></a>
-<span class="sourceLineNo">342</span> *<a name="line.342"></a>
-<span class="sourceLineNo">343</span> * <cc># A POJO that can be converted from a String</cc><a name="line.343"></a>
-<span class="sourceLineNo">344</span> * <ck>aURL</ck> = http://foo<a name="line.344"></a>
-<span class="sourceLineNo">345</span> *<a name="line.345"></a>
-<span class="sourceLineNo">346</span> * <cc># A POJO that can be converted from JSON</cc><a name="line.346"></a>
-<span class="sourceLineNo">347</span> * <ck>aBean</ck> = {foo:'bar',baz:123}<a name="line.347"></a>
-<span class="sourceLineNo">348</span> *<a name="line.348"></a>
-<span class="sourceLineNo">349</span> * <cc># A system property</cc><a name="line.349"></a>
-<span class="sourceLineNo">350</span> * <ck>locale</ck> = $S{java.locale, en_US}<a name="line.350"></a>
-<span class="sourceLineNo">351</span> *<a name="line.351"></a>
-<span class="sourceLineNo">352</span> * <cc># An environment variable</cc><a name="line.352"></a>
-<span class="sourceLineNo">353</span> * <ck>path</ck> = $E{PATH, unknown}<a name="line.353"></a>
-<span class="sourceLineNo">354</span> *<a name="line.354"></a>
-<span class="sourceLineNo">355</span> * <cc># A manifest file entry</cc><a name="line.355"></a>
-<span class="sourceLineNo">356</span> * <ck>mainClass</ck> = $MF{Main-Class}<a name="line.356"></a>
-<span class="sourceLineNo">357</span> *<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * <cc># Another value in this config file</cc><a name="line.358"></a>
-<span class="sourceLineNo">359</span> * <ck>sameAsAnInt</ck> = $C{MySection/anInt}<a name="line.359"></a>
-<span class="sourceLineNo">360</span> *<a name="line.360"></a>
-<span class="sourceLineNo">361</span> * <cc># A command-line argument in the form "myarg=foo"</cc><a name="line.361"></a>
-<span class="sourceLineNo">362</span> * <ck>myArg</ck> = $ARG{myarg}<a name="line.362"></a>
-<span class="sourceLineNo">363</span> *<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * <cc># The first command-line argument</cc><a name="line.364"></a>
-<span class="sourceLineNo">365</span> * <ck>firstArg</ck> = $ARG{0}<a name="line.365"></a>
-<span class="sourceLineNo">366</span> *<a name="line.366"></a>
-<span class="sourceLineNo">367</span> * <cc># Look for system property, or env var if that doesn't exist, or command-line arg if that doesn't exist.</cc><a name="line.367"></a>
-<span class="sourceLineNo">368</span> * <ck>nested</ck> = $S{mySystemProperty,$E{MY_ENV_VAR,$ARG{0}}}<a name="line.368"></a>
+<span class="sourceLineNo">160</span> */<a name="line.160"></a>
+<span class="sourceLineNo">161</span> public static void setConfig(ConfigFile cf) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> Microservice.cf = cf;<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> * Specifies the manifest file of the jar file this microservice is contained within.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * <a name="line.167"></a>
+<span class="sourceLineNo">168</span> * <p><a name="line.168"></a>
+<span class="sourceLineNo">169</span> * If you do not specify the manifest file, we attempt to resolve it through the following methods:<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * <ol><a name="line.170"></a>
+<span class="sourceLineNo">171</span> * <li>Looking on the file system for a file at <js>"META-INF/MANIFEST.MF"</js>.<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * This is primarily to allow for running microservices from within eclipse workspaces where the manifest file<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * is located in the project root.<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * <li>Using the class loader for this class to find the file at the URL <js>"META-INF/MANIFEST.MF"</js>.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * </ol><a name="line.175"></a>
+<span class="sourceLineNo">176</span> *<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * @param mf The manifest file of this microservice.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> */<a name="line.178"></a>
+<span class="sourceLineNo">179</span> public static void setManifest(Manifest mf) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> Microservice.mf = new ManifestFile(mf);<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> * Convenience method for specifying the manifest contents directly.<a name="line.184"></a>
+<span class="sourceLineNo">185</span> *<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * @param contents The lines in the manifest file.<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 Microservice setManifestContents(String...contents) throws IOException {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> String s = StringUtils.join(contents, "\n") + "\n";<a name="line.191"></a>
+<span class="sourceLineNo">192</span> Microservice.mf = new ManifestFile(new Manifest(new ByteArrayInputStream(s.getBytes("UTF-8"))));<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> * Same as {@link #setManifest(Manifest)} except specified through a {@link File} object.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> *<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * @param f The manifest file of this microservice.<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * @throws IOException If a problem occurred while trying to read the manifest file.<a name="line.200"></a>
+<span class="sourceLineNo">201</span> */<a name="line.201"></a>
+<span class="sourceLineNo">202</span> public static void setManifest(File f) throws IOException {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> Microservice.mf = new ManifestFile(f);<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> * Same as {@link #setManifest(Manifest)} except finds and loads the manifest file of the jar file that the <a name="line.207"></a>
+<span class="sourceLineNo">208</span> * specified class is contained within.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> *<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * @param c The class whose jar file contains the manifest to use for this microservice.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * @throws IOException If a problem occurred while trying to read the manifest file.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> */<a name="line.212"></a>
+<span class="sourceLineNo">213</span> public static void setManifest(Class<?> c) throws IOException {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> Microservice.mf = new ManifestFile(c);<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> * Creates the {@link VarResolver} used to resolve variables in the config file returned by {@link #getConfig()}.<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * <a name="line.219"></a>
+<span class="sourceLineNo">220</span> * <p><a name="line.220"></a>
+<span class="sourceLineNo">221</span> * The default implementation resolves the following variables:<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * <ul><a name="line.222"></a>
+<span class="sourceLineNo">223</span> * <li><code>$S{key}</code>, <code>$S{key,default}</code> - System properties.<a name="line.223"></a>
+<span class="sourceLineNo">224</span> * <li><code>$E{key}</code>, <code>$E{key,default}</code> - Environment variables.<a name="line.224"></a>
+<span class="sourceLineNo">225</span> * <li><code>$C{key}</code>, <code>$C{key,default}</code> - Config file entries.<a name="line.225"></a>
+<span class="sourceLineNo">226</span> * <li><code>$MF{key}</code>, <code>$MF{key,default}</code> - Manifest file entries.<a name="line.226"></a>
+<span class="sourceLineNo">227</span> * <li><code>$ARG{key}</code>, <code>$ARG{key,default}</code> - Command-line arguments.<a name="line.227"></a>
+<span class="sourceLineNo">228</span> * <li><code>$IF{boolArg,thenValue}</code>, <code>$IF{boolArg,thenValue,elseValue}</code> - If-block logic.<a name="line.228"></a>
+<span class="sourceLineNo">229</span> * <li><code>$SW{stringArg,pattern,thenVal...}</code>, <a name="line.229"></a>
+<span class="sourceLineNo">230</span> * <code>$SW{stringArg,pattern,thenVal,elseVal...}</code> - Switch-block logic.<a name="line.230"></a>
+<span class="sourceLineNo">231</span> * </ul><a name="line.231"></a>
+<span class="sourceLineNo">232</span> * <a name="line.232"></a>
+<span class="sourceLineNo">233</span> * <p><a name="line.233"></a>
+<span class="sourceLineNo">234</span> * Subclasses can override this method to provide their own variables.<a name="line.234"></a>
+<span class="sourceLineNo">235</span> *<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * <h5 class='section'>Example:</h5><a name="line.236"></a>
+<span class="sourceLineNo">237</span> * <p class='bcode'><a name="line.237"></a>
+<span class="sourceLineNo">238</span> * <jd>/**<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * * Augment default var resolver with a custom $B{...} variable that simply wraps strings inside square brackets.<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * * /</jd><a name="line.240"></a>
+<span class="sourceLineNo">241</span> * <ja>@Override</ja> <jc>// Microservice</jc><a name="line.241"></a>
+<span class="sourceLineNo">242</span> * <jk>protected</jk> StringVarResolver createVarResolver() {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> * <jk>return super</jk>.createVarResolver()<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * .addVar(<js>"B"</js>,<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * <jk>new</jk> StringVarWithDefault() {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * <ja>@Override</ja> <jc>// StringVar</jc><a name="line.246"></a>
+<span class="sourceLineNo">247</span> * <jk>public</jk> String resolve(String varVal) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * <jk>return</jk> <js>'['</js> + varVal + <js>']'</js>;<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> * }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * </p><a name="line.253"></a>
+<span class="sourceLineNo">254</span> * <p class='bcode'><a name="line.254"></a>
+<span class="sourceLineNo">255</span> * <cc># Example config file</cc><a name="line.255"></a>
+<span class="sourceLineNo">256</span> * <cs>[MySection]</cs><a name="line.256"></a>
+<span class="sourceLineNo">257</span> * <ck>myEntry</ck> = $B{foo}<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * </p><a name="line.258"></a>
+<span class="sourceLineNo">259</span> * <p class='bcode'><a name="line.259"></a>
+<span class="sourceLineNo">260</span> * <jc>// Example java code</jc><a name="line.260"></a>
+<span class="sourceLineNo">261</span> * String myentry = getConfig().getString(<js>"MySection/myEntry"</js>); <jc>// == "[foo]"</js><a name="line.261"></a>
+<span class="sourceLineNo">262</span> * </p><a name="line.262"></a>
+<span class="sourceLineNo">263</span> *<a name="line.263"></a>
+<span class="sourceLineNo">264</span> * @return A new {@link VarResolver}.<a name="line.264"></a>
+<span class="sourceLineNo">265</span> */<a name="line.265"></a>
+<span class="sourceLineNo">266</span> protected VarResolverBuilder createVarResolver() {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> VarResolverBuilder b = new VarResolverBuilder()<a name="line.267"></a>
+<span class="sourceLineNo">268</span> .defaultVars()<a name="line.268"></a>
+<span class="sourceLineNo">269</span> .vars(ConfigFileVar.class, ManifestFileVar.class, ArgsVar.class, SwitchVar.class, IfVar.class)<a name="line.269"></a>
+<span class="sourceLineNo">270</span> .contextObject(ManifestFileVar.SESSION_manifest, mf)<a name="line.270"></a>
+<span class="sourceLineNo">271</span> .contextObject(ArgsVar.SESSION_args, args);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> if (cf != null)<a name="line.272"></a>
+<span class="sourceLineNo">273</span> b.contextObject(ConfigFileVar.SESSION_config, cf);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> return b;<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> /**<a name="line.277"></a>
+<span class="sourceLineNo">278</span> * Returns the command-line arguments passed into the application.<a name="line.278"></a>
+<span class="sourceLineNo">279</span> * <a name="line.279"></a>
+<span class="sourceLineNo">280</span> * <p><a name="line.280"></a>
+<span class="sourceLineNo">281</span> * This method can be called from the class constructor.<a name="line.281"></a>
+<span class="sourceLineNo">282</span> * <a name="line.282"></a>
+<span class="sourceLineNo">283</span> * <p><a name="line.283"></a>
+<span class="sourceLineNo">284</span> * See {@link Args} for details on using this method.<a name="line.284"></a>
+<span class="sourceLineNo">285</span> *<a name="line.285"></a>
+<span class="sourceLineNo">286</span> * @return The command-line arguments passed into the application.<a name="line.286"></a>
+<span class="sourceLineNo">287</span> */<a name="line.287"></a>
+<span class="sourceLineNo">288</span> protected static Args getArgs() {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> return args;<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span> /**<a name="line.292"></a>
+<span class="sourceLineNo">293</span> * Returns the external INI-style configuration file that can be used to configure your microservice.<a name="line.293"></a>
+<span class="sourceLineNo">294</span> * <a name="line.294"></a>
+<span class="sourceLineNo">295</span> * <p><a name="line.295"></a>
+<span class="sourceLineNo">296</span> * The config file location is determined in the following order:<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * <ol class='spaced-list'><a name="line.297"></a>
+<span class="sourceLineNo">298</span> * <li><a name="line.298"></a>
+<span class="sourceLineNo">299</span> * The first argument passed to the microservice jar.<a name="line.299"></a>
+<span class="sourceLineNo">300</span> * <li><a name="line.300"></a>
+<span class="sourceLineNo">301</span> * The <code>Main-ConfigFile</code> entry in the microservice jar manifest file.<a name="line.301"></a>
+<span class="sourceLineNo">302</span> * <li><a name="line.302"></a>
+<span class="sourceLineNo">303</span> * The name of the microservice jar with a <js>".cfg"</js> suffix (e.g. <a name="line.303"></a>
+<span class="sourceLineNo">304</span> * <js>"mymicroservice.jar"</js>-&gt;<js>"mymicroservice.cfg"</js>).<a name="line.304"></a>
+<span class="sourceLineNo">305</span> * </ol><a name="line.305"></a>
+<span class="sourceLineNo">306</span> * <a name="line.306"></a>
+<span class="sourceLineNo">307</span> * <p><a name="line.307"></a>
+<span class="sourceLineNo">308</span> * If all methods for locating the config file fail, then this method returns <jk>null</jk>.<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * <a name="line.309"></a>
+<span class="sourceLineNo">310</span> * <p><a name="line.310"></a>
+<span class="sourceLineNo">311</span> * Subclasses can set their own config file by calling the {@link #setConfig(ConfigFile)} method.<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * <a name="line.312"></a>
+<span class="sourceLineNo">313</span> * <p><a name="line.313"></a>
+<span class="sourceLineNo">314</span> * String variables defined by {@link #createVarResolver()} are automatically resolved when using this method.<a name="line.314"></a>
+<span class="sourceLineNo">315</span> * <a name="line.315"></a>
+<span class="sourceLineNo">316</span> * <p><a name="line.316"></a>
+<span class="sourceLineNo">317</span> * This method can be called from the class constructor.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> *<a name="line.318"></a>
+<span class="sourceLineNo">319</span> * <h5 class='section'>Example:</h5><a name="line.319"></a>
+<span class="sourceLineNo">320</span> * <p class='bcode'><a name="line.320"></a>
+<span class="sourceLineNo">321</span> * <cc>#--------------------------</cc><a name="line.321"></a>
+<span class="sourceLineNo">322</span> * <cc># My section</cc><a name="line.322"></a>
+<span class="sourceLineNo">323</span> * <cc>#--------------------------</cc><a name="line.323"></a>
+<span class="sourceLineNo">324</span> * <cs>[MySection]</cs><a name="line.324"></a>
+<span class="sourceLineNo">325</span> *<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * <cc># An integer</cc><a name="line.326"></a>
+<span class="sourceLineNo">327</span> * <ck>anInt</ck> = 1<a name="line.327"></a>
+<span class="sourceLineNo">328</span> *<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * <cc># A boolean</cc><a name="line.329"></a>
+<span class="sourceLineNo">330</span> * <ck>aBoolean</ck> = true<a name="line.330"></a>
+<span class="sourceLineNo">331</span> *<a name="line.331"></a>
+<span class="sourceLineNo">332</span> * <cc># An int array</cc><a name="line.332"></a>
+<span class="sourceLineNo">333</span> * <ck>anIntArray</ck> = 1,2,3<a name="line.333"></a>
+<span class="sourceLineNo">334</span> *<a name="line.334"></a>
+<span class="sourceLineNo">335</span> * <cc># A POJO that can be converted from a String</cc><a name="line.335"></a>
+<span class="sourceLineNo">336</span> * <ck>aURL</ck> = http://foo<a name="line.336"></a>
+<span class="sourceLineNo">337</span> *<a name="line.337"></a>
+<span class="sourceLineNo">338</span> * <cc># A POJO that can be converted from JSON</cc><a name="line.338"></a>
+<span class="sourceLineNo">339</span> * <ck>aBean</ck> = {foo:'bar',baz:123}<a name="line.339"></a>
+<span class="sourceLineNo">340</span> *<a name="line.340"></a>
+<span class="sourceLineNo">341</span> * <cc># A system property</cc><a name="line.341"></a>
+<span class="sourceLineNo">342</span> * <ck>locale</ck> = $S{java.locale, en_US}<a name="line.342"></a>
+<span class="sourceLineNo">343</span> *<a name="line.343"></a>
+<span class="sourceLineNo">344</span> * <cc># An environment variable</cc><a name="line.344"></a>
+<span class="sourceLineNo">345</span> * <ck>path</ck> = $E{PATH, unknown}<a name="line.345"></a>
+<span class="sourceLineNo">346</span> *<a name="line.346"></a>
+<span class="sourceLineNo">347</span> * <cc># A manifest file entry</cc><a name="line.347"></a>
+<span class="sourceLineNo">348</span> * <ck>mainClass</ck> = $MF{Main-Class}<a name="line.348"></a>
+<span class="sourceLineNo">349</span> *<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * <cc># Another value in this config file</cc><a name="line.350"></a>
+<span class="sourceLineNo">351</span> * <ck>sameAsAnInt</ck> = $C{MySection/anInt}<a name="line.351"></a>
+<span class="sourceLineNo">352</span> *<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * <cc># A command-line argument in the form "myarg=foo"</cc><a name="line.353"></a>
+<span class="sourceLineNo">354</span> * <ck>myArg</ck> = $ARG{myarg}<a name="line.354"></a>
+<span class="sourceLineNo">355</span> *<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * <cc># The first command-line argument</cc><a name="line.356"></a>
+<span class="sourceLineNo">357</span> * <ck>firstArg</ck> = $ARG{0}<a name="line.357"></a>
+<span class="sourceLineNo">358</span> *<a name="line.358"></a>
+<span class="sourceLineNo">359</span> * <cc># Look for system property, or env var if that doesn't exist, or command-line arg if that doesn't exist.</cc><a name="line.359"></a>
+<span class="sourceLineNo">360</span> * <ck>nested</ck> = $S{mySystemProperty,$E{MY_ENV_VAR,$ARG{0}}}<a name="line.360"></a>
+<span class="sourceLineNo">361</span> *<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * <cc># A POJO with embedded variables</cc><a name="line.362"></a>
+<span class="sourceLineNo">363</span> * <ck>aBean2</ck> = {foo:'$ARG{0}',baz:$C{MySection/anInt}}<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * </p><a name="line.364"></a>
+<span class="sourceLineNo">365</span> * <a name="line.365"></a>
+<span class="sourceLineNo">366</span> * <p class='bcode'><a name="line.366"></a>
+<span class="sourceLineNo">367</span> * <jc>// Java code for accessing config entries above.</jc><a name="line.367"></a>
+<span class="sourceLineNo">368</span> * ConfigFile cf = getConfig();<a name="line.368"></a>
<span class="sourceLineNo">369</span> *<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * <cc># A POJO with embedded variables</cc><a name="line.370"></a>
-<span class="sourceLineNo">371</span> * <ck>aBean2</ck> = {foo:'$ARG{0}',baz:$C{MySection/anInt}}<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * </p><a name="line.372"></a>
-<span class="sourceLineNo">373</span> * <a name="line.373"></a>
-<span class="sourceLineNo">374</span> * <p class='bcode'><a name="line.374"></a>
-<span class="sourceLineNo">375</span> * <jc>// Java code for accessing config entries above.</jc><a name="line.375"></a>
-<span class="sourceLineNo">376</span> * ConfigFile cf = getConfig();<a name="line.376"></a>
-<span class="sourceLineNo">377</span> *<a name="line.377"></a>
-<span class="sourceLineNo">378</span> * <jk>int</jk> anInt = cf.getInt(<js>"MySection/anInt"</js>);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * <jk>boolean</jk> aBoolean = cf.getBoolean(<js>"MySection/aBoolean"</js>);<a name="line.379"></a>
-<span class="sourceLineNo">380</span> * <jk>int</jk>[] anIntArray = cf.getObject(<jk>int</jk>[].<jk>class</jk>, <js>"MySection/anIntArray"</js>);<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * URL aURL = cf.getObject(URL.<jk>class</jk>, <js>"MySection/aURL"</js>);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * MyBean aBean = cf.getObject(MyBean.<jk>class</jk>, <js>"MySection/aBean"</js>);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> * Locale locale = cf.getObject(Locale.<jk>class</jk>, <js>"MySection/locale"</js>);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> * String path = cf.getString(<js>"MySection/path"</js>);<a name="line.384"></a>
-<span class="sourceLineNo">385</span> * String mainClass = cf.getString(<js>"MySection/mainClass"</js>);<a name="line.385"></a>
-<span class="sourceLineNo">386</span> * <jk>int</jk> sameAsAnInt = cf.getInt(<js>"MySection/sameAsAnInt"</js>);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> * String myArg = cf.getString(<js>"MySection/myArg"</js>);<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * String firstArg = cf.getString(<js>"MySection/firstArg"</js>);<a name="line.388"></a>
-<span class="sourceLineNo">389</span> * </p><a name="line.389"></a>
-<span class="sourceLineNo">390</span> *<a name="line.390"></a>
-<span class="sourceLineNo">391</span> * @return The config file for this application, or <jk>null</jk> if no config file is configured.<a name="line.391"></a>
-<span class="sourceLineNo">392</span> */<a name="line.392"></a>
-<span class="sourceLineNo">393</span> protected static ConfigFile getConfig() {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> return cf;<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> * Returns the main jar manifest file contents as a simple {@link ObjectMap}.<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * <a name="line.399"></a>
-<span class="sourceLineNo">400</span> * <p><a name="line.400"></a>
-<span class="sourceLineNo">401</span> * This map consists of the contents of {@link Manifest#getMainAttributes()} with the keys and entries converted to <a name="line.401"></a>
-<span class="sourceLineNo">402</span> * simple strings.<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * <p><a name="line.403"></a>
-<span class="sourceLineNo">404</span> * This method can be called from the class constructor.<a name="line.404"></a>
-<span class="sourceLineNo">405</span> *<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * <h5 class='section'>Example:</h5><a name="line.406"></a>
-<span class="sourceLineNo">407</span> * <p class='bcode'><a name="line.407"></a>
-<span class="sourceLineNo">408</span> * <jc>// Get Main-Class from manifest file.</jc><a name="line.408"></a>
-<span class="sourceLineNo">409</span> * String mainClass = Microservice.<jsm>getManifest</jsm>().getString(<js>"Main-Class"</js>, <js>"unknown"</js>);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> *<a name="line.410"></a>
-<span class="sourceLineNo">411</span> * <jc>// Get Rest-Resources from manifest file.</jc><a name="line.411"></a>
-<span class="sourceLineNo">412</span> * String[] restResources = Microservice.<jsm>getManifest</jsm>().getStringArray(<js>"Rest-Resources"</js>);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> * </p><a name="line.413"></a>
-<span class="sourceLineNo">414</span> *<a name="line.414"></a>
-<span class="sourceLineNo">415</span> * @return The manifest file from the main jar, or <jk>null</jk> if the manifest file could not be retrieved.<a name="line.415"></a>
-<span class="sourceLineNo">416</span> */<a name="line.416"></a>
-<span class="sourceLineNo">417</span> protected static ManifestFile getManifest() {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return mf;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span> //--------------------------------------------------------------------------------<a name="line.422"></a>
-<span class="sourceLineNo">423</span> // Abstract lifecycle methods.<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> * Start this application.<a name="line.427"></a>
-<span class="sourceLineNo">428</span> * <a name="line.428"></a>
-<span class="sourceLineNo">429</span> * <p><a name="line.429"></a>
-<span class="sourceLineNo">430</span> * Default implementation simply calls {@link #onStart()}.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * <a name="line.431"></a>
-<span class="sourceLineNo">432</span> * <p><a name="line.432"></a>
-<span class="sourceLineNo">433</span> * Overridden methods MUST call this method FIRST so that the {@link #onStart()} method is called.<a name="line.433"></a>
-<span class="sourceLineNo">434</span> *<a name="line.434"></a>
-<span class="sourceLineNo">435</span> * @return This object (for method chaining).<a name="line.435"></a>
-<span class="sourceLineNo">436</span> * @throws Exception<a name="line.436"></a>
-<span class="sourceLineNo">437</span> */<a name="line.437"></a>
-<span class="sourceLineNo">438</span> public Microservice start() throws Exception {<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> // Try to get the manifest file if it wasn't already set.<a name="line.441"></a>
-<span class="sourceLineNo">442</span> // --------------------------------------------------------------------------------<a name="line.442"></a>
-<span class="sourceLineNo">443</span> if (mf == null) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> Manifest m = new Manifest();<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span> // If running within an eclipse workspace, need to get it from the file system.<a name="line.446"></a>
-<span class="sourceLineNo">447</span> File f = new File("META-INF/MANIFEST.MF");<a name="line.447"></a>
-<span class="sourceLineNo">448</span> if (f.exists()) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> try {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> m.read(new FileInputStream(f));<a name="line.450"></a>
-<span class="sourceLineNo">451</span> } catch (IOException e) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> System.err.println("Problem detected in MANIFEST.MF. Contents below:\n" + read(f));<a name="line.452"></a>
-<span class="sourceLineNo">453</span> throw e;<a name="line.453"></a>
-<span class="sourceLineNo">454</span> }<a name="line.454"></a>
-<span class="sourceLineNo">455</span> } else {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> // Otherwise, read from manifest file in the jar file containing the main class.<a name="line.456"></a>
-<span class="sourceLineNo">457</span> URLClassLoader cl = (URLClassLoader)getClass().getClassLoader();<a name="line.457"></a>
-<span class="sourceLineNo">458</span> URL url = cl.findResource("META-INF/MANIFEST.MF");<a name="line.458"></a>
-<span class="sourceLineNo">459</span> if (url != null) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span> try {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> m.read(url.openStream());<a name="line.461"></a>
-<span class="sourceLineNo">462</span> } catch (IOException e) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> System.err.println("Problem detected in MANIFEST.MF. Contents below:\n" + read(url.openStream()));<a name="line.463"></a>
-<span class="sourceLineNo">464</span> throw e;<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> mf = new ManifestFile(m);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span><a name="line.470"></a>
-<span class="sourceLineNo">471</span> // --------------------------------------------------------------------------------<a name="line.471"></a>
-<span class="sourceLineNo">472</span> // Resolve the config file if the path was specified.<a name="line.472"></a>
-<span class="sourceLineNo">473</span> // --------------------------------------------------------------------------------<a name="line.473"></a>
-<span class="sourceLineNo">474</span> ConfigFileBuilder cfb = new ConfigFileBuilder();<a name="line.474"></a>
-<span class="sourceLineNo">475</span> if (cfPath != null)<a name="line.475"></a>
-<span class="sourceLineNo">476</span> cf = cfb.build(cfPath).getResolving(createVarResolver().build());<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> // Find config file.<a name="line.479"></a>
-<span class="sourceLineNo">480</span> // Can either be passed in as first parameter, or we discover it using<a name="line.480"></a>
-<span class="sourceLineNo">481</span> // the 'sun.java.command' system property.<a name="line.481"></a>
-<span class="sourceLineNo">482</span> // --------------------------------------------------------------------------------<a name="line.482"></a>
-<span class="sourceLineNo">483</span> if (cf == null) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> if (args.hasArg(0))<a name="line.484"></a>
-<span class="sourceLineNo">485</span> cfPath = args.getArg(0);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> else if (mf.containsKey("Main-ConfigFile"))<a name="line.486"></a>
-<span class="sourceLineNo">487</span> cfPath = mf.getString("Main-ConfigFile");<a name="line.487"></a>
-<span class="sourceLineNo">488</span> else {<a name="line.488"></a>
-<span class="sourceLineNo">489</span> String cmd = System.getProperty("sun.java.command", "not_found").split("\\s+")[0];<a name="line.489"></a>
-<span class="sourceLineNo">490</span> if (cmd.endsWith(".jar"))<a name="line.490"></a>
-<span class="sourceLineNo">491</span> cfPath = cmd.replace(".jar", ".cfg");<a name="line.491"></a>
+<span class="sourceLineNo">370</span> * <jk>int</jk> anInt = cf.getInt(<js>"MySection/anInt"</js>);<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * <jk>boolean</jk> aBoolean = cf.getBoolean(<js>"MySection/aBoolean"</js>);<a name="line.371"></a>
+<span class="sourceLineNo">372</span> * <jk>int</jk>[] anIntArray = cf.getObject(<jk>int</jk>[].<jk>class</jk>, <js>"MySection/anIntArray"</js>);<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * URL aURL = cf.getObject(URL.<jk>class</jk>, <js>"MySection/aURL"</js>);<a name="line.373"></a>
+<span class="sourceLineNo">374</span> * MyBean aBean = cf.getObject(MyBean.<jk>class</jk>, <js>"MySection/aBean"</js>);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * Locale locale = cf.getObject(Locale.<jk>class</jk>, <js>"MySection/locale"</js>);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * String path = cf.getString(<js>"MySection/path"</js>);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> * String mainClass = cf.getString(<js>"MySection/mainClass"</js>);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * <jk>int</jk> sameAsAnInt = cf.getInt(<js>"MySection/sameAsAnInt"</js>);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> * String myArg = cf.getString(<js>"MySection/myArg"</js>);<a name="line.379"></a>
+<span class="sourceLineNo">380</span> * String firstArg = cf.getString(<js>"MySection/firstArg"</js>);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> * </p><a name="line.381"></a>
+<span class="sourceLineNo">382</span> *<a name="line.382"></a>
+<span class="sourceLineNo">383</span> * @return The config file for this application, or <jk>null</jk> if no config file is configured.<a name="line.383"></a>
+<span class="sourceLineNo">384</span> */<a name="line.384"></a>
+<span class="sourceLineNo">385</span> protected static ConfigFile getConfig() {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> return cf;<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span> /**<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * Returns the main jar manifest file contents as a simple {@link ObjectMap}.<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * <a name="line.391"></a>
+<span class="sourceLineNo">392</span> * <p><a name="line.392"></a>
+<span class="sourceLineNo">393</span> * This map consists of the contents of {@link Manifest#getMainAttributes()} with the keys and entries converted to <a name="line.393"></a>
+<span class="sourceLineNo">394</span> * simple strings.<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * <p><a name="line.395"></a>
+<span class="sourceLineNo">396</span> * This method can be called from the class constructor.<a name="line.396"></a>
+<span class="sourceLineNo">397</span> *<a name="line.397"></a>
+<span class="sourceLineNo">398</span> * <h5 class='section'>Example:</h5><a name="line.398"></a>
+<span class="sourceLineNo">399</span> * <p class='bcode'><a name="line.399"></a>
+<span class="sourceLineNo">400</span> * <jc>// Get Main-Class from manifest file.</jc><a name="line.400"></a>
+<span class="sourceLineNo">401</span> * String mainClass = Microservice.<jsm>getManifest</jsm>().getString(<js>"Main-Class"</js>, <js>"unknown"</js>);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> *<a name="line.402"></a>
+<span class="sourceLineNo">403</span> * <jc>// Get Rest-Resources from manifest file.</jc><a name="line.403"></a>
+<span class="sourceLineNo">404</span> * String[] restResources = Microservice.<jsm>getManifest</jsm>().getStringArray(<js>"Rest-Resources"</js>);<a name="line.404"></a>
+<span class="sourceLineNo">405</span> * </p><a name="line.405"></a>
+<span class="sourceLineNo">406</span> *<a name="line.406"></a>
+<span class="sourceLineNo">407</span> * @return The manifest file from the main jar, or <jk>null</jk> if the manifest file could not be retrieved.<a name="line.407"></a>
+<span class="sourceLineNo">408</span> */<a name="line.408"></a>
+<span class="sourceLineNo">409</span> protected static ManifestFile getManifest() {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> return mf;<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> //--------------------------------------------------------------------------------<a name="line.414"></a>
+<span class="sourceLineNo">415</span> // Abstract lifecycle methods.<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> /**<a name="line.418"></a>
+<span class="sourceLineNo">419</span> * Start this application.<a name="line.419"></a>
+<span class="sourceLineNo">420</span> * <a name="line.420"></a>
+<span class="sourceLineNo">421</span> * <p><a name="line.421"></a>
+<span class="sourceLineNo">422</span> * Default implementation simply calls {@link #onStart()}.<a name="line.422"></a>
+<span class="sourceLineNo">423</span> * <a name="line.423"></a>
+<span class="sourceLineNo">424</span> * <p><a name="line.424"></a>
+<span class="sourceLineNo">425</span> * Overridden methods MUST call this method FIRST so that the {@link #onStart()} method is called.<a name="line.425"></a>
+<span class="sourceLineNo">426</span> *<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 Exception<a name="line.428"></a>
+<span class="sourceLineNo">429</span> */<a name="line.429"></a>
+<span class="sourceLineNo">430</span> public Microservice start() throws Exception {<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> // Try to get the manifest file if it wasn't already set.<a name="line.433"></a>
+<span class="sourceLineNo">434</span> // --------------------------------------------------------------------------------<a name="line.434"></a>
+<span class="sourceLineNo">435</span> if (mf == null) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span> Manifest m = new Manifest();<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span> // If running within an eclipse workspace, need to get it from the file system.<a name="line.438"></a>
+<span class="sourceLineNo">439</span> File f = new File("META-INF/MANIFEST.MF");<a name="line.439"></a>
+<span class="sourceLineNo">440</span> if (f.exists()) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> try {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> m.read(new FileInputStream(f));<a name="line.442"></a>
+<span class="sourceLineNo">443</span> } catch (IOException e) {<a name="line.443"></a>
+<span class="sourceLineNo">444</span> System.err.println("Problem detected in MANIFEST.MF. Contents below:\n" + read(f));<a name="line.444"></a>
+<span class="sourceLineNo">445</span> throw e;<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span> } else {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> // Otherwise, read from manifest file in the jar file containing the main class.<a name="line.448"></a>
+<span class="sourceLineNo">449</span> URLClassLoader cl = (URLClassLoader)getClass().getClassLoader();<a name="line.449"></a>
+<span class="sourceLineNo">450</span> URL url = cl.findResource("META-INF/MANIFEST.MF");<a name="line.450"></a>
+<span class="sourceLineNo">451</span> if (url != null) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> try {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> m.read(url.openStream());<a name="line.453"></a>
+<span class="sourceLineNo">454</span> } catch (IOException e) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> System.err.println("Problem detected in MANIFEST.MF. Contents below:\n" + read(url.openStream()));<a name="line.455"></a>
+<span class="sourceLineNo">456</span> throw e;<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> mf = new ManifestFile(m);<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> // Resolve the config file if the path was specified.<a name="line.464"></a>
+<span class="sourceLineNo">465</span> // --------------------------------------------------------------------------------<a name="line.465"></a>
+<span class="sourceLineNo">466</span> ConfigFileBuilder cfb = new ConfigFileBuilder();<a name="line.466"></a>
+<span class="sourceLineNo">467</span> if (cfPath != null)<a name="line.467"></a>
+<span class="sourceLineNo">468</span> cf = cfb.build(cfPath).getResolving(createVarResolver().build());<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span> // --------------------------------------------------------------------------------<a name="line.470"></a>
+<span class="sourceLineNo">471</span> // Find config file.<a name="line.471"></a>
+<span class="sourceLineNo">472</span> // Can either be passed in as first parameter, or we discover it using<a name="line.472"></a>
+<span class="sourceLineNo">473</span> // the 'sun.java.command' system property.<a name="line.473"></a>
+<span class="sourceLineNo">474</span> // --------------------------------------------------------------------------------<a name="line.474"></a>
+<span class="sourceLineNo">475</span> if (cf == null) {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> if (args.hasArg(0))<a name="line.476"></a>
+<span class="sourceLineNo">477</span> cfPath = args.getArg(0);<a name="line.477"></a>
+<span class="sourceLineNo">478</span> else if (mf.containsKey("Main-ConfigFile"))<a name="line.478"></a>
+<span class="sourceLineNo">479</span> cfPath = mf.getString("Main-ConfigFile");<a name="line.479"></a>
+<span class="sourceLineNo">480</span> else {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> String cmd = System.getProperty("sun.java.command", "not_found").split("\\s+")[0];<a name="line.481"></a>
+<span class="sourceLineNo">482</span> if (cmd.endsWith(".jar"))<a name="line.482"></a>
+<span class="sourceLineNo">483</span> cfPath = cmd.replace(".jar", ".cfg");<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> if (cfPath == null) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> System.err.println("Running class ["+getClass().getSimpleName()+"] without a config file.");<a name="line.487"></a>
+<span class="sourceLineNo">488</span> cf = cfb.build();<a name="line.488"></a>
+<span class="sourceLineNo">489</span> } else {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> System.out.println("Running class ["+getClass().getSimpleName()+"] using config file ["+cfPath+"]");<a name="line.490"></a>
+<span class="sourceLineNo">491</span> cf = cfb.build(cfPath).getResolving(createVarResolver().build());<a name="line.491"></a>
<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span> if (cfPath == null) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> System.err.println("Running class ["+getClass().getSimpleName()+"] without a config file.");<a name="line.495"></a>
-<span class="sourceLineNo">496</span> cf = cfb.build();<a name="line.496"></a>
-<span class="sourceLineNo">497</span> } else {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> System.out.println("Running class ["+getClass().getSimpleName()+"] using config file ["+cfPath+"]");<a name="line.498"></a>
-<span class="sourceLineNo">499</span> cf = cfb.build(cfPath).getResolving(createVarResolver().build());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> }<a name="line.500"></a>
-<span class="sourceLineNo">501</span> }<a name="line.501"></a>
-<span class="sourceLineNo">502</span><a name="line.502"></a>
-<span class="sourceLineNo">503</span> if (cfPath != null)<a name="line.503"></a>
-<span class="sourceLineNo">504</span> System.setProperty("juneau.configFile", cfPath);<a name="line.504"></a>
+<span class="sourceLineNo">493</span> }<a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span> if (cfPath != null)<a name="line.495"></a>
+<span class="sourceLineNo">496</span> System.setProperty("juneau.configFile", cfPath);<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> // Set system properties.<a name="line.499"></a>
+<span class="sourceLineNo">500</span> // --------------------------------------------------------------------------------<a name="line.500"></a>
+<span class="sourceLineNo">501</span> Set<String> spKeys = cf.getSectionKeys("SystemProperties");<a name="line.501"></a>
+<span class="sourceLineNo">502</span> if (spKeys != null)<a name="line.502"></a>
+<span class="sourceLineNo">503</span> for (String key : spKeys)<a name="line.503"></a>
+<span class="sourceLineNo">504</span> System.setProperty(key, cf.get("SystemProperties", key));<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> // Set system properties.<a name="line.507"></a>
+<span class="sourceLineNo">507</span> // Add a config file change listener.<a name="line.507"></a>
<span class="sourceLineNo">508</span> // --------------------------------------------------------------------------------<a name="line.508"></a>
-<span class="sourceLineNo">509</span> Set<String> spKeys = cf.getSectionKeys("SystemProperties");<a name="line.509"></a>
-<span class="sourceLineNo">510</span> if (spKeys != null)<a name="line.510"></a>
-<span class="sourceLineNo">511</span> for (String key : spKeys)<a name="line.511"></a>
-<span class="sourceLineNo">512</span> System.setProperty(key, cf.get("SystemProperties", key));<a name="line.512"></a>
-<span class="sourceLineNo">513</span><a name="line.513"></a>
-<span class="sourceLineNo">514</span> // --------------------------------------------------------------------------------<a name="line.514"></a>
-<span class="sourceLineNo">515</span> // Add a config file change listener.<a name="line.515"></a>
-<span class="sourceLineNo">516</span> // --------------------------------------------------------------------------------<a name="line.516"></a>
-<span class="sourceLineNo">517</span> cf.addListener(new ConfigFileListener() {<a name="line.517"></a>
-<span class="sourceLineNo">518</span> @Override /* ConfigFileListener */<a name="line.518"></a>
-<span class="sourceLineNo">519</span> public void onSave(ConfigFile cf) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span> onConfigSave(cf);<a name="line.520"></a>
-<span class="sourceLineNo">521</span> }<a name="line.521"></a>
-<span class="sourceLineNo">522</span> @Override /* ConfigFileListener */<a name="line.522"></a>
-<span class="sourceLineNo">523</span> public void onChange(ConfigFile cf, Set<String> changes) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> onConfigChange(cf, changes);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span> });<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span> // --------------------------------------------------------------------------------<a name="line.528"></a>
-<span class="sourceLineNo">529</span> // Add exit listeners.<a name="line.529"></a>
-<span class="sourceLineNo">530</span> // --------------------------------------------------------------------------------<a name="line.530"></a>
-<span class="sourceLineNo">531</span> new Thread() {<a name="line.531"></a>
-<span class="sourceLineNo">532</span> @Override /* Thread */<a name="line.532"></a>
-<span class="sourceLineNo">533</span> public void run() {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> Console c = System.console();<a name="line.534"></a>
-<span class="sourceLineNo">535</span> if (c == null)<a name="line.535"></a>
-<span class="sourceLineNo">536</span> System.out.println("No available console.");<a name="line.536"></a>
-<span class="sourceLineNo">537</span> else {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> while (true) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span> String l = c.readLine("\nEnter 'exit' to exit.\n");<a name="line.539"></a>
-<span class="sourceLineNo">540</span> if (l == null || l.equals("exit")) {<a name="line.540"></a>
-<span class="sourceLineNo">541</span> Microservice.this.stop();<a name="line.541"></a>
-<span class="sourceLineNo">542</span> break;<a name="line.542"></a>
-<span class="sourceLineNo">543</span> }<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
+<span class="sourceLineNo">509</span> cf.addListener(new ConfigFileListener() {<a name="line.509"></a>
+<span class="sourceLineNo">510</span> @Override /* ConfigFileListener */<a name="line.510"></a>
+<span class="sourceLineNo">511</span> public void onSave(ConfigFile cf) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span> onConfigSave(cf);<a name="line.512"></a>
+<span class="sourceLineNo">513</span> }<a name="line.513"></a>
+<span class="sourceLineNo">514</span> @Override /* ConfigFileListener */<a name="line.514"></a>
+<span class="sourceLineNo">515</span> public void onChange(ConfigFile cf, Set<String> changes) {<a name="line.515"></a>
+<span class="sourceLineNo">516</span> onConfigChange(cf, changes);<a name="line.516"></a>
+<span class="sourceLineNo">517</span> }<a name="line.517"></a>
+<span class="sourceLineNo">518</span> });<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span> // --------------------------------------------------------------------------------<a name="line.520"></a>
+<span class="sourceLineNo">521</span> // Add exit listeners.<a name="line.521"></a>
+<span class="sourceLineNo">522</span> // --------------------------------------------------------------------------------<a name="line.522"></a>
+<span class="sourceLineNo">523</span> new Thread() {<a name="line.523"></a>
+<span class="sourceLineNo">524</span> @Override /* Thread */<a name="line.524"></a>
+<span class="sourceLineNo">525</span> public void run() {<a name="line.525"></a>
+<span class="sourceLineNo">526</span> Console c = System.console();<a name="line.526"></a>
+<span class="sourceLineNo">527</span> if (c == null)<a name="line.527"></a>
+<span class="sourceLineNo">528</span> System.out.println("No available console.");<a name="line.528"></a>
+<span class="sourceLineNo">529</span> else {<a name="line.529"></a>
+<span class="sourceLineNo">530</span> while (true) {<a name="line.530"></a>
+<span class="sourceLineNo">531</span> String l = c.readLine("\nEnter 'exit' to exit.\n");<a name="line.531"></a>
+<span class="sourceLineNo">532</span> if (l == null || l.equals("exit")) {<a name="line.532"></a>
+<span class="sourceLineNo">533</span> Microservice.this.stop();<a name="line.533"></a>
+<span class="sourceLineNo">534</span> break;<a name="line.534"></a>
+<span class="sourceLineNo">535</span> }<a name="line.535"></a>
+<span class="sourceLineNo">536</span> }<a name="line.536"></a>
+<span class="sourceLineNo">537</span> }<a name="line.537"></a>
+<span class="sourceLineNo">538</span> }<a name="line.538"></a>
+<span class="sourceLineNo">539</span> }.start();<a name="line.539"></a>
+<span class="sourceLineNo">540</span> Runtime.getRuntime().addShutdownHook(<a name="line.540"></a>
+<span class="sourceLineNo">541</span> new Thread() {<a name="line.541"></a>
+<span class="sourceLineNo">542</span> @Override /* Thread */<a name="line.542"></a>
+<span class="sourceLineNo">543</span> public void run() {<a name="line.543"></a>
+<span class="sourceLineNo">544</span> Microservice.this.stop();<a name="line.544"></a>
<span class="sourceLineNo">545</span> }<a name="line.545"></a>
<span class="sourceLineNo">546</span> }<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }.start();<a name="line.547"></a>
-<span class="sourceLineNo">548</span> Runtime.getRuntime().addShutdownHook(<a name="line.548"></a>
-<span class="sourceLineNo">549</span> new Thread() {<a name="line.549"></a>
-<span class="sourceLineNo">550</span> @Override /* Thread */<a name="line.550"></a>
-<span class="sourceLineNo">551</span> public void run() {<a name="line.551"></a>
-<span class="sourceLineNo">552</span> Microservice.this.stop();<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> }<a name="line.554"></a>
-<span class="sourceLineNo">555</span> );<a name="line.555"></a>
-<span class="sourceLineNo">556</span> onStart();<a name="line.556"></a>
-<span class="sourceLineNo">557</span> return this;<a name="line.557"></a>
-<span class="sourceLineNo">558</span> }<a name="line.558"></a>
-<span class="sourceLineNo">559</span><a name="line.559"></a>
-<span class="sourceLineNo">560</span> /**<a name="line.560"></a>
-<span class="sourceLineNo">561</span> * Joins the application with the current thread.<a name="line.561"></a>
-<span class="sourceLineNo">562</span> * <a name="line.562"></a>
-<span class="sourceLineNo">563</span> * <p><a name="line.563"></a>
-<span class="sourceLineNo">564</span> * Default implementation is a no-op.<a name="line.564"></a>
-<span class="sourceLineNo">565</span> *<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> * @throws Exception<a name="line.567"></a>
-<span class="sourceLineNo">568</span> */<a name="line.568"></a>
-<span class="sourceLineNo">569</span> public Microservice join() throws Exception {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> return this;<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> * Stop this application.<a name="line.574"></a>
-<span class="sourceLineNo">575</span> * <a name="line.575"></a>
-<span class="sourceLineNo">576</span> * <p><a name="line.576"></a>
-<span class="sourceLineNo">577</span> * Default implementation simply calls {@link #onStop()}.<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * <a name="line.578"></a>
-<span class="sourceLineNo">579</span> * <p><a name="line.579"></a>
-<span class="sourceLineNo">580</span> * Overridden methods MUST call this method LAST so that the {@link #onStop()} method is called.<a name="line.580"></a>
-<span class="sourceLineNo">581</span> *<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * @return This object (for method chaining).<a name="line.582"></a>
+<span class="sourceLineNo">547</span> );<a name="line.547"></a>
+<span class="sourceLineNo">548</span> onStart();<a name="line.548"></a>
+<span class="sourceLineNo">549</span> return this;<a name="line.549"></a>
+<span class="sourceLineNo">550</span> }<a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span> /**<a name="line.552"></a>
+<span class="sourceLineNo">553</span> * Joins the application with the current thread.<a name="line.553"></a>
+<span class="sourceLineNo">554</span> * <a name="line.554"></a>
+<span class="sourceLineNo">555</span> * <p><a name="line.555"></a>
+<span class="sourceLineNo">556</span> * Default implementation is a no-op.<a name="line.556"></a>
+<span class="sourceLineNo">557</span> *<a name="line.557"></a>
+<span class="sourceLineNo">558</span> * @return This object (for method chaining).<a name="line.558"></a>
+<span class="sourceLineNo">559</span> * @throws Exception<a name="line.559"></a>
+<span class="sourceLineNo">560</span> */<a name="line.560"></a>
+<span class="sourceLineNo">561</span> public Microservice join() throws Exception {<a name="line.561"></a>
+<span class="sourceLineNo">562</span> return this;<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> * Stop this application.<a name="line.566"></a>
+<span class="sourceLineNo">567</span> * <a name="line.567"></a>
+<span class="sourceLineNo">568</span> * <p><a name="line.568"></a>
+<span class="sourceLineNo">569</span> * Default implementation simply calls {@link #onStop()}.<a name="line.569"></a>
+<span class="sourceLineNo">570</span> * <a name="line.570"></a>
+<span class="sourceLineNo">571</span> * <p><a name="line.571"></a>
+<span class="sourceLineNo">572</span> * Overridden methods MUST call this method LAST so that the {@link #onStop()} method is called.<a name="line.572"></a>
+<span class="sourceLineNo">573</span> *<a name="line.573"></a>
+<span class="sourceLineNo">574</span> * @return This object (for method chaining).<a name="line.574"></a>
+<span class="sourceLineNo">575</span> */<a name="line.575"></a>
+<span class="sourceLineNo">576</span> public Microservice stop() {<a name="line.576"></a>
+<span class="sourceLineNo">577</span> onStop();<a name="line.577"></a>
+<span class="sourceLineNo">578</span> return this;<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> /**<a name="line.581"></a>
+<span class="sourceLineNo">582</span> * Kill the JVM by calling <code>System.exit(2);</code>.<a name="line.582"></a>
<span class="sourceLineNo">583</span> */<a name="line.583"></a>
-<span class="sourceLineNo">584</span> public Microservice stop() {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> onStop();<a name="line.585"></a>
-<span class="sourceLineNo">586</span> return this;<a name="line.586"></a>
+<span class="sourceLineNo">584</span> public void kill() {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> // This triggers the shutdown hook.<a name="line.585"></a>
+<span class="sourceLineNo">586</span> System.exit(2);<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> * Kill the JVM by calling <code>System.exit(2);</code>.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> */<a name="line.591"></a>
-<span class="sourceLineNo">592</span> public void kill() {<a name="line.592"></a>
-<span class="sourceLineNo">593</span> // This triggers the shutdown hook.<a name="line.593"></a>
-<span class="sourceLineNo">594</span> System.exit(2);<a name="line.594"></a>
-<span class="sourceLineNo">595</span> }<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> //--------------------------------------------------------------------------------<a name="line.598"></a>
-<span class="sourceLineNo">599</span> // Lifecycle listener methods.<a name="line.599"></a>
-<span class="sourceLineNo">600</span> // Subclasses can override these methods to run code on certain events.<a name="line.600">
<TRUNCATED>
[05/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/RestResponse.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestResponse.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestResponse.html
index 8de320a..71cf60d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestResponse.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestResponse.html
@@ -31,786 +31,784 @@
<span class="sourceLineNo">023</span>import org.apache.juneau.encoders.*;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import org.apache.juneau.html.*;<a name="line.24"></a>
<span class="sourceLineNo">025</span>import org.apache.juneau.http.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.jena.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.json.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.parser.*;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.juneau.rest.annotation.*;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.juneau.serializer.*;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.juneau.urlencoding.*;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.juneau.utils.*;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.juneau.xml.*;<a name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * Represents an HTTP response for a REST resource.<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <p><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * Essentially an extended {@link HttpServletResponse} with some special convenience methods that allow you to easily<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * output POJOs as responses.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <p><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * Since this class extends {@link HttpServletResponse}, developers are free to use these convenience methods, or<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * revert to using lower level methods like any other servlet response.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> *<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <h5 class='section'>Example:</h5><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <p class='bcode'><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>)<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <jk>public void</jk> doGet(RestRequest req, RestResponse res) {<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * res.setPageTitle(<js>"My title"</js>)<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * .setOutput(<js>"Simple string response"</js>);<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * }<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * </p><a name="line.53"></a>
-<span class="sourceLineNo">054</span> *<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <p><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * class.<a name="line.57"></a>
-<span class="sourceLineNo">058</span> */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>public final class RestResponse extends HttpServletResponseWrapper {<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> private final RestRequest request;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> private Object output; // The POJO being sent to the output.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> private boolean isNullOutput; // The output is null (as opposed to not being set at all)<a name="line.63"></a>
-<span class="sourceLineNo">064</span> private ObjectMap properties; // Response properties<a name="line.64"></a>
-<span class="sourceLineNo">065</span> SerializerGroup serializerGroup;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> UrlEncodingSerializer urlEncodingSerializer; // The serializer used to convert arguments passed into Redirect objects.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> private EncoderGroup encoders;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> private ServletOutputStream os;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> private PrintWriter w;<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> * Constructor.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> */<a name="line.73"></a>
-<span class="sourceLineNo">074</span> RestResponse(RestContext context, RestRequest req, HttpServletResponse res) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span> super(res);<a name="line.75"></a>
-<span class="sourceLineNo">076</span> this.request = req;<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> for (Map.Entry<String,Object> e : context.getDefaultResponseHeaders().entrySet())<a name="line.78"></a>
-<span class="sourceLineNo">079</span> setHeader(e.getKey(), e.getValue().toString());<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> try {<a name="line.81"></a>
-<span class="sourceLineNo">082</span> String passThroughHeaders = req.getHeader("x-response-headers");<a name="line.82"></a>
-<span class="sourceLineNo">083</span> if (passThroughHeaders != null) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> PartParser p = context.getUrlEncodingParser();<a name="line.84"></a>
-<span class="sourceLineNo">085</span> ObjectMap m = p.parse(PartType.HEADER, passThroughHeaders, context.getBeanContext().getClassMeta(ObjectMap.class));<a name="line.85"></a>
-<span class="sourceLineNo">086</span> for (Map.Entry<String,Object> e : m.entrySet())<a name="line.86"></a>
-<span class="sourceLineNo">087</span> setHeader(e.getKey(), e.getValue().toString());<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span> } catch (Exception e1) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> throw new RestException(SC_BAD_REQUEST, "Invalid format for header 'x-response-headers'. Must be in URL-encoded format.").initCause(e1);<a name="line.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> /*<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> */<a name="line.96"></a>
-<span class="sourceLineNo">097</span> @SuppressWarnings("hiding")<a name="line.97"></a>
-<span class="sourceLineNo">098</span> final void init(ObjectMap properties, String defaultCharset, SerializerGroup mSerializers, UrlEncodingSerializer mUrlEncodingSerializer, EncoderGroup encoders) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> this.properties = properties;<a name="line.99"></a>
-<span class="sourceLineNo">100</span> this.serializerGroup = mSerializers;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> this.urlEncodingSerializer = mUrlEncodingSerializer;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> this.encoders = encoders;<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> // Find acceptable charset<a name="line.104"></a>
-<span class="sourceLineNo">105</span> String h = request.getHeader("accept-charset");<a name="line.105"></a>
-<span class="sourceLineNo">106</span> String charset = null;<a name="line.106"></a>
-<span class="sourceLineNo">107</span> if (h == null)<a name="line.107"></a>
-<span class="sourceLineNo">108</span> charset = defaultCharset;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> else for (MediaTypeRange r : MediaTypeRange.parse(h)) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> if (r.getQValue() > 0) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> MediaType mt = r.getMediaType();<a name="line.111"></a>
-<span class="sourceLineNo">112</span> if (mt.getType().equals("*"))<a name="line.112"></a>
-<span class="sourceLineNo">113</span> charset = defaultCharset;<a name="line.113"></a>
-<span class="sourceLineNo">114</span> else if (Charset.isSupported(mt.getType()))<a name="line.114"></a>
-<span class="sourceLineNo">115</span> charset = mt.getType();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> if (charset != null)<a name="line.116"></a>
-<span class="sourceLineNo">117</span> break;<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 (charset == null)<a name="line.121"></a>
-<span class="sourceLineNo">122</span> throw new RestException(SC_NOT_ACCEPTABLE, "No supported charsets in header ''Accept-Charset'': ''{0}''", request.getHeader("Accept-Charset"));<a name="line.122"></a>
-<span class="sourceLineNo">123</span> super.setCharacterEncoding(charset);<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> * Gets the serializer group for the response.<a name="line.127"></a>
-<span class="sourceLineNo">128</span> *<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * @return The serializer group for the response.<a name="line.129"></a>
-<span class="sourceLineNo">130</span> */<a name="line.130"></a>
-<span class="sourceLineNo">131</span> public SerializerGroup getSerializerGroup() {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return serializerGroup;<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 media types that are valid for <code>Accept</code> headers on the request.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> *<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * @return The set of media types registered in the parser group of this request.<a name="line.138"></a>
-<span class="sourceLineNo">139</span> */<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> return serializerGroup.getSupportedMediaTypes();<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 codings that are valid for <code>Accept-Encoding</code> and <code>Content-Encoding</code> headers on<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * the request.<a name="line.146"></a>
-<span class="sourceLineNo">147</span> *<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * @return The set of media types registered in the parser group of this request.<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * @throws RestServletException<a name="line.149"></a>
-<span class="sourceLineNo">150</span> */<a name="line.150"></a>
-<span class="sourceLineNo">151</span> public List<String> getSupportedEncodings() throws RestServletException {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> return encoders.getSupportedEncodings();<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> * Sets the HTTP output on the response.<a name="line.156"></a>
-<span class="sourceLineNo">157</span> *<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * <p><a name="line.158"></a>
-<span class="sourceLineNo">159</span> * Calling this method is functionally equivalent to returning the object in the REST Java method.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> *<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * <p><a name="line.161"></a>
-<span class="sourceLineNo">162</span> * Can be of any of the following types:<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * <ul><a name="line.163"></a>
-<span class="sourceLineNo">164</span> * <li> {@link InputStream}<a name="line.164"></a>
-<span class="sourceLineNo">165</span> * <li> {@link Reader}<a name="line.165"></a>
-<span class="sourceLineNo">166</span> * <li> Any serializable type defined in <a class="doclink"<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * href="../../../../overview-summary.html#Core.PojoCategories">POJO Categories</a><a name="line.167"></a>
-<span class="sourceLineNo">168</span> * </ul><a name="line.168"></a>
-<span class="sourceLineNo">169</span> *<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * <p><a name="line.170"></a>
-<span class="sourceLineNo">171</span> * If it's an {@link InputStream} or {@link Reader}, you must also specify the <code>Content-Type</code> using the<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * {@link #setContentType(String)} method.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> *<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * @param output The output to serialize to the connection.<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * @return This object (for method chaining).<a name="line.175"></a>
-<span class="sourceLineNo">176</span> */<a name="line.176"></a>
-<span class="sourceLineNo">177</span> public RestResponse setOutput(Object output) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> this.output = output;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> this.isNullOutput = output == null;<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> /**<a name="line.183"></a>
-<span class="sourceLineNo">184</span> * Add a serializer property to send to the serializers to override a default value.<a name="line.184"></a>
-<span class="sourceLineNo">185</span> *<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * <p><a name="line.186"></a>
-<span class="sourceLineNo">187</span> * Can be any value specified in the following classes:<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * <ul><a name="line.188"></a>
-<span class="sourceLineNo">189</span> * <li>{@link SerializerContext}<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * <li>{@link JsonSerializerContext}<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * <li>{@link XmlSerializerContext}<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * <li>{@link RdfSerializerContext}<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * </ul><a name="line.193"></a>
-<span class="sourceLineNo">194</span> *<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * @param key The setting name.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * @param value The setting value.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * @return This object (for method chaining).<a name="line.197"></a>
-<span class="sourceLineNo">198</span> */<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public RestResponse setProperty(String key, Object value) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> properties.put(key, value);<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> * Returns the properties set via {@link #setProperty(String, Object)}.<a name="line.205"></a>
-<span class="sourceLineNo">206</span> *<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * @return A map of all the property values set.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> */<a name="line.208"></a>
-<span class="sourceLineNo">209</span> public ObjectMap getProperties() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return 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> * Shortcut method that allows you to use var-args to simplify setting array output.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> *<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * <h5 class='section'>Example:</h5><a name="line.216"></a>
-<span class="sourceLineNo">217</span> * <p class='bcode'><a name="line.217"></a>
-<span class="sourceLineNo">218</span> * <jc>// Instead of...</jc><a name="line.218"></a>
-<span class="sourceLineNo">219</span> * response.setOutput(<jk>new</jk> Object[]{x,y,z});<a name="line.219"></a>
-<span class="sourceLineNo">220</span> *<a name="line.220"></a>
-<span class="sourceLineNo">221</span> * <jc>// ...call this...</jc><a name="line.221"></a>
-<span class="sourceLineNo">222</span> * response.setOutput(x,y,z);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> * </p><a name="line.223"></a>
-<span class="sourceLineNo">224</span> *<a name="line.224"></a>
-<span class="sourceLineNo">225</span> * @param output The output to serialize to the connection.<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * @return This object (for method chaining).<a name="line.226"></a>
-<span class="sourceLineNo">227</span> */<a name="line.227"></a>
-<span class="sourceLineNo">228</span> public RestResponse setOutputs(Object...output) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> this.output = output;<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> * Returns the output that was set by calling {@link #setOutput(Object)}.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> *<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * @return The output object.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> */<a name="line.237"></a>
-<span class="sourceLineNo">238</span> public Object getOutput() {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return output;<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 <jk>true</jk> if this response has any output associated with it.<a name="line.243"></a>
-<span class="sourceLineNo">244</span> *<a name="line.244"></a>
-<span class="sourceLineNo">245</span> * @return <jk>true</jk> if {@code setInput()} has been called.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> */<a name="line.246"></a>
-<span class="sourceLineNo">247</span> public boolean hasOutput() {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> return output != null || isNullOutput;<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> * Sets the output to a plain-text message regardless of the content type.<a name="line.252"></a>
-<span class="sourceLineNo">253</span> *<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * @param text The output text to send.<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * @return This object (for method chaining).<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * @throws IOException If a problem occurred trying to write to the writer.<a name="line.256"></a>
-<span class="sourceLineNo">257</span> */<a name="line.257"></a>
-<span class="sourceLineNo">258</span> public RestResponse sendPlainText(String text) throws IOException {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> setContentType("text/plain");<a name="line.259"></a>
-<span class="sourceLineNo">260</span> getNegotiatedWriter().write(text);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return this;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> /**<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * Equivalent to {@link HttpServletResponse#getOutputStream()}, except wraps the output stream if an {@link Encoder}<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * was found that matched the <code>Accept-Encoding</code> header.<a name="line.266"></a>
-<span class="sourceLineNo">267</span> *<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * @return A negotiated output stream.<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * @throws IOException<a name="line.269"></a>
-<span class="sourceLineNo">270</span> */<a name="line.270"></a>
-<span class="sourceLineNo">271</span> public ServletOutputStream getNegotiatedOutputStream() throws IOException {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> if (os == null) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> Encoder encoder = null;<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span> String ae = request.getHeader("Accept-Encoding");<a name="line.275"></a>
-<span class="sourceLineNo">276</span> if (! (ae == null || ae.isEmpty())) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> EncoderMatch match = encoders != null ? encoders.getEncoderMatch(ae) : null;<a name="line.277"></a>
-<span class="sourceLineNo">278</span> if (match == null) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> // Identity should always match unless "identity;q=0" or "*;q=0" is specified.<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (ae.matches(".*(identity|\\*)\\s*;\\s*q\\s*=\\s*(0(?!\\.)|0\\.0).*")) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> throw new RestException(SC_NOT_ACCEPTABLE,<a name="line.281"></a>
-<span class="sourceLineNo">282</span> "Unsupported encoding in request header ''Accept-Encoding'': ''{0}''\n\tSupported codings: {1}",<a name="line.282"></a>
-<span class="sourceLineNo">283</span> ae, encoders.getSupportedEncodings()<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> } else {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> encoder = match.getEncoder();<a name="line.287"></a>
-<span class="sourceLineNo">288</span> String encoding = match.getEncoding().toString();<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span> // Some clients don't recognize identity as an encoding, so don't set it.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> if (! encoding.equals("identity"))<a name="line.291"></a>
-<span class="sourceLineNo">292</span> setHeader("content-encoding", encoding);<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span> os = getOutputStream();<a name="line.295"></a>
-<span class="sourceLineNo">296</span> if (encoder != null) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> final OutputStream os2 = encoder.getOutputStream(os);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> os = new ServletOutputStream(){<a name="line.298"></a>
-<span class="sourceLineNo">299</span> @Override /* OutputStream */<a name="line.299"></a>
-<span class="sourceLineNo">300</span> public final void write(byte[] b, int off, int len) throws IOException {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> os2.write(b, off, len);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span> @Override /* OutputStream */<a name="line.303"></a>
-<span class="sourceLineNo">304</span> public final void write(int b) throws IOException {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> os2.write(b);<a name="line.305"></a>
-<span class="sourceLineNo">306</span> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span> @Override /* OutputStream */<a name="line.307"></a>
-<span class="sourceLineNo">308</span> public final void flush() throws IOException {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> os2.flush();<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span> @Override /* OutputStream */<a name="line.311"></a>
-<span class="sourceLineNo">312</span> public final void close() throws IOException {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> os2.close();<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span> @Override /* ServletOutputStream */<a name="line.315"></a>
-<span class="sourceLineNo">316</span> public boolean isReady() {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return true;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> }<a name="line.318"></a>
-<span class="sourceLineNo">319</span> @Override /* ServletOutputStream */<a name="line.319"></a>
-<span class="sourceLineNo">320</span> public void setWriteListener(WriteListener arg0) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span> throw new NoSuchMethodError();<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span> };<a name="line.323"></a>
-<span class="sourceLineNo">324</span> }<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span> return os;<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 /* ServletResponse */<a name="line.329"></a>
-<span class="sourceLineNo">330</span> public ServletOutputStream getOutputStream() throws IOException {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> if (os == null)<a name="line.331"></a>
-<span class="sourceLineNo">332</span> os = super.getOutputStream();<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return os;<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 <jk>true</jk> if {@link #getOutputStream()} has been called.<a name="line.337"></a>
-<span class="sourceLineNo">338</span> *<a name="line.338"></a>
-<span class="sourceLineNo">339</span> * @return <jk>true</jk> if {@link #getOutputStream()} has been called.<a name="line.339"></a>
-<span class="sourceLineNo">340</span> */<a name="line.340"></a>
-<span class="sourceLineNo">341</span> public boolean getOutputStreamCalled() {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> return os != null;<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 writer to the response body.<a name="line.346"></a>
-<span class="sourceLineNo">347</span> *<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * <p><a name="line.348"></a>
-<span class="sourceLineNo">349</span> * This methods bypasses any specified encoders and returns a regular unbuffered writer.<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * Use the {@link #getNegotiatedWriter()} method if you want to use the matched encoder (if any).<a name="line.350"></a>
-<span class="sourceLineNo">351</span> */<a name="line.351"></a>
-<span class="sourceLineNo">352</span> @Override /* ServletResponse */<a name="line.352"></a>
-<span class="sourceLineNo">353</span> public PrintWriter getWriter() throws IOException {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> return getWriter(true);<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> * Convenience method meant to be used when rendering directly to a browser with no buffering.<a name="line.358"></a>
-<span class="sourceLineNo">359</span> *<a name="line.359"></a>
-<span class="sourceLineNo">360</span> * <p><a name="line.360"></a>
-<span class="sourceLineNo">361</span> * Sets the header <js>"x-content-type-options=nosniff"</js> so that output is rendered immediately on IE and Chrome<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * without any buffering for content-type sniffing.<a name="line.362"></a>
-<span class="sourceLineNo">363</span> *<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * @param contentType The value to set as the <code>Content-Type</code> on the response.<a name="line.364"></a>
-<span class="sourceLineNo">365</span> * @return The raw writer.<a name="line.365"></a>
-<span class="sourceLineNo">366</span> * @throws IOException<a name="line.366"></a>
-<span class="sourceLineNo">367</span> */<a name="line.367"></a>
-<span class="sourceLineNo">368</span> public PrintWriter getDirectWriter(String contentType) throws IOException {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> setContentType(contentType);<a name="line.369"></a>
-<span class="sourceLineNo">370</span> setHeader("x-content-type-options", "nosniff");<a name="line.370"></a>
-<span class="sourceLineNo">371</span> return getWriter();<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> * Equivalent to {@link HttpServletResponse#getWriter()}, except wraps the output stream if an {@link Encoder} was<a name="line.375"></a>
-<span class="sourceLineNo">376</span> * found that matched the <code>Accept-Encoding</code> header and sets the <code>Content-Encoding</code><a name="line.376"></a>
-<span class="sourceLineNo">377</span> * header to the appropriate value.<a name="line.377"></a>
-<span class="sourceLineNo">378</span> *<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * @return The negotiated writer.<a name="line.379"></a>
-<span class="sourceLineNo">380</span> * @throws IOException<a name="line.380"></a>
-<span class="sourceLineNo">381</span> */<a name="line.381"></a>
-<span class="sourceLineNo">382</span> public PrintWriter getNegotiatedWriter() throws IOException {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> return getWriter(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> private PrintWriter getWriter(boolean raw) throws IOException {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> if (w != null)<a name="line.387"></a>
-<span class="sourceLineNo">388</span> return w;<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span> // If plain text requested, override it now.<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (request.isPlainText())<a name="line.391"></a>
-<span class="sourceLineNo">392</span> setHeader("Content-Type", "text/plain");<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span> try {<a name="line.394"></a>
-<span class="sourceLineNo">395</span> OutputStream out = (raw ? getOutputStream() : getNegotiatedOutputStream());<a name="line.395"></a>
-<span class="sourceLineNo">396</span> w = new PrintWriter(new OutputStreamWriter(out, getCharacterEncoding()));<a name="line.396"></a>
-<span class="sourceLineNo">397</span> return w;<a name="line.397"></a>
-<span class="sourceLineNo">398</span> } catch (UnsupportedEncodingException e) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span> String ce = getCharacterEncoding();<a name="line.399"></a>
-<span class="sourceLineNo">400</span> setCharacterEncoding("UTF-8");<a name="line.400"></a>
-<span class="sourceLineNo">401</span> throw new RestException(SC_NOT_ACCEPTABLE, "Unsupported charset in request header ''Accept-Charset'': ''{0}''", ce);<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> /**<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * Returns the <code>Content-Type</code> header stripped of the charset attribute if present.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> *<a name="line.407"></a>
-<span class="sourceLineNo">408</span> * @return The <code>media-type</code> portion of the <code>Content-Type</code> header.<a name="line.408"></a>
-<span class="sourceLineNo">409</span> */<a name="line.409"></a>
-<span class="sourceLineNo">410</span> public MediaType getMediaType() {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> return MediaType.forString(getContentType());<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> * Redirects to the specified URI.<a name="line.415"></a>
-<span class="sourceLineNo">416</span> *<a name="line.416"></a>
-<span class="sourceLineNo">417</span> * <p><a name="line.417"></a>
-<span class="sourceLineNo">418</span> * Relative URIs are always interpreted as relative to the context root.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * This is similar to how WAS handles redirect requests, and is different from how Tomcat handles redirect requests.<a name="line.419"></a>
-<span class="sourceLineNo">420</span> */<a name="line.420"></a>
-<span class="sourceLineNo">421</span> @Override /* ServletResponse */<a name="line.421"></a>
-<span class="sourceLineNo">422</span> public void sendRedirect(String uri) throws IOException {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> char c = (uri.length() > 0 ? uri.charAt(0) : 0);<a name="line.423"></a>
-<span class="sourceLineNo">424</span> if (c != '/' && uri.indexOf("://") == -1)<a name="line.424"></a>
-<span class="sourceLineNo">425</span> uri = request.getContextPath() + '/' + uri;<a name="line.425"></a>
-<span class="sourceLineNo">426</span> super.sendRedirect(uri);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span> /**<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * Returns the URL-encoding serializer associated with this response.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> *<a name="line.431"></a>
-<span class="sourceLineNo">432</span> * @return The URL-encoding serializer associated with this response.<a name="line.432"></a>
-<span class="sourceLineNo">433</span> */<a name="line.433"></a>
-<span class="sourceLineNo">434</span> public UrlEncodingSerializer getUrlEncodingSerializer() {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> return urlEncodingSerializer;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span> @Override /* ServletResponse */<a name="line.438"></a>
-<span class="sourceLineNo">439</span> public void setHeader(String name, String value) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> // Jetty doesn't set the content type correctly if set through this method.<a name="line.440"></a>
-<span class="sourceLineNo">441</span> // Tomcat/WAS does.<a name="line.441"></a>
-<span class="sourceLineNo">442</span> if (name.equalsIgnoreCase("Content-Type"))<a name="line.442"></a>
-<span class="sourceLineNo">443</span> super.setContentType(value);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> else<a name="line.444"></a>
-<span class="sourceLineNo">445</span> super.setHeader(name, value);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span> /**<a name="line.448"></a>
-<span class="sourceLineNo">449</span> * Sets the HTML header section contents.<a name="line.449"></a>
-<span class="sourceLineNo">450</span> *<a name="line.450"></a>
-<span class="sourceLineNo">451</span> * <p><a name="line.451"></a>
-<span class="sourceLineNo">452</span> * The format of this value is HTML.<a name="line.452"></a>
-<span class="sourceLineNo">453</span> *<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * <p><a name="line.454"></a>
-<span class="sourceLineNo">455</span> * The page header normally contains the title and description, but this value can be used to override the contents<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * to be whatever you want.<a name="line.456"></a>
-<span class="sourceLineNo">457</span> *<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * <p><a name="line.458"></a>
-<span class="sourceLineNo">459</span> * A value of <js>"NONE"</js> can be used to force no header.<a name="line.459"></a>
-<span class="sourceLineNo">460</span> *<a name="line.460"></a>
-<span class="sourceLineNo">461</span> * <p><a name="line.461"></a>
-<span class="sourceLineNo">462</span> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).<a name="line.462"></a>
-<span class="sourceLineNo">463</span> * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.463"></a>
-<span class="sourceLineNo">464</span> *<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * <p><a name="line.465"></a>
-<span class="sourceLineNo">466</span> * This is the programmatic equivalent to the {@link HtmlDoc#header() @HtmlDoc.header()} annotation.<a name="line.466"></a>
-<span class="sourceLineNo">467</span> *<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * @param value<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * The HTML header section contents.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * Object will be converted to a string using {@link Object#toString()}.<a name="line.470"></a>
-<span class="sourceLineNo">471</span> * <p><a name="line.471"></a>
-<span class="sourceLineNo">472</span> * <ul class='doctree'><a name="line.472"></a>
-<span class="sourceLineNo">473</span> * <li class='info'><a name="line.473"></a>
-<span class="sourceLineNo">474</span> * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to<a name="line.474"></a>
-<span class="sourceLineNo">475</span> * waste string concatenation cycles on non-HTML views.<a name="line.475"></a>
-<span class="sourceLineNo">476</span> * </ul><a name="line.476"></a>
-<span class="sourceLineNo">477</span> * @return This object (for method chaining).<a name="line.477"></a>
-<span class="sourceLineNo">478</span> */<a name="line.478"></a>
-<span class="sourceLineNo">479</span> public RestResponse setHtmlHeader(Object value) {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> return setProperty(HtmlDocSerializerContext.HTMLDOC_header, value);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span> /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * Sets the links in the HTML nav section.<a name="line.484"></a>
-<span class="sourceLineNo">485</span> *<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * <p><a name="line.486"></a>
-<span class="sourceLineNo">487</span> * The format of this value is a lax-JSON map of key/value pairs where the keys are the link text and the values are<a name="line.487"></a>
-<span class="sourceLineNo">488</span> * relative (to the servlet) or absolute URLs.<a name="line.488"></a>
-<span class="sourceLineNo">489</span> *<a name="line.489"></a>
-<span class="sourceLineNo">490</span> * <p><a name="line.490"></a>
-<span class="sourceLineNo">491</span> * The page links are positioned immediately under the title and text.<a name="line.491"></a>
-<span class="sourceLineNo">492</span> *<a name="line.492"></a>
-<span class="sourceLineNo">493</span> * <p><a name="line.493"></a>
-<span class="sourceLineNo">494</span> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).<a name="line.494"></a>
-<span class="sourceLineNo">495</span> * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.495"></a>
-<span class="sourceLineNo">496</span> *<a name="line.496"></a>
-<span class="sourceLineNo">497</span> * <p><a name="line.497"></a>
-<span class="sourceLineNo">498</span> * A value of <js>"NONE"</js> can be used to force no value.<a name="line.498"></a>
-<span class="sourceLineNo">499</span> *<a name="line.499"></a>
-<span class="sourceLineNo">500</span> * <p><a name="line.500"></a>
-<span class="sourceLineNo">501</span> * This field can also use URIs of any support type in {@link UriResolver}.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> *<a name="line.502"></a>
-<span class="sourceLineNo">503</span> * <p><a name="line.503"></a>
-<span class="sourceLineNo">504</span> * This is the programmatic equivalent to the {@link HtmlDoc#links() @HtmlDoc.links()} annotation.<a name="line.504"></a>
-<span class="sourceLineNo">505</span> *<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * @param value<a name="line.506"></a>
-<span class="sourceLineNo">507</span> * The HTML nav section links links.<a name="line.507"></a>
-<span class="sourceLineNo">508</span> * <p><a name="line.508"></a>
-<span class="sourceLineNo">509</span> * <ul class='doctree'><a name="line.509"></a>
-<span class="sourceLineNo">510</span> * <li class='info'><a name="line.510"></a>
-<span class="sourceLineNo">511</span> * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to<a name="line.511"></a>
-<span class="sourceLineNo">512</span> * waste string concatenation cycles on non-HTML views.<a name="line.512"></a>
-<span class="sourceLineNo">513</span> * </ul><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> */<a name="line.515"></a>
-<span class="sourceLineNo">516</span> public RestResponse setHtmlLinks(String[] value) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span> properties.put(HtmlDocSerializerContext.HTMLDOC_links, value);<a name="line.517"></a>
-<span class="sourceLineNo">518</span> return this;<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 the HTML nav section contents.<a name="line.522"></a>
-<span class="sourceLineNo">523</span> *<a name="line.523"></a>
-<span class="sourceLineNo">524</span> * <p><a name="line.524"></a>
-<span class="sourceLineNo">525</span> * The format of this value is HTML.<a name="line.525"></a>
-<span class="sourceLineNo">526</span> *<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * <p><a name="line.527"></a>
-<span class="sourceLineNo">528</span> * The nav section of the page contains the links.<a name="line.528"></a>
-<span class="sourceLineNo">529</span> *<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * <p><a name="line.530"></a>
-<span class="sourceLineNo">531</span> * The format of this value is HTML.<a name="line.531"></a>
-<span class="sourceLineNo">532</span> *<a name="line.532"></a>
-<span class="sourceLineNo">533</span> * <p><a name="line.533"></a>
-<span class="sourceLineNo">534</span> * When a value is specified, the {@link #setHtmlLinks(String[])} value will be ignored.<a name="line.534"></a>
-<span class="sourceLineNo">535</span> *<a name="line.535"></a>
-<span class="sourceLineNo">536</span> * <p><a name="line.536"></a>
-<span class="sourceLineNo">537</span> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).<a name="line.537"></a>
-<span class="sourceLineNo">538</span> * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.538"></a>
-<span class="sourceLineNo">539</span> *<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * <p><a name="line.540"></a>
-<span class="sourceLineNo">541</span> * A value of <js>"NONE"</js> can be used to force no value.<a name="line.541"></a>
-<span class="sourceLineNo">542</span> *<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * <p><a name="line.543"></a>
-<span class="sourceLineNo">544</span> * This is the programmatic equivalent to the {@link HtmlDoc#nav() @HtmlDoc.nav()} annotation.<a name="line.544"></a>
-<span class="sourceLineNo">545</span> *<a name="line.545"></a>
-<span class="sourceLineNo">546</span> * @param value<a name="line.546"></a>
-<span class="sourceLineNo">547</span> * The HTML nav section contents.<a name="line.547"></a>
-<span class="sourceLineNo">548</span> * Object will be converted to a string using {@link Object#toString()}.<a name="line.548"></a>
-<span class="sourceLineNo">549</span> * <p><a name="line.549"></a>
-<span class="sourceLineNo">550</span> * <ul class='doctree'><a name="line.550"></a>
-<span class="sourceLineNo">551</span> * <li class='info'><a name="line.551"></a>
-<span class="sourceLineNo">552</span> * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * waste string concatenation cycles on non-HTML views.<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * </ul><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> */<a name="line.556"></a>
-<span class="sourceLineNo">557</span> public RestResponse setHtmlNav(Object value) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> properties.put(HtmlDocSerializerContext.HTMLDOC_nav, value);<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> /**<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * Sets the HTML aside section contents.<a name="line.563"></a>
-<span class="sourceLineNo">564</span> *<a name="line.564"></a>
-<span class="sourceLineNo">565</span> * <p><a name="line.565"></a>
-<span class="sourceLineNo">566</span> * The format of this value is HTML.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> *<a name="line.567"></a>
-<span class="sourceLineNo">568</span> * <p><a name="line.568"></a>
-<span class="sourceLineNo">569</span> * The aside section typically floats on the right side of the page.<a name="line.569"></a>
-<span class="sourceLineNo">570</span> *<a name="line.570"></a>
-<span class="sourceLineNo">571</span> * <p><a name="line.571"></a>
-<span class="sourceLineNo">572</span> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).<a name="line.572"></a>
-<span class="sourceLineNo">573</span> * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.573"></a>
-<span class="sourceLineNo">574</span> *<a name="line.574"></a>
-<span class="sourceLineNo">575</span> * <p><a name="line.575"></a>
-<span class="sourceLineNo">576</span> * A value of <js>"NONE"</js> can be used to force no value.<a name="line.576"></a>
-<span class="sourceLineNo">577</span> *<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * <p><a name="line.578"></a>
-<span class="sourceLineNo">579</span> * This is the programmatic equivalent to the {@link HtmlDoc#aside() @HtmlDoc.aside()} annotation.<a name="line.579"></a>
-<span class="sourceLineNo">580</span> *<a name="line.580"></a>
-<span class="sourceLineNo">581</span> * @param value<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * The HTML aside section contents.<a name="line.582"></a>
-<span class="sourceLineNo">583</span> * Object will be converted to a string using {@link Object#toString()}.<a name="line.583"></a>
-<span class="sourceLineNo">584</span> * <p><a name="line.584"></a>
-<span class="sourceLineNo">585</span> * <ul class='doctree'><a name="line.585"></a>
-<span class="sourceLineNo">586</span> * <li class='info'><a name="line.586"></a>
-<span class="sourceLineNo">587</span> * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to waste<a name="line.587"></a>
-<span class="sourceLineNo">588</span> * string concatenation cycles on non-HTML views.<a name="line.588"></a>
-<span class="sourceLineNo">589</span> * </ul><a name="line.589"></a>
-<span class="sourceLineNo">590</span> * @return This object (for method chaining).<a name="line.590"></a>
-<span class="sourceLineNo">591</span> */<a name="line.591"></a>
-<span class="sourceLineNo">592</span> public RestResponse setHtmlAside(Object value) {<a name="line.592"></a>
-<span class="sourceLineNo">593</span> properties.put(HtmlDocSerializerContext.HTMLDOC_aside, value);<a name="line.593"></a>
-<span class="sourceLineNo">594</span> return this;<a name="line.594"></a>
-<span class="sourceLineNo">595</span> }<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> * Sets the HTML footer section contents.<a name="line.598"></a>
-<span class="sourceLineNo">599</span> *<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * <p><a name="line.600"></a>
-<span class="sourceLineNo">601</span> * The format of this value is HTML.<a name="line.601"></a>
-<span class="sourceLineNo">602</span> *<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * <p><a name="line.603"></a>
-<span class="sourceLineNo">604</span> * The footer section typically floats on the bottom of the page.<a name="line.604"></a>
-<span class="sourceLineNo">605</span> *<a name="line.605"></a>
-<span class="sourceLineNo">606</span> * <p><a name="line.606"></a>
-<span class="sourceLineNo">607</span> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).<a name="line.607"></a>
-<span class="sourceLineNo">608</span> * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.608"></a>
-<span class="sourceLineNo">609</span> *<a name="line.609"></a>
-<span class="sourceLineNo">610</span> * <p><a name="line.610"></a>
-<span class="sourceLineNo">611</span> * A value of <js>"NONE"</js> can be used to force no value.<a name="line.611"></a>
-<span class="sourceLineNo">612</span> *<a name="line.612"></a>
-<span class="sourceLineNo">613</span> * <p><a name="line.613"></a>
-<span class="sourceLineNo">614</span> * This is the programmatic equivalent to the {@link HtmlDoc#footer() @HtmlDoc.footer()} annotation.<a name="line.614"></a>
-<span class="sourceLineNo">615</span> *<a name="line.615"></a>
-<span class="sourceLineNo">616</span> * @param value<a name="line.616"></a>
-<span class="sourceLineNo">617</span> * The HTML footer section contents.<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * Object will be converted to a string using {@link Object#toString()}.<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * <p><a name="line.619"></a>
-<span class="sourceLineNo">620</span> * <ul class='doctree'><a name="line.620"></a>
-<span class="sourceLineNo">621</span> * <li class='info'><a name="line.621"></a>
-<span class="sourceLineNo">622</span> * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to<a name="line.622"></a>
-<span class="sourceLineNo">623</span> * waste string concatenation cycles on non-HTML views.<a name="line.623"></a>
-<span class="sourceLineNo">624</span> * </ul><a name="line.624"></a>
-<span class="sourceLineNo">625</span> * @return This object (for method chaining).<a name="line.625"></a>
-<span class="sourceLineNo">626</span> */<a name="line.626"></a>
-<span class="sourceLineNo">627</span> public RestResponse setHtmlFooter(Object value) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> properties.put(HtmlDocSerializerContext.HTMLDOC_footer, value);<a name="line.628"></a>
-<span class="sourceLineNo">629</span> return this;<a name="line.629"></a>
-<span class="sourceLineNo">630</span> }<a name="line.630"></a>
-<span class="sourceLineNo">631</span><a name="line.631"></a>
-<span class="sourceLineNo">632</span> /**<a name="line.632"></a>
-<span class="sourceLineNo">633</span> * Sets the HTML CSS style section contents.<a name="line.633"></a>
-<span class="sourceLineNo">634</span> *<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * <p><a name="line.635"></a>
-<span class="sourceLineNo">636</span> * The format of this value is CSS.<a name="line.636"></a>
-<span class="sourceLineNo">637</span> *<a name="line.637"></a>
-<span class="sourceLineNo">638</span> * <p><a name="line.638"></a>
-<span class="sourceLineNo">639</span> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).<a name="line.639"></a>
-<span class="sourceLineNo">640</span> * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.640"></a>
-<span class="sourceLineNo">641</span> *<a name="line.641"></a>
-<span class="sourceLineNo">642</span> * <p><a name="line.642"></a>
-<span class="sourceLineNo">643</span> * A value of <js>"NONE"</js> can be used to force no value.<a name="line.643"></a>
-<span class="sourceLineNo">644</span> *<a name="line.644"></a>
-<span class="sourceLineNo">645</span> * <p><a name="line.645"></a>
-<span class="sourceLineNo">646</span> * This is the programmatic equivalent to the {@link HtmlDoc#style() @HtmlDoc.style()} annotation.<a name="line.646"></a>
-<span class="sourceLineNo">647</span> *<a name="line.647"></a>
-<span class="sourceLineNo">648</span> * @param value<a name="line.648"></a>
-<span class="sourceLineNo">649</span> * The HTML CSS style section contents.<a name="line.649"></a>
-<span class="sourceLineNo">650</span> * Object will be converted to a string using {@link Object#toString()}.<a name="line.650"></a>
-<span class="sourceLineNo">651</span> * <p><a name="line.651"></a>
-<span class="sourceLineNo">652</span> * <ul class='doctree'><a name="line.652"></a>
-<span class="sourceLineNo">653</span> * <li class='info'><a name="line.653"></a>
-<span class="sourceLineNo">654</span> * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to<a name="line.654"></a>
-<span class="sourceLineNo">655</span> * waste string concatenation cycles on non-HTML views.<a name="line.655"></a>
-<span class="sourceLineNo">656</span> * </ul><a name="line.656"></a>
-<span class="sourceLineNo">657</span> * @return This object (for method chaining).<a name="line.657"></a>
-<span class="sourceLineNo">658</span> */<a name="line.658"></a>
-<span class="sourceLineNo">659</span> public RestResponse setHtmlStyle(Object value) {<a name="line.659"></a>
-<span class="sourceLineNo">660</span> properties.put(HtmlDocSerializerContext.HTMLDOC_style, value);<a name="line.660"></a>
-<span class="sourceLineNo">661</span> return this;<a name="line.661"></a>
-<span class="sourceLineNo">662</span> }<a name="line.662"></a>
-<span class="sourceLineNo">663</span><a name="line.663"></a>
-<span class="sourceLineNo">664</span> /**<a name="line.664"></a>
-<span class="sourceLineNo">665</span> * Sets the CSS URL in the HTML CSS style section.<a name="line.665"></a>
-<span class="sourceLineNo">666</span> *<a name="line.666"></a>
-<span class="sourceLineNo">667</span> * <p><a name="line.667"></a>
-<span class="sourceLineNo">668</span> * The format of this value is a comma-delimited list of URLs.<a name="line.668"></a>
-<span class="sourceLineNo">669</span> *<a name="line.669"></a>
-<span class="sourceLineNo">670</span> * <p><a name="line.670"></a>
-<span class="sourceLineNo">671</span> * Specifies the URL to the stylesheet to add as a link in the style tag in the header.<a name="line.671"></a>
-<span class="sourceLineNo">672</span> *<a name="line.672"></a>
-<span class="sourceLineNo">673</span> * <p><a name="line.673"></a>
-<span class="sourceLineNo">674</span> * The format of this value is CSS.<a name="line.674"></a>
-<span class="sourceLineNo">675</span> *<a name="line.675"></a>
-<span class="sourceLineNo">676</span> * <p><a name="line.676"></a>
-<span class="sourceLineNo">677</span> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>) and can use URL protocols defined<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * by {@link UriResolver}.<a name="line.678"></a>
-<span class="sourceLineNo">679</span> * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.679"></a>
-<span class="sourceLineNo">680</span> *<a name="line.680"></a>
-<span class="sourceLineNo">681</span> * <p><a name="line.681"></a>
-<span class="sourceLineNo">682</span> * This is the programmatic equivalent to the {@link HtmlDoc#stylesheet() @HtmlDoc.stylesheet()} annotation.<a name="line.682"></a>
-<span class="sourceLineNo">683</span> *<a name="line.683"></a>
-<span class="sourceLineNo">684</span> * @param value<a name="line.684"></a>
-<span class="sourceLineNo">685</span> * The CSS URL in the HTML CSS style section.<a name="line.685"></a>
-<span class="sourceLineNo">686</span> * Object will be converted to a string using {@link Object#toString()}.<a name="line.686"></a>
-<span class="sourceLineNo">687</span> * <p><a name="line.687"></a>
-<span class="sourceLineNo">688</span> * <ul class='doctree'><a name="line.688"></a>
-<span class="sourceLineNo">689</span> * <li class='info'><a name="line.689"></a>
-<span class="sourceLineNo">690</span> * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to<a name="line.690"></a>
-<span class="sourceLineNo">691</span> * waste string concatenation cycles on non-HTML views.<a name="line.691"></a>
-<span class="sourceLineNo">692</span> * </ul><a name="line.692"></a>
-<span class="sourceLineNo">693</span> * @return This object (for method chaining).<a name="line.693"></a>
-<span class="sourceLineNo">694</span> */<a name="line.694"></a>
-<span class="sourceLineNo">695</span> public RestResponse setHtmlStylesheet(Object value) {<a name="line.695"></a>
-<span class="sourceLineNo">696</span> properties.put(HtmlDocSerializerContext.HTMLDOC_stylesheet, value);<a name="line.696"></a>
-<span class="sourceLineNo">697</span> return this;<a name="line.697"></a>
-<span class="sourceLineNo">698</span> }<a name="line.698"></a>
-<span class="sourceLineNo">699</span><a name="line.699"></a>
-<span class="sourceLineNo">700</span> /**<a name="line.700"></a>
-<span class="sourceLineNo">701</span> * Sets the HTML script section contents.<a name="line.701"></a>
-<span class="sourceLineNo">702</span> *<a name="line.702"></a>
-<span class="sourceLineNo">703</span> * <p><a name="line.703"></a>
-<span class="sourceLineNo">704</span> * The format of this value is Javascript.<a name="line.704"></a>
-<span class="sourceLineNo">705</span> *<a name="line.705"></a>
-<span class="sourceLineNo">706</span> * <p><a name="line.706"></a>
-<span class="sourceLineNo">707</span> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).<a name="line.707"></a>
-<span class="sourceLineNo">708</span> * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.708"></a>
-<span class="sourceLineNo">709</span> *<a name="line.709"></a>
-<span class="sourceLineNo">710</span> * <p><a name="line.710"></a>
-<span class="sourceLineNo">711</span> * A value of <js>"NONE"</js> can be used to force no value.<a name="line.711"></a>
-<span class="sourceLineNo">712</span> *<a name="line.712"></a>
-<span class="sourceLineNo">713</span> * <p><a name="line.713"></a>
-<span class="sourceLineNo">714</span> * This is the programmatic equivalent to the {@link HtmlDoc#script() @HtmlDoc.script()} annotation.<a name="line.714"></a>
-<span class="sourceLineNo">715</span> *<a name="line.715"></a>
-<span class="sourceLineNo">716</span> * @param value<a name="line.716"></a>
-<span class="sourceLineNo">717</span> * The HTML script section contents.<a name="line.717"></a>
-<span class="sourceLineNo">718</span> * Object will be converted to a string using {@link Object#toString()}.<a name="line.718"></a>
-<span class="sourceLineNo">719</span> * <p><a name="line.719"></a>
-<span class="sourceLineNo">720</span> * <ul class='doctree'><a name="line.720"></a>
-<span class="sourceLineNo">721</span> * <li class='info'><a name="line.721"></a>
-<span class="sourceLineNo">722</span> * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to<a name="line.722"></a>
-<span class="sourceLineNo">723</span> * waste string concatenation cycles on non-HTML views.<a name="line.723"></a>
-<span class="sourceLineNo">724</span> * </ul><a name="line.724"></a>
-<span class="sourceLineNo">725</span> * @return This object (for method chaining).<a name="line.725"></a>
-<span class="sourceLineNo">726</span> */<a name="line.726"></a>
-<span class="sourceLineNo">727</span> public RestResponse setHtmlScript(Object value) {<a name="line.727"></a>
-<span class="sourceLineNo">728</span> properties.put(HtmlDocSerializerContext.HTMLDOC_script, value);<a name="line.728"></a>
-<span class="sourceLineNo">729</span> return this;<a name="line.729"></a>
-<span class="sourceLineNo">730</span> }<a name="line.730"></a>
-<span class="sourceLineNo">731</span><a name="line.731"></a>
-<span class="sourceLineNo">732</span> /**<a name="line.732"></a>
-<span class="sourceLineNo">733</span> * Shorthand method for forcing the rendered HTML content to be no-wrap.<a name="line.733"></a>
-<span class="sourceLineNo">734</span> *<a name="line.734"></a>
-<span class="sourceLineNo">735</span> * <p><a name="line.735"></a>
-<span class="sourceLineNo">736</span> * This is the programmatic equivalent to the {@link HtmlDoc#nowrap() @HtmlDoc.nowrap()} annotation.<a name="line.736"></a>
-<span class="sourceLineNo">737</span> *<a name="line.737"></a>
-<span class="sourceLineNo">738</span> * @param value The new nowrap setting.<a name="line.738"></a>
-<span class="sourceLineNo">739</span> * @return This object (for method chaining).<a name="line.739"></a>
-<span class="sourceLineNo">740</span> */<a name="line.740"></a>
-<span class="sourceLineNo">741</span> public RestResponse setHtmlNoWrap(boolean value) {<a name="line.741"></a>
-<span class="sourceLineNo">742</span> properties.put(HtmlDocSerializerContext.HTMLDOC_nowrap, value);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> return this;<a name="line.743"></a>
-<span class="sourceLineNo">744</span> }<a name="line.744"></a>
-<span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span> /**<a name="line.746"></a>
-<span class="sourceLineNo">747</span> * Specifies the text to display when serializing an empty array or collection.<a name="line.747"></a>
-<span class="sourceLineNo">748</span> *<a name="line.748"></a>
-<span class="sourceLineNo">749</span> * <p><a name="line.749"></a>
-<span class="sourceLineNo">750</span> * This is the programmatic equivalent to the {@link HtmlDoc#noResultsMessage() @HtmlDoc.noResultsMessage()}<a name="line.750"></a>
-<span class="sourceLineNo">751</span> * annotation.<a name="line.751"></a>
-<span class="sourceLineNo">752</span> *<a name="line.752"></a>
-<span class="sourceLineNo">753</span> * @param value The text to display when serializing an empty array or collection.<a name="line.753"></a>
-<span class="sourceLineNo">754</span> * @return This object (for method chaining).<a name="line.754"></a>
-<span class="sourceLineNo">755</span> */<a name="line.755"></a>
-<span class="sourceLineNo">756</span> public RestResponse setHtmlNoResultsMessage(Object value) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span> properties.put(HtmlDocSerializerContext.HTMLDOC_noResultsMessage, value);<a name="line.757"></a>
-<span class="sourceLineNo">758</span> return this;<a name="line.758"></a>
-<span class="sourceLineNo">759</span> }<a name="line.759"></a>
-<span class="sourceLineNo">760</span><a name="line.760"></a>
-<span class="sourceLineNo">761</span> /**<a name="line.761"></a>
-<span class="sourceLineNo">762</span> * Specifies the template class to use for rendering the HTML page.<a name="line.762"></a>
-<span class="sourceLineNo">763</span> *<a name="line.763"></a>
-<span class="sourceLineNo">764</span> * <p><a name="line.764"></a>
-<span class="sourceLineNo">765</span> * By default, uses {@link HtmlDocTemplateBasic} to render the contents, although you can provide your own custom<a name="line.765"></a>
-<span class="sourceLineNo">766</span> * renderer or subclasses from the basic class to have full control over how the page is rendered.<a name="line.766"></a>
-<span class="sourceLineNo">767</span> *<a name="line.767"></a>
-<span class="sourceLineNo">768</span> * <p><a name="line.768"></a>
-<span class="sourceLineNo">769</span> * This is the programmatic equivalent to the {@link HtmlDoc#template() @HtmlDoc.template()} annotation.<a name="line.769"></a>
-<span class="sourceLineNo">770</span> *<a name="line.770"></a>
-<span class="sourceLineNo">771</span> * @param value The HTML page template to use to render the HTML page.<a name="line.771"></a>
-<span class="sourceLineNo">772</span> * @return This object (for method chaining).<a name="line.772"></a>
-<span class="sourceLineNo">773</span> */<a name="line.773"></a>
-<span class="sourceLineNo">774</span> public RestResponse setHtmlTemplate(Class<? extends HtmlDocTemplate> value) {<a name="line.774"></a>
-<span class="sourceLineNo">775</span> properties.put(HtmlDocSerializerContext.HTMLDOC_template, value);<a name="line.775"></a>
-<span class="sourceLineNo">776</span> return this;<a name="line.776"></a>
-<span class="sourceLineNo">777</span> }<a name="line.777"></a>
-<span class="sourceLineNo">778</span><a name="line.778"></a>
-<span class="sourceLineNo">779</span> /**<a name="line.779"></a>
-<span class="sourceLineNo">780</span> * Specifies the template class to use for rendering the HTML page.<a name="line.780"></a>
-<span class="sourceLineNo">781</span> *<a name="line.781"></a>
-<span class="sourceLineNo">782</span> * <p><a name="line.782"></a>
-<span class="sourceLineNo">783</span> * By default, uses {@link HtmlDocTemplateBasic} to render the contents, although you can provide your own custom<a name="line.783"></a>
-<span class="sourceLineNo">784</span> * renderer or subclasses from the basic class to have full control over how the page is rendered.<a name="line.784"></a>
-<span class="sourceLineNo">785</span> *<a name="line.785"></a>
-<span class="sourceLineNo">786</span> * <p><a name="line.786"></a>
-<span class="sourceLineNo">787</span> * This is the programmatic equivalent to the {@link HtmlDoc#template() @HtmlDoc.template()} annotation.<a name="line.787"></a>
-<span class="sourceLineNo">788</span> *<a name="line.788"></a>
-<span class="sourceLineNo">789</span> * @param value The HTML page template to use to render the HTML page.<a name="line.789"></a>
-<span class="sourceLineNo">790</span> * @return This object (for method chaining).<a name="line.790"></a>
-<span class="sourceLineNo">791</span> */<a name="line.791"></a>
-<span class="sourceLineNo">792</span> public RestResponse setHtmlTemplate(HtmlDocTemplate value) {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> properties.put(HtmlDocSerializerContext.HTMLDOC_template, value);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> return this;<a name="line.794"></a>
-<span class="sourceLineNo">795</span> }<a name="line.795"></a>
-<span class="sourceLineNo">796</span><a name="line.796"></a>
-<span class="sourceLineNo">797</span> @Override /* ServletResponse */<a name="line.797"></a>
-<span class="sourceLineNo">798</span> public void flushBuffer() throws IOException {<a name="line.798"></a>
-<span class="sourceLineNo">799</span> if (w != null)<a name="line.799"></a>
-<span class="sourceLineNo">800</span> w.flush();<a name="line.800"></a>
-<span class="sourceLineNo">801</span> if (os != null)<a name="line.801"></a>
-<span class="sourceLineNo">802</span> os.flush();<a name="line.802"></a>
-<span class="sourceLineNo">803</span> super.flushBuffer();<a name="line.803"></a>
-<span class="sourceLineNo">804</span> }<a name="line.804"></a>
-<span class="sourceLineNo">805</span>}<a name="line.805"></a>
+<span class="sourceLineNo">026</span>import org.apache.juneau.json.*;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.juneau.parser.*;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.juneau.rest.annotation.*;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.juneau.serializer.*;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.juneau.urlencoding.*;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.juneau.utils.*;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.juneau.xml.*;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * Represents an HTTP response for a REST resource.<a name="line.35"></a>
+<span class="sourceLineNo">036</span> *<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <p><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * Essentially an extended {@link HttpServletResponse} with some special convenience methods that allow you to easily<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * output POJOs as responses.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <p><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * Since this class extends {@link HttpServletResponse}, developers are free to use these convenience methods, or<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * revert to using lower level methods like any other servlet response.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <h5 class='section'>Example:</h5><a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <p class='bcode'><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <ja>@RestMethod</ja>(name=<js>"GET"</js>)<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <jk>public void</jk> doGet(RestRequest req, RestResponse res) {<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * res.setPageTitle(<js>"My title"</js>)<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * .setOutput(<js>"Simple string response"</js>);<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * }<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * </p><a name="line.52"></a>
+<span class="sourceLineNo">053</span> *<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <p><a name="line.54"></a>
+<span class="sourceLineNo">055</span> * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * class.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> */<a name="line.57"></a>
+<span class="sourceLineNo">058</span>public final class RestResponse extends HttpServletResponseWrapper {<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span> private final RestRequest request;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> private Object output; // The POJO being sent to the output.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> private boolean isNullOutput; // The output is null (as opposed to not being set at all)<a name="line.62"></a>
+<span class="sourceLineNo">063</span> private ObjectMap properties; // Response properties<a name="line.63"></a>
+<span class="sourceLineNo">064</span> SerializerGroup serializerGroup;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> UrlEncodingSerializer urlEncodingSerializer; // The serializer used to convert arguments passed into Redirect objects.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> private EncoderGroup encoders;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private ServletOutputStream os;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> private PrintWriter w;<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> * Constructor.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> */<a name="line.72"></a>
+<span class="sourceLineNo">073</span> RestResponse(RestContext context, RestRequest req, HttpServletResponse res) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> super(res);<a name="line.74"></a>
+<span class="sourceLineNo">075</span> this.request = req;<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span> for (Map.Entry<String,Object> e : context.getDefaultResponseHeaders().entrySet())<a name="line.77"></a>
+<span class="sourceLineNo">078</span> setHeader(e.getKey(), e.getValue().toString());<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> try {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> String passThroughHeaders = req.getHeader("x-response-headers");<a name="line.81"></a>
+<span class="sourceLineNo">082</span> if (passThroughHeaders != null) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> PartParser p = context.getUrlEncodingParser();<a name="line.83"></a>
+<span class="sourceLineNo">084</span> ObjectMap m = p.parse(PartType.HEADER, passThroughHeaders, context.getBeanContext().getClassMeta(ObjectMap.class));<a name="line.84"></a>
+<span class="sourceLineNo">085</span> for (Map.Entry<String,Object> e : m.entrySet())<a name="line.85"></a>
+<span class="sourceLineNo">086</span> setHeader(e.getKey(), e.getValue().toString());<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span> } catch (Exception e1) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> throw new RestException(SC_BAD_REQUEST, "Invalid format for header 'x-response-headers'. Must be in URL-encoded format.").initCause(e1);<a name="line.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> /*<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> */<a name="line.95"></a>
+<span class="sourceLineNo">096</span> @SuppressWarnings("hiding")<a name="line.96"></a>
+<span class="sourceLineNo">097</span> final void init(ObjectMap properties, String defaultCharset, SerializerGroup mSerializers, UrlEncodingSerializer mUrlEncodingSerializer, EncoderGroup encoders) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> this.properties = properties;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> this.serializerGroup = mSerializers;<a name="line.99"></a>
+<span class="sourceLineNo">100</span> this.urlEncodingSerializer = mUrlEncodingSerializer;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> this.encoders = encoders;<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> // Find acceptable charset<a name="line.103"></a>
+<span class="sourceLineNo">104</span> String h = request.getHeader("accept-charset");<a name="line.104"></a>
+<span class="sourceLineNo">105</span> String charset = null;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> if (h == null)<a name="line.106"></a>
+<span class="sourceLineNo">107</span> charset = defaultCharset;<a name="line.107"></a>
+<span class="sourceLineNo">108</span> else for (MediaTypeRange r : MediaTypeRange.parse(h)) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> if (r.getQValue() > 0) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> MediaType mt = r.getMediaType();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> if (mt.getType().equals("*"))<a name="line.111"></a>
+<span class="sourceLineNo">112</span> charset = defaultCharset;<a name="line.112"></a>
+<span class="sourceLineNo">113</span> else if (Charset.isSupported(mt.getType()))<a name="line.113"></a>
+<span class="sourceLineNo">114</span> charset = mt.getType();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> if (charset != null)<a name="line.115"></a>
+<span class="sourceLineNo">116</span> break;<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> if (charset == null)<a name="line.120"></a>
+<span class="sourceLineNo">121</span> throw new RestException(SC_NOT_ACCEPTABLE, "No supported charsets in header ''Accept-Charset'': ''{0}''", request.getHeader("Accept-Charset"));<a name="line.121"></a>
+<span class="sourceLineNo">122</span> super.setCharacterEncoding(charset);<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> /**<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * Gets the serializer group for the response.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> *<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @return The serializer group for the response.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public SerializerGroup getSerializerGroup() {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> return serializerGroup;<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> * Returns the media types that are valid for <code>Accept</code> headers on the request.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> *<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * @return The set of media types registered in the parser group of this request.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> */<a name="line.138"></a>
+<span class="sourceLineNo">139</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> return serializerGroup.getSupportedMediaTypes();<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 codings that are valid for <code>Accept-Encoding</code> and <code>Content-Encoding</code> headers on<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * the request.<a name="line.145"></a>
+<span class="sourceLineNo">146</span> *<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * @return The set of media types registered in the parser group of this request.<a name="l
<TRUNCATED>
[13/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html b/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html
deleted file mode 100644
index 62f173e..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html
+++ /dev/null
@@ -1,351 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>RestServletJenaGroupDefault (Apache Juneau (incubating) 6.3.2-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="RestServletJenaGroupDefault (Apache Juneau (incubating) 6.3.2-incubating-SNAPSHOT)";
- }
- }
- catch(err) {
- }
-//-->
-var methods = {"i0":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/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">Prev Class</span></a></li>
-<li>Next Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" target="_top">Frames</a></li>
-<li><a href="RestServletJenaGroupDefault.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_top");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li>Field | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!-- -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau.rest.jena</div>
-<h2 title="Class RestServletJenaGroupDefault" class="title">Class RestServletJenaGroupDefault</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/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet">javax.servlet.GenericServlet</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http">javax.servlet.http.HttpServlet</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServlet</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">org.apache.juneau.rest.jena.RestServletJenaDefault</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.rest.jena.RestServletJenaGroupDefault</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</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/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a></dd>
-</dl>
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../../org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice">ResourceJenaGroup</a></dd>
-</dl>
-<hr>
-<br>
-<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>
-public abstract class <a href="../../../../../src-html/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html#line.30">RestServletJenaGroupDefault</a>
-extends <a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a></pre>
-<div class="block">Specialized subclass of <a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> for showing "group" pages.
-
- <p>
- Group pages consist of simple lists of child resource URLs and their labels.
- They're meant to be used as jumping-off points for child resources.
-
- <p>
- Child resources are specified using the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#children--"><code>RestResource.children()</code></a> annotation.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../serialized-form.html#org.apache.juneau.rest.jena.RestServletJenaGroupDefault">Serialized Form</a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!-- -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html#RestServletJenaGroupDefault--">RestServletJenaGroupDefault</a></span>()</code> </td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!-- -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/labels/ChildResourceDescriptions.html" title="class in org.apache.juneau.rest.labels">ChildResourceDescriptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html#getChildren-org.apache.juneau.rest.RestRequest-">getChildren</a></span>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req)</code>
-<div class="block">[GET /] - Get child resources.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.jena.RestServletJenaDefault">
-<!-- -->
-</a>
-<h3>Methods inherited from class org.apache.juneau.rest.jena.<a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a></h3>
-<code><a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServlet">
-<!-- -->
-</a>
-<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></h3>
-<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/junea
u/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
-<!-- -->
-</a>
-<h3>Methods inherited from class javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http">HttpServlet</a></h3>
-<code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doDelete-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doDelete</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doGet-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doGet</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doHead-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doHead</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doOptions-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doOptions</a>, <a
href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doPost-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doPost</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doPut-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doPut</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#doTrace-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-" title="class or interface in javax.servlet.http">doTrace</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true#getLastModified-javax.servlet.http.HttpServletRequest-" title="class or interface in javax.servlet.http">getLastModified</a>, <a href="http://docs.oracle.com/javaee/5/
api/javax/servlet/http/HttpServlet.html?is-external=true#service-javax.servlet.ServletRequest-javax.servlet.ServletResponse-" title="class or interface in javax.servlet.http">service</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.GenericServlet">
-<!-- -->
-</a>
-<h3>Methods inherited from class javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet">GenericServlet</a></h3>
-<code><a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getInitParameter-java.lang.String-" title="class or interface in javax.servlet">getInitParameter</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getInitParameterNames--" title="class or interface in javax.servlet">getInitParameterNames</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletContext--" title="class or interface in javax.servlet">getServletContext</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletInfo--" title="class or interface in javax.servlet">getServletInfo</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#getServletName--" title="class or interface in javax.servlet">getServletName</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Ge
nericServlet.html?is-external=true#init--" title="class or interface in javax.servlet">init</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#log-java.lang.String-" title="class or interface in javax.servlet">log</a>, <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#log-java.lang.String-java.lang.Throwable-" title="class or interface in javax.servlet">log</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 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="RestServletJenaGroupDefault--">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>RestServletJenaGroupDefault</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html#line.30">RestServletJenaGroupDefault</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="getChildren-org.apache.juneau.rest.RestRequest-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getChildren</h4>
-<pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="GET",
- <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/",
- <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Child resources")
-public <a href="../../../../../org/apache/juneau/rest/labels/ChildResourceDescriptions.html" title="class in org.apache.juneau.rest.labels">ChildResourceDescriptions</a> <a href="../../../../../src-html/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html#line.40">getChildren</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req)</pre>
-<div class="block">[GET /] - Get child resources.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The HTTP request</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The bean containing links to the child resources.</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/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">Prev Class</span></a></li>
-<li>Next Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" target="_top">Frames</a></li>
-<li><a href="RestServletJenaGroupDefault.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_bottom");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li>Field | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jena/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jena/package-frame.html b/content/site/apidocs/org/apache/juneau/rest/jena/package-frame.html
deleted file mode 100644
index 9b20712..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/jena/package-frame.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.juneau.rest.jena (Apache Juneau (incubating) 6.3.2-incubating-SNAPSHOT)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../../../../../org/apache/juneau/rest/jena/package-summary.html" target="classFrame">org.apache.juneau.rest.jena</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena" target="classFrame">RestServletJenaDefault</a></li>
-<li><a href="RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena" target="classFrame">RestServletJenaGroupDefault</a></li>
-</ul>
-</div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jena/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jena/package-summary.html b/content/site/apidocs/org/apache/juneau/rest/jena/package-summary.html
deleted file mode 100644
index 718cc1d..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/jena/package-summary.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.juneau.rest.jena (Apache Juneau (incubating) 6.3.2-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="org.apache.juneau.rest.jena (Apache Juneau (incubating) 6.3.2-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 class="navBarCell1Rev">Package</li>
-<li>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/rest/jaxrs/rdf/package-summary.html">Prev Package</a></li>
-<li><a href="../../../../../org/apache/juneau/rest/labels/package-summary.html">Next Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/jena/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_top");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!-- -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package org.apache.juneau.rest.jena</h1>
-<div class="docSummary">
-<div class="block">RET servlet API with Jena components</div>
-</div>
-<p>See: <a href="#package.description">Description</a></p>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a></td>
-<td class="colLast">
-<div class="block">Subclass of <a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> with default sets of serializers and parsers that include RDF support.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaGroupDefault</a></td>
-<td class="colLast">
-<div class="block">Specialized subclass of <a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> for showing "group" pages.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-<a name="package.description">
-<!-- -->
-</a>
-<h2 title="Package org.apache.juneau.rest.jena Description">Package org.apache.juneau.rest.jena Description</h2>
-<div class="block"><p>RET servlet API with Jena components</p>
-
-<p>
- Contains predefined instances of REST API classes with Jena support included.
-</p></div>
-</div>
-<!-- ======= 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 class="navBarCell1Rev">Package</li>
-<li>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/rest/jaxrs/rdf/package-summary.html">Prev Package</a></li>
-<li><a href="../../../../../org/apache/juneau/rest/labels/package-summary.html">Next Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/jena/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_bottom");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/jena/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jena/package-tree.html b/content/site/apidocs/org/apache/juneau/rest/jena/package-tree.html
deleted file mode 100644
index 32d7338..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/jena/package-tree.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.juneau.rest.jena Class Hierarchy (Apache Juneau (incubating) 6.3.2-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="org.apache.juneau.rest.jena Class Hierarchy (Apache Juneau (incubating) 6.3.2-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</li>
-<li class="navBarCell1Rev">Tree</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/rest/jaxrs/rdf/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/juneau/rest/labels/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/jena/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_top");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!-- -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package org.apache.juneau.rest.jena</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../../../../../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">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"><span class="typeNameLink">Object</span></a>
-<ul>
-<li type="circle">javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet"><span class="typeNameLink">GenericServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a>)
-<ul>
-<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a>
-<ul>
-<li type="circle">org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServlet</span></a>
-<ul>
-<li type="circle">org.apache.juneau.rest.jena.<a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">RestServletJenaDefault</span></a>
-<ul>
-<li type="circle">org.apache.juneau.rest.jena.<a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">RestServletJenaGroupDefault</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= 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</li>
-<li class="navBarCell1Rev">Tree</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/rest/jaxrs/rdf/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/juneau/rest/labels/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/jena/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_bottom");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/labels/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/labels/package-summary.html b/content/site/apidocs/org/apache/juneau/rest/labels/package-summary.html
index b32ffd0..126f31b 100644
--- a/content/site/apidocs/org/apache/juneau/rest/labels/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/rest/labels/package-summary.html
@@ -42,7 +42,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/jena/package-summary.html">Prev Package</a></li>
+<li><a href="../../../../../org/apache/juneau/rest/jaxrs/package-summary.html">Prev Package</a></li>
<li><a href="../../../../../org/apache/juneau/rest/matchers/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
@@ -145,7 +145,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/jena/package-summary.html">Prev Package</a></li>
+<li><a href="../../../../../org/apache/juneau/rest/jaxrs/package-summary.html">Prev Package</a></li>
<li><a href="../../../../../org/apache/juneau/rest/matchers/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/labels/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/labels/package-tree.html b/content/site/apidocs/org/apache/juneau/rest/labels/package-tree.html
index ce0bdf4..9903d80 100644
--- a/content/site/apidocs/org/apache/juneau/rest/labels/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/rest/labels/package-tree.html
@@ -42,7 +42,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/jena/package-tree.html">Prev</a></li>
+<li><a href="../../../../../org/apache/juneau/rest/jaxrs/package-tree.html">Prev</a></li>
<li><a href="../../../../../org/apache/juneau/rest/matchers/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
@@ -128,7 +128,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/jena/package-tree.html">Prev</a></li>
+<li><a href="../../../../../org/apache/juneau/rest/jaxrs/package-tree.html">Prev</a></li>
<li><a href="../../../../../org/apache/juneau/rest/matchers/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/rest/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/package-summary.html b/content/site/apidocs/org/apache/juneau/rest/package-summary.html
index 8d3d04b..e1b36f4 100644
--- a/content/site/apidocs/org/apache/juneau/rest/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/rest/package-summary.html
@@ -686,18 +686,6 @@
<br>REST servlet for implementing remoteable proxy interfaces.
</ul>
</li>
- <li class='jac'>
- <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>org.apache.juneau.rest.jena.RestServletJenaDefault</code></a>
- <br>Same as <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a>, but adds RDF support.
- <ul>
- <li class='jac'>
- <a href="../../../../org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice"><code>org.apache.juneau.microservice.ResourceJena</code></a>
- <br>Subclass intended to be used in REST microservices.
- <li class='jac'>
- <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena"><code>org.apache.juneau.rest.jena.RestServletJenaGroupDefault</code></a>
- <br>Same as <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest"><code>RestServletGroupDefault</code></a>, but adds RDF support.
- </ul>
- </li>
</ul>
</li>
</ul>
@@ -868,8 +856,6 @@
<ul class='doctree'>
<li class='jac'>
<a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a>
- <li class='jac'>
- <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a>
</ul>
<!-- ======================================================================================================== -->
@@ -4079,7 +4065,7 @@
* [OPTIONS /*]
* View resource options
*/</jd>
- <ja>@Override</ja> /* RestServletJenaDefault */
+ <ja>@Override</ja> /* RestServletDefault */
<ja>@RestMethod</ja>(name=<js>"OPTIONS"</js>, path=<js>"/*"</js>)
<jk>public</jk> Swagger getOptions(RestRequest req) {
<jk>return</jk> req.getSwagger();
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/svl/DefaultingVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/DefaultingVar.html b/content/site/apidocs/org/apache/juneau/svl/DefaultingVar.html
index 724dc22..27f5791 100644
--- a/content/site/apidocs/org/apache/juneau/svl/DefaultingVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/DefaultingVar.html
@@ -118,7 +118,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a>, <a href="../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars">ConfigFileVar</a>, <a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars">EnvVariablesVar</a>, <a href="../../../../org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars">FileVar</a>, <a href="../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars">ManifestFileVar</a>, <a href="../../../../org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl">MapVar</a>, <a href="../../../../org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars">RequestVar</a>, <a href="../../../../org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars
">ServletInitParamVar</a></dd>
+<dd><a href="../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a>, <a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a>, <a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars">EnvVariablesVar</a>, <a href="../../../../org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars">FileVar</a>, <a href="../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars">ManifestFileVar</a>, <a href="../../../../org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl">MapVar</a>, <a href="../../../../org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars">RequestVar</a>, <a href="../../../../org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars">ServletI
nitParamVar</a></dd>
</dl>
<hr>
<br>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/svl/VarResolver.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/VarResolver.html b/content/site/apidocs/org/apache/juneau/svl/VarResolver.html
index 4c05bdb..49bddcc 100644
--- a/content/site/apidocs/org/apache/juneau/svl/VarResolver.html
+++ b/content/site/apidocs/org/apache/juneau/svl/VarResolver.html
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.102">VarResolver</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.101">VarResolver</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">Utility class for resolving variables of the form <js>"$X{key}"</js> in strings.
@@ -149,7 +149,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
Var resolvers can have zero or more context objects associated with them.
<p>
- Context objects are arbitrary objects associated with this var resolver, such as a <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.
+ Context objects are arbitrary objects associated with this var resolver, such as a <code>ConfigFile</code> object.
They can be any class type.
<p>
@@ -317,7 +317,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>DEFAULT</h4>
-<pre>public static final <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.117">DEFAULT</a></pre>
+<pre>public static final <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.116">DEFAULT</a></pre>
<div class="block">Default string variable resolver with support for system properties and environment variables:
<ul>
@@ -347,7 +347,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>VarResolver</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.127">VarResolver</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a>>[] vars,
+<pre>public <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.126">VarResolver</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a>>[] vars,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> contextObjects)</pre>
<div class="block">Constructor.</div>
<dl>
@@ -371,7 +371,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>builder</h4>
-<pre>public <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.136">builder</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.135">builder</a>()</pre>
<div class="block">Returns a new builder object using the settings in this resolver as a base.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -385,7 +385,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getContext</h4>
-<pre>public <a href="../../../../org/apache/juneau/svl/VarResolverContext.html" title="class in org.apache.juneau.svl">VarResolverContext</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.147">getContext</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/svl/VarResolverContext.html" title="class in org.apache.juneau.svl">VarResolverContext</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.146">getContext</a>()</pre>
<div class="block">Returns the read-only properties on this variable resolver.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -399,7 +399,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.160">createSession</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.159">createSession</a>()</pre>
<div class="block">Creates a new resolver session with no session objects.
<p>
@@ -417,7 +417,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.170">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> sessionObjects)</pre>
+<pre>public <a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.169">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> sessionObjects)</pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession--"><code>createSession()</code></a> except allows you to specify session objects as a map.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -433,7 +433,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>resolve</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.185">resolve</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> s)</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.184">resolve</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> s)</pre>
<div class="block">Resolve variables in the specified string.
<p>
@@ -454,7 +454,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>resolveTo</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.201">resolveTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> s,
+<pre>public void <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.200">resolveTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> s,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Resolve variables in the specified string and sends the results to the specified writer.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/svl/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/package-summary.html b/content/site/apidocs/org/apache/juneau/svl/package-summary.html
index 03e57ec..3e25c16 100644
--- a/content/site/apidocs/org/apache/juneau/svl/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/svl/package-summary.html
@@ -277,7 +277,7 @@
<a href="../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><code>ArgsVar</code></a>
- Resolves variables from an <a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a> object.
<li class='jc'>
- <a href="../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><code>ConfigFileVar</code></a>
+ <code>ConfigFileVar</code>
- Resolves variables from a <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.
<li class='jc'>
<a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a>
@@ -343,7 +343,7 @@
Some <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Vars</code></a> rely on the existence of some other object, such as an
<a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a> object
for <a href="../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><code>ArgsVar</code></a> or a <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> for a
- <a href="../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><code>ConfigFileVar</code></a>.
+ <code>ConfigFileVar</code>.
These object dependencies are made by setting context objects on the var resolver.
</p>
<p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
index 600a445..f36a9d8 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li>Prev Class</li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/ArgsVar.html" target="_top">Frames</a></li>
@@ -372,7 +372,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
<div class="subNav">
<ul class="navList">
<li>Prev Class</li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/ArgsVar.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/svl/vars/ConfigFileVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/ConfigFileVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/ConfigFileVar.html
deleted file mode 100644
index fca77c1..0000000
--- a/content/site/apidocs/org/apache/juneau/svl/vars/ConfigFileVar.html
+++ /dev/null
@@ -1,418 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ConfigFileVar (Apache Juneau (incubating) 6.3.2-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="ConfigFileVar (Apache Juneau (incubating) 6.3.2-incubating-SNAPSHOT)";
- }
- }
- catch(err) {
- }
-//-->
-var methods = {"i0":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/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/ConfigFileVar.html" target="_top">Frames</a></li>
-<li><a href="ConfigFileVar.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_top");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li><a href="#field.summary">Field</a> | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li><a href="#field.detail">Field</a> | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!-- -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau.svl.vars</div>
-<h2 title="Class ConfigFileVar" class="title">Class ConfigFileVar</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="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.Var</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.SimpleVar</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.DefaultingVar</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.svl.vars.ConfigFileVar</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</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/svl/vars/ConfigFileVar.html#line.49">ConfigFileVar</a>
-extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></pre>
-<div class="block">Config file variable resolver.
-
- <p>
- The format for this var is <js>"$C{key[,defaultValue]}"</js>.
- See <a href="../../../../../org/apache/juneau/ini/ConfigFile.html#getString-java.lang.String-"><code>ConfigFile.getString(String)</code></a> for the format of the key.
-
- <p>
- This variable resolver requires that a <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object be set as a context object on the resolver or a
- session object on the resolver session.
-
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
- <jc>// Create a config file object.</jc>
- ConfigFile configFile = new ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>);
-
- <jc>// Create a variable resolver that resolves config file entries (e.g. "$C{MySection/myKey}")</jc>
- VarResolver r = <jk>new</jk> VarResolver().addVars(ConfigVar.<js>class</js>)
- .addContextObject(<jsf>SESSION_config</jsf>, configFile);
-
- <jc>// Use it!</jc>
- System.<jsf>out</jsf>.println(r.resolve(<js>"Value for myKey in section MySection is $C{MySection/myKey}"</js>));
- </p>
-
- <p>
- Since this is a <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>, any variables contained in the result will be recursively resolved.
- Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a>,
-<a href="../../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!-- -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="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/svl/vars/ConfigFileVar.html#NAME">NAME</a></span></code>
-<div class="block">The name of this variable.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ConfigFileVar.html#SESSION_config">SESSION_config</a></span></code>
-<div class="block">The name of the session or context object that identifies the <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!-- -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ConfigFileVar.html#ConfigFileVar--">ConfigFileVar</a></span>()</code>
-<div class="block">Constructor.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!-- -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="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/svl/vars/ConfigFileVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve</a></span>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> session,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)</code>
-<div class="block">The interface that needs to be implemented for subclasses of <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.svl.DefaultingVar">
-<!-- -->
-</a>
-<h3>Methods inherited from class org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></h3>
-<code><a href="../../../../../org/apache/juneau/svl/DefaultingVar.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">doResolve</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.svl.SimpleVar">
-<!-- -->
-</a>
-<h3>Methods inherited from class org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl">SimpleVar</a></h3>
-<code><a href="../../../../../org/apache/juneau/svl/SimpleVar.html#resolveTo-org.apache.juneau.svl.VarResolverSession-java.io.Writer-java.lang.String-">resolveTo</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.svl.Var">
-<!-- -->
-</a>
-<h3>Methods inherited from class org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></h3>
-<code><a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</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 java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang
/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!-- -->
-</a>
-<h3>Field Detail</h3>
-<a name="SESSION_config">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>SESSION_config</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/ConfigFileVar.html#line.54">SESSION_config</a></pre>
-<div class="block">The name of the session or context object that identifies the <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.apache.juneau.svl.vars.ConfigFileVar.SESSION_config">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="NAME">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>NAME</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/ConfigFileVar.html#line.57">NAME</a></pre>
-<div class="block">The name of this variable.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.apache.juneau.svl.vars.ConfigFileVar.NAME">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!-- -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ConfigFileVar--">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ConfigFileVar</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/svl/vars/ConfigFileVar.html#line.62">ConfigFileVar</a>()</pre>
-<div class="block">Constructor.</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!-- -->
-</a>
-<h3>Method Detail</h3>
-<a name="resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>resolve</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/ConfigFileVar.html#line.67">resolve</a>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> session,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">Var</a></code></span></div>
-<div class="block">The interface that needs to be implemented for subclasses of <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve</a></code> in class <code><a href="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The session object used for a single instance of a var resolution.</dd>
-<dd><code>key</code> - The inside argument of the variable.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The resolved 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/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/ConfigFileVar.html" target="_top">Frames</a></li>
-<li><a href="ConfigFileVar.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_bottom");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li><a href="#field.summary">Field</a> | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li><a href="#field.detail">Field</a> | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html
index 82b1638..18adfc0 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -342,7 +342,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/svl/vars/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/package-frame.html b/content/site/apidocs/org/apache/juneau/svl/vars/package-frame.html
index fa5b1ee..cbe0db4 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/package-frame.html
@@ -14,7 +14,6 @@
<h2 title="Classes">Classes</h2>
<ul title="Classes">
<li><a href="ArgsVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">ArgsVar</a></li>
-<li><a href="ConfigFileVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">ConfigFileVar</a></li>
<li><a href="EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">EnvVariablesVar</a></li>
<li><a href="IfVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">IfVar</a></li>
<li><a href="ManifestFileVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">ManifestFileVar</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/svl/vars/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/package-summary.html b/content/site/apidocs/org/apache/juneau/svl/vars/package-summary.html
index 5205374..41bf4c9 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/package-summary.html
@@ -92,36 +92,30 @@
</td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars">ConfigFileVar</a></td>
-<td class="colLast">
-<div class="block">Config file variable resolver.</div>
-</td>
-</tr>
-<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars">EnvVariablesVar</a></td>
<td class="colLast">
<div class="block">Environment variable variable resolver.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars">IfVar</a></td>
<td class="colLast">
<div class="block">A basic if-else logic variable resolver.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars">ManifestFileVar</a></td>
<td class="colLast">
<div class="block">Manifest file entries variable resolver.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars">SwitchVar</a></td>
<td class="colLast">
<div class="block">A basic switch/case logic variable resolver.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars">SystemPropertiesVar</a></td>
<td class="colLast">
<div class="block">System property variable resolver.</div>
[12/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html b/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
index 74dfa5e..47f0cd6 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
@@ -87,7 +87,6 @@
<li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">DefaultingVar</span></a>
<ul>
<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ArgsVar</span></a></li>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ConfigFileVar</span></a></li>
<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">EnvVariablesVar</span></a></li>
<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ManifestFileVar</span></a></li>
<li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">MapVar</span></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html b/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
index 9c89150..208214e 100644
--- a/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
+++ b/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/utils/MetadataMap.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/utils/PojoIntrospector.html" target="_top">Frames</a></li>
@@ -352,7 +352,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/utils/MetadataMap.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/utils/PojoIntrospector.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/utils/PojoMerge.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/PojoMerge.html b/content/site/apidocs/org/apache/juneau/utils/PojoMerge.html
new file mode 100644
index 0000000..fd2ac1c
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/utils/PojoMerge.html
@@ -0,0 +1,374 @@
+<!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>PojoMerge (Apache Juneau (incubating) 6.3.2-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="PojoMerge (Apache Juneau (incubating) 6.3.2-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/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/utils/PojoMerge.html" target="_top">Frames</a></li>
+<li><a href="PojoMerge.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.juneau.utils</div>
+<h2 title="Class PojoMerge" class="title">Class PojoMerge</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.utils.PojoMerge</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/utils/PojoMerge.html#line.73">PojoMerge</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">Utility class for merging POJOs behind a single interface.
+
+ <p>
+ Useful in cases where you want to define beans with 'default' values.
+
+ <p>
+ For example, given the following bean classes...
+
+ <p class='bcode'>
+ <jk>public interface</jk> IA {
+ String getX();
+ <jk>void</jk> setX(String x);
+ }
+
+ <jk>public class</jk> A <jk>implements</jk> IA {
+ <jk>private</jk> String <jf>x</jf>;
+
+ <jk>public</jk> A(String x) {
+ <jk>this</jk>.<jf>x</jf> = x;
+ }
+
+ <jk>public</jk> String getX() {
+ <jk>return</jk> <jf>x</jf>;
+ }
+
+ <jk>public void</jk> setX(String x) {
+ <jk>this</jk>.<jf>x</jf> = x;
+ }
+ }
+ </p>
+
+ <p>
+ The getters will be called in order until the first non-null value is returned...
+
+ <p class='bcode'>
+ PojoMerge m;
+
+ m = PojoMerge.<jsm>merge</jsm>(IA.<jk>class</jk>, <jk>new</jk> A(<js>"1"</js>), <jk>new</jk> A(<js>"2"</js>));
+ <jsm>assertEquals</jsm>(<js>"1"</js>, m.getX());
+
+ m = PojoMerge.<jsm>merge</jsm>(IA.<jk>class</jk>, <jk>new</jk> A(<jk>null</jk>), <jk>new</jk> A(<js>"2"</js>));
+ <jsm>assertEquals</jsm>(<js>"2"</js>, m.getX());
+
+ m = PojoMerge.<jsm>merge</jsm>(IA.<jk>class</jk>, <jk>new</jk> A(<jk>null</jk>), <jk>new</jk> A(<jk>null</jk>));
+ <jsm>assertEquals</jsm>(<jk>null</jk>, m.getX());
+ </p>
+
+ <h5 class='section'>Notes:</h5>
+ <ul>
+ <li>Null POJOs are ignored.
+ <li>Non-getter methods are either invoked on the first POJO or all POJOs depending on the <code>callAllNonGetters</code> flag
+ passed into the constructor.
+ <li>For purposes of this interface, a getter is any method with zero arguments and a non-<code>void</code> return type.
+ </ul></div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/utils/PojoMerge.html#PojoMerge--">PojoMerge</a></span>()</code> </td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <T> T</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/utils/PojoMerge.html#merge-java.lang.Class-boolean-T...-">merge</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
+ boolean callAllNonGetters,
+ T... pojos)</code>
+<div class="block">Create a proxy interface on top of zero or more POJOs.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <T> T</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/utils/PojoMerge.html#merge-java.lang.Class-T...-">merge</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
+ T... pojos)</code>
+<div class="block">Create a proxy interface on top of zero or more POJOs.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang
/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="PojoMerge--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>PojoMerge</h4>
+<pre>public <a href="../../../../src-html/org/apache/juneau/utils/PojoMerge.html#line.73">PojoMerge</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="merge-java.lang.Class-java.lang.Object:A-">
+<!-- -->
+</a><a name="merge-java.lang.Class-T...-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>merge</h4>
+<pre>public static <T> T <a href="../../../../src-html/org/apache/juneau/utils/PojoMerge.html#line.87">merge</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
+ T... pojos)</pre>
+<div class="block">Create a proxy interface on top of zero or more POJOs.
+
+ <p>
+ This is a shortcut to calling <code>merge(interfaceClass, <jk>false</jk>, pojos);</code></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>interfaceClass</code> - The common interface class.</dd>
+<dd><code>pojos</code> - Zero or more POJOs to merge.
+ <br>Can contain nulls.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A proxy interface over the merged POJOs.</dd>
+</dl>
+</li>
+</ul>
+<a name="merge-java.lang.Class-boolean-java.lang.Object:A-">
+<!-- -->
+</a><a name="merge-java.lang.Class-boolean-T...-">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>merge</h4>
+<pre>public static <T> T <a href="../../../../src-html/org/apache/juneau/utils/PojoMerge.html#line.104">merge</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
+ boolean callAllNonGetters,
+ T... pojos)</pre>
+<div class="block">Create a proxy interface on top of zero or more POJOs.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>interfaceClass</code> - The common interface class.</dd>
+<dd><code>callAllNonGetters</code> - If <jk>true</jk>, when calling a method that's not a getter, the method will be invoked on all POJOs.
+ <br>Otherwise, the method will only be called on the first POJO.</dd>
+<dd><code>pojos</code> - Zero or more POJOs to merge.
+ <br>Can contain nulls.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A proxy interface over the merged POJOs.</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/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/utils/PojoMerge.html" target="_top">Frames</a></li>
+<li><a href="PojoMerge.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/utils/PojoQuery.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/PojoQuery.html b/content/site/apidocs/org/apache/juneau/utils/PojoQuery.html
index b2709aa..a4fa9a2 100644
--- a/content/site/apidocs/org/apache/juneau/utils/PojoQuery.html
+++ b/content/site/apidocs/org/apache/juneau/utils/PojoQuery.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -434,7 +434,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/utils/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-frame.html b/content/site/apidocs/org/apache/juneau/utils/package-frame.html
index 9d6bbb1..896698a 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-frame.html
@@ -29,6 +29,7 @@
<li><a href="MessageBundle.html" title="class in org.apache.juneau.utils" target="classFrame">MessageBundle</a></li>
<li><a href="MetadataMap.html" title="class in org.apache.juneau.utils" target="classFrame">MetadataMap</a></li>
<li><a href="PojoIntrospector.html" title="class in org.apache.juneau.utils" target="classFrame">PojoIntrospector</a></li>
+<li><a href="PojoMerge.html" title="class in org.apache.juneau.utils" target="classFrame">PojoMerge</a></li>
<li><a href="PojoQuery.html" title="class in org.apache.juneau.utils" target="classFrame">PojoQuery</a></li>
<li><a href="PojoRest.html" title="class in org.apache.juneau.utils" target="classFrame">PojoRest</a></li>
<li><a href="ProcBuilder.html" title="class in org.apache.juneau.utils" target="classFrame">ProcBuilder</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/utils/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-summary.html b/content/site/apidocs/org/apache/juneau/utils/package-summary.html
index 26db99d..7ebffd7 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-summary.html
@@ -176,67 +176,73 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils">PojoMerge</a></td>
+<td class="colLast">
+<div class="block">Utility class for merging POJOs behind a single interface.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils">PojoQuery</a></td>
<td class="colLast">
<div class="block">Designed to provide search/view/sort/paging filtering on tabular in-memory POJO models.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils">PojoRest</a></td>
<td class="colLast">
<div class="block">Provides the ability to perform standard REST operations (GET, PUT, POST, DELETE) against nodes in a POJO model.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ProcBuilder.html" title="class in org.apache.juneau.utils">ProcBuilder</a></td>
<td class="colLast">
<div class="block">Utility class for running operating system processes.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ProcBuilder.Matcher.html" title="class in org.apache.juneau.utils">ProcBuilder.Matcher</a></td>
<td class="colLast">
<div class="block">Specifies interface for defining OS-specific commands.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ResourceFinder.html" title="class in org.apache.juneau.utils">ResourceFinder</a></td>
<td class="colLast">
<div class="block">Utility class for finding resources for a class.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils">SearchArgs</a></td>
<td class="colLast">
<div class="block">Encapsulates arguments for basic search/view/sort/position/limit functionality.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/SearchArgs.Builder.html" title="class in org.apache.juneau.utils">SearchArgs.Builder</a></td>
<td class="colLast">
<div class="block">Builder for <a href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils"><code>SearchArgs</code></a> class.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></td>
<td class="colLast">
<div class="block">An encapsulated MessageFormat-style string and arguments.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></td>
<td class="colLast">
<div class="block">A serializer/object pair used for delayed object serialization.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ZipFileList.html" title="class in org.apache.juneau.utils">ZipFileList</a></td>
<td class="colLast">
<div class="block">Utility class for representing the contents of a zip file as a list of entries whose contents don't resolve until
serialization time.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ZipFileList.FileEntry.html" title="class in org.apache.juneau.utils">ZipFileList.FileEntry</a></td>
<td class="colLast">
<div class="block">ZipFileList entry for File entry types.</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/utils/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-tree.html b/content/site/apidocs/org/apache/juneau/utils/package-tree.html
index e24777d..40c2ed5 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-tree.html
@@ -143,6 +143,7 @@
<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/IOPipe.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">IOPipe</span></a></li>
<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/MetadataMap.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">MetadataMap</span></a></li>
<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoIntrospector</span></a></li>
+<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoMerge</span></a></li>
<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoQuery</span></a></li>
<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoRest</span></a></li>
<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/ProcBuilder.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">ProcBuilder</span></a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/xml/annotation/XmlFormat.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/annotation/XmlFormat.html b/content/site/apidocs/org/apache/juneau/xml/annotation/XmlFormat.html
index 6515f5a..841b5e0 100644
--- a/content/site/apidocs/org/apache/juneau/xml/annotation/XmlFormat.html
+++ b/content/site/apidocs/org/apache/juneau/xml/annotation/XmlFormat.html
@@ -476,7 +476,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>values</h4>
-<pre>public static <a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in org.apache.juneau.xml.annotation">XmlFormat</a>[] <a href="../../../../../src-html/org/apache/juneau/xml/annotation/XmlFormat.html#line.52">values</a>()</pre>
+<pre>public static <a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in org.apache.juneau.xml.annotation">XmlFormat</a>[] <a href="../../../../../src-html/org/apache/juneau/xml/annotation/XmlFormat.html#line.21">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:
@@ -496,7 +496,7 @@ for (XmlFormat c : XmlFormat.values())
<ul class="blockList">
<li class="blockList">
<h4>valueOf</h4>
-<pre>public static <a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in org.apache.juneau.xml.annotation">XmlFormat</a> <a href="../../../../../src-html/org/apache/juneau/xml/annotation/XmlFormat.html#line.52">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> name)</pre>
+<pre>public static <a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in org.apache.juneau.xml.annotation">XmlFormat</a> <a href="../../../../../src-html/org/apache/juneau/xml/annotation/XmlFormat.html#line.21">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> 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
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/overview-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-frame.html b/content/site/apidocs/overview-frame.html
index bab13e5..9f019b5 100644
--- a/content/site/apidocs/overview-frame.html
+++ b/content/site/apidocs/overview-frame.html
@@ -35,6 +35,7 @@
<li><a href="org/apache/juneau/json/annotation/package-frame.html" target="packageFrame">org.apache.juneau.json.annotation</a></li>
<li><a href="org/apache/juneau/microservice/package-frame.html" target="packageFrame">org.apache.juneau.microservice</a></li>
<li><a href="org/apache/juneau/microservice/resources/package-frame.html" target="packageFrame">org.apache.juneau.microservice.resources</a></li>
+<li><a href="org/apache/juneau/microservice/sample/package-frame.html" target="packageFrame">org.apache.juneau.microservice.sample</a></li>
<li><a href="org/apache/juneau/msgpack/package-frame.html" target="packageFrame">org.apache.juneau.msgpack</a></li>
<li><a href="org/apache/juneau/parser/package-frame.html" target="packageFrame">org.apache.juneau.parser</a></li>
<li><a href="org/apache/juneau/plaintext/package-frame.html" target="packageFrame">org.apache.juneau.plaintext</a></li>
@@ -44,8 +45,6 @@
<li><a href="org/apache/juneau/rest/client/package-frame.html" target="packageFrame">org.apache.juneau.rest.client</a></li>
<li><a href="org/apache/juneau/rest/converters/package-frame.html" target="packageFrame">org.apache.juneau.rest.converters</a></li>
<li><a href="org/apache/juneau/rest/jaxrs/package-frame.html" target="packageFrame">org.apache.juneau.rest.jaxrs</a></li>
-<li><a href="org/apache/juneau/rest/jaxrs/rdf/package-frame.html" target="packageFrame">org.apache.juneau.rest.jaxrs.rdf</a></li>
-<li><a href="org/apache/juneau/rest/jena/package-frame.html" target="packageFrame">org.apache.juneau.rest.jena</a></li>
<li><a href="org/apache/juneau/rest/labels/package-frame.html" target="packageFrame">org.apache.juneau.rest.labels</a></li>
<li><a href="org/apache/juneau/rest/matchers/package-frame.html" target="packageFrame">org.apache.juneau.rest.matchers</a></li>
<li><a href="org/apache/juneau/rest/remoteable/package-frame.html" target="packageFrame">org.apache.juneau.rest.remoteable</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index 4c62fee..6ff8830 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -218,172 +218,164 @@
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><a href="org/apache/juneau/microservice/sample/package-summary.html">org.apache.juneau.microservice.sample</a></td>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/msgpack/package-summary.html">org.apache.juneau.msgpack</a></td>
<td class="colLast">
<div class="block">JSON serialization and parsing support</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/parser/package-summary.html">org.apache.juneau.parser</a></td>
<td class="colLast">
<div class="block">Parser API</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/plaintext/package-summary.html">org.apache.juneau.plaintext</a></td>
<td class="colLast">
<div class="block">Plain-text serialization and parsing support</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/remoteable/package-summary.html">org.apache.juneau.remoteable</a></td>
<td class="colLast">
<div class="block">Remoteable interface proxies</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/package-summary.html">org.apache.juneau.rest</a></td>
<td class="colLast">
<div class="block">REST Servlet API</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/rest/annotation/package-summary.html">org.apache.juneau.rest.annotation</a></td>
<td class="colLast">
<div class="block">REST servlet annotations</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/client/package-summary.html">org.apache.juneau.rest.client</a></td>
<td class="colLast">
<div class="block">REST client API</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/rest/converters/package-summary.html">org.apache.juneau.rest.converters</a></td>
<td class="colLast">
<div class="block">Predefined REST response converters</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/jaxrs/package-summary.html">org.apache.juneau.rest.jaxrs</a></td>
<td class="colLast">
<div class="block">JAX-RS integration components</div>
</td>
</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="org/apache/juneau/rest/jaxrs/rdf/package-summary.html">org.apache.juneau.rest.jaxrs.rdf</a></td>
-<td class="colLast">
-<div class="block">JAX-RS integration components with RDF support</div>
-</td>
-</tr>
<tr class="altColor">
-<td class="colFirst"><a href="org/apache/juneau/rest/jena/package-summary.html">org.apache.juneau.rest.jena</a></td>
-<td class="colLast">
-<div class="block">RET servlet API with Jena components</div>
-</td>
-</tr>
-<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/labels/package-summary.html">org.apache.juneau.rest.labels</a></td>
<td class="colLast">
<div class="block">Various REST interface label classes</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/matchers/package-summary.html">org.apache.juneau.rest.matchers</a></td>
<td class="colLast">
<div class="block">Predefined Matchers</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/rest/remoteable/package-summary.html">org.apache.juneau.rest.remoteable</a></td>
<td class="colLast">
<div class="block">Remoteable service API</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/response/package-summary.html">org.apache.juneau.rest.response</a></td>
<td class="colLast">
<div class="block">HTTP Response handlers</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/rest/vars/package-summary.html">org.apache.juneau.rest.vars</a></td>
<td class="colLast">
<div class="block">Predefined SVL variables</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/widget/package-summary.html">org.apache.juneau.rest.widget</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/serializer/package-summary.html">org.apache.juneau.serializer</a></td>
<td class="colLast">
<div class="block">Serializer API</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/soap/package-summary.html">org.apache.juneau.soap</a></td>
<td class="colLast">
<div class="block">SOAP/XML serialization and parsing support</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/svl/package-summary.html">org.apache.juneau.svl</a></td>
<td class="colLast">
<div class="block">Simple Variable Language</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/svl/vars/package-summary.html">org.apache.juneau.svl.vars</a></td>
<td class="colLast">
<div class="block">Simple Variable Language - Predefined variables</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/transform/package-summary.html">org.apache.juneau.transform</a></td>
<td class="colLast">
<div class="block">Transform API</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/transforms/package-summary.html">org.apache.juneau.transforms</a></td>
<td class="colLast">
<div class="block">Predefined Transform implementations</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/uon/package-summary.html">org.apache.juneau.uon</a></td>
<td class="colLast">
<div class="block">UON notation serialization and parsing support</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/urlencoding/package-summary.html">org.apache.juneau.urlencoding</a></td>
<td class="colLast">
<div class="block">URL encoding serialization and parsing support</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/urlencoding/annotation/package-summary.html">org.apache.juneau.urlencoding.annotation</a></td>
<td class="colLast">
<div class="block">URL-Encoding annotations</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></td>
<td class="colLast">
<div class="block">Utility classes</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/xml/package-summary.html">org.apache.juneau.xml</a></td>
<td class="colLast">
<div class="block">XML serialization and parsing support</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/xml/annotation/package-summary.html">org.apache.juneau.xml.annotation</a></td>
<td class="colLast">
<div class="block">XML annotations</div>
@@ -504,23 +496,6 @@
<li><p><a class='doclink' href='#Samples.ConfigResource'>ConfigResource</a></p>
<li><p><a class='doclink' href='#Samples.LogsResource'>LogsResource</a></p>
</ol>
- <li><p><a class='doclink' href='#Cookbook'>Cookbook Examples</a></p>
- <ol>
- <li><p><a class='doclink' href='#Cookbook.Core'>Core API</a></p>
- <li><p><a class='doclink' href='#Cookbook.Server'>Server API</a></p>
- <ol>
- <li><p><a class='doclink' href='#Cookbook.Server.applyDoubletransform'>Apply a transform that changes the
- format of doubles</a></p>
- <li><p><a class='doclink' href='#Cookbook.Server.applyTransformsSubset'>Apply transforms to a subset of
- serializers or parsers</a></p>
- </ol>
- <li><p><a class='doclink' href='#Cookbook.Client'>Client API</a></p>
- <ol>
- </ol>
- <li><p><a class='doclink' href='#Cookbook.Microservice'>Microservice API</a></p>
- <ol>
- </ol>
- </ol>
<li><p><a class='doclink' href='#BestPractices'>Best Practices</a></p>
<li><p><a class='doclink' href='#ImportantLinks'>Important Documentation Links</a></p>
<li><p><a class='doclink' href='#ReleaseNotes'>Release Notes</a></p>
@@ -5411,7 +5386,7 @@
* [OPTIONS /*]
* View resource options
*/</jd>
- <ja>@Override</ja> /* RestServletJenaDefault */
+ <ja>@Override</ja> /* RestServletDefault */
<ja>@RestMethod</ja>(name=<js>"OPTIONS"</js>, path=<js>"/*"</js>)
<jk>public</jk> Swagger getOptions(RestRequest req) {
<jk>return</jk> req.getSwagger();
@@ -7058,155 +7033,8 @@
</div>
<!-- ======================================================================================================== -->
-<a id="Cookbook"></a>
-<h2 class='topic' onclick='toggle(this)'>9 - Cookbook Examples</h2>
-<div class='topic'>
-
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Core"></a>
- <h3 class='topic' onclick='toggle(this)'>9.1 - Core API</h3>
- <div class='topic'>
-
- <h6 class='topic'>TODO topics</h6>
- <ol>
- <li>Creating generic JSON objects
- <li>Defining XML namespaces
- </ol>
- </div>
-
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Server"></a>
- <h3 class='topic' onclick='toggle(this)'>9.2 - Server API</h3>
- <div class='topic'>
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Server.applyDoubleTransform"></a>
- <h3 class='topic' onclick='toggle(this)'>9.2.1 - Apply a transform that changes the format of doubles</h3>
- <div class='topic'>
- <p>
- The <a href="org/apache/juneau/rest/annotation/RestResource.html#pojoSwaps--"><code>RestResource.pojoSwaps()</code></a> annotation can be used to add
- POJO swaps to all the serializers and parsers registered with a servlet.
- </p>
- <p>
- In this example, you define a POJO swap that converts doubles to localized-format strings using
- the <l>NumberFormat</l> Java class.
- </p>
- <p class='bcode'>
- <ja>@RestResource</ja>(
- pojoSwaps={
- MyRestService.DoubleSwap.<jk>class</jk>
- }
- )
- <jk>public class</jk> MyRestService <jk>extends</jk> JazzDefaultRestResource {
-
- <jk>private static final</jk> NumberFormat <jsf>FORMAT</jsf> = NumberFormat.<jsm>getInstance()</jsm>;
-
- <jk>public static class</jk> DoubleSwap <jk>extends</jk> PojoSwap<Double,String> {
- <ja>@Override</ja> <jc>/* PojoSwap */</jc>
- <jk>public</jk> String swap(BeanSession session, Double o) <jk>throws</jk> SerializeException {
- <jk>return</jk> <jsf>FORMAT</jsf>.format(o);
- }
- }
- </p>
- </div>
-
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Server.applyTransformsSubset"></a>
- <h3 class='topic' onclick='toggle(this)'>9.2.2 - Apply transforms to a subset of serializers or parsers</h3>
- <div class='topic'>
- <p>
- The <a href="org/apache/juneau/rest/RestConfig.html#addSerializers-java.lang.Class...-"><code>RestConfig.addSerializers(Class[])</code></a> and
- <a href="org/apache/juneau/rest/RestConfig.html#addParsers-java.lang.Class...-"><code>RestConfig.addParsers(Class[])</code></a>
- methods are the methods that get called during servlet initialization to create the serializer and
- parser groups.
- These methods can be overridden to customize individual serializers and parsers in a way that can't be
- done using annotations.
- </p>
- <p>
- In this example, you want to apply the swap from the previous example to change the rendered format for doubles.
- However, in this case, you apply the swap to only the HTML serializer.
- </p>
- <p class='bcode'>
- <ja>@Override</ja>
- <jk>public synchronized void</jk> init(RestServletConfig config) <jk>throws</jk> Exception {
- config.addSerializer(<jk>new</jk> HtmlSerializerBuilder().pojoSwaps(DoubleSwap.<jk>class</jk>).build());
- super.init(config);
- }
- </p>
- </div>
-
- <h6 class='topic'>TODO topics</h6>
- <ol>
- <li>Packaging as WAR files
- <li>Customizing OPTIONS pages
- <li>Rendering form entry pages
- <li>Using the ZipFileList response handler
- <li>Implementing console-output pages in HTML
- <li>Using configuration files
- <li>Making a bean traversable
- <li>Using the Queryable converter
- <li>Sending raw output
- <li>Retrieving raw input
- <li>Accessing request query parameters
- <li>Accessing request path variables
- <li>Accessing request content
- <li>Accessing request header values
- <li>Accessing the path pattern remainder
- <li>Creating ResourceGroup pages
- <li>Using matchers to define multiple Java methods to the same path pattern
- <li>Using the Remoteable API
- <li>Sending a redirect request
- <li>Changing the stylesheet used by the HTML serializer
- <li>Using the Introspector API to invoke methods on Java objects through REST calls
- <li>Customizing serializers and parsers at the method level
- <li>Accessing config file values
- <li>Accessing request query parameters on URL-Encoded FORM posts without triggering HTML body to be read
- <li>Accessing localized messages
- <li>Defining your own response handlers
- <li>Guarding access to a servlet or method
- <li>Handling servlet initialization errors
- <li>Handling exceptions that occur during response processing
- <li>Customizing logging
- <li>Creating an ATOM feed
- <li>Creating a REST API against a file system
- <li>Creating a Docker REST API
- <li>Creating a REST API for storing and retrieving images
- <li>Creating a REST API for echoing requests
- <li>Creating a Tumblr REST API
- <li>Creating a Cloudant REST API
- <li>Using onPreCall() to intercept requests before processing
- <li>Using onPostCall() to intercept requests after processing
- <li>Creating child resources programmatically
- <li>Defining default request headers
- <li>Defining default response headers
- <li>Defining your own var-resolver variables
- <li>Serving up static files inside the /htdocs embedded package
- <li>Defining MIME types of files in the /htdocs folder using the createMimitypesFileTypeMap() method
- <li>Defining the title and description of a servlet programmatically using getDescription() and getTitle().
- <li>Setting properties programmatically using RestServlet.setProperty()
- <li>Setting and saving config file properties
- <li>Defining your own abstract subclass of RestServlet or RestServletDefault
- <li>Adding GZip support
- <li>Accessing environment variables in config files
- </ol>
-
- </div>
-
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Client"></a>
- <h3 class='topic' onclick='toggle(this)'>9.3 - Client API</h3>
- <div class='topic'>
- </div>
-
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Microservice"></a>
- <h3 class='topic' onclick='toggle(this)'>9.4 - Microservice API</h3>
- <div class='topic'>
- </div>
-</div>
-
-<!-- ======================================================================================================== -->
<a id="BestPractices"></a>
-<h2 class='topic' onclick='toggle(this)'>10 - Best Practices</h2>
+<h2 class='topic' onclick='toggle(this)'>9 - Best Practices</h2>
<div class='topic'>
<ol class='spaced-list'>
<li>
@@ -7229,7 +7057,7 @@
<!-- ======================================================================================================== -->
<a id="ImportantLinks"></a>
-<h2 class='topic' onclick='toggle(this)'>11 - Important Document Links</h2>
+<h2 class='topic' onclick='toggle(this)'>10 - Important Document Links</h2>
<div class='topic'>
<p>
All up-to-date Juneau documentation is stored in Javadocs, especially package-level Javadocs.
@@ -7257,7 +7085,7 @@
<!-- ======================================================================================================== -->
<a id="ReleaseNotes"></a>
-<h2 class='topic' onclick='toggle(this)'>12 - Release Notes</h2>
+<h2 class='topic' onclick='toggle(this)'>11 - Release Notes</h2>
<div class='topic'>
<h5 class='toc'>What's new in each release</h5>
@@ -7336,9 +7164,187 @@
<h3 class='topic' onclick='toggle(this)'>6.3.2 (TBD)</h3>
<div class='topic'>
<p>
+ The major change in this release is the project structure
</p>
+ <p>
+ The library now consists of the following artifacts found in the Maven group <code>"org.apache.juneau"</code>:
+ </p>
+ <table class='styled' style='min-width:800px;'>
+ <tr>
+ <th>Category</th><th>Maven Artifacts</th><th>Description</th><th>Prereqs</th>
+ </tr>
+ <tr class='dark bb'>
+ <td rowspan="5" style='text-align:center;font-weight:bold;padding:20px;'><a class='doclink' href='#JuneauCore'>Juneau Core</a></td>
+ <td class='code'><a class='doclink' href='#juneau-marshall'>juneau-marshall</a></td>
+ <td>Serializers and parsers for:
+ <ul style='margin:0px 10px;'>
+ <li>JSON
+ <li>XML
+ <li>HTML
+ <li>UON
+ <li>URL-Encoding
+ <li>MessagePack
+ <li>SOAP/XML
+ <li>CSV
+ <li>BSON (coming soon)
+ <li>YAML (coming soon)
+ <li>Protobuf (coming soon)
+ </ul>
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ </ul>
+ </td>
+ </tr>
+ <tr class='dark bb'>
+ <td class='code'><a class='doclink' href='#juneau-marshall-rdf'>juneau-marshall-rdf</a></td>
+ <td>
+ Serializers and parsers for:
+ <ul style='margin:0px 10px;'>
+ <li>RDF/XML
+ <li>RDF/XML-Abbrev
+ <li>N-Triple
+ <li>Turtle
+ <li>N3
+ </ul>
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ <li>Apache Jena 2.7.1
+ </ul>
+ </td>
+ </tr>
+ <tr class='dark bb'>
+ <td class='code'><a class='doclink' href='#juneau-dto'>juneau-dto</a></td>
+ <td>
+ Data Transfer Objects for:
+ <ul style='margin:0px 10px;'>
+ <li>HTML5
+ <li>Atom
+ <li>Cognos
+ <li>JSON-Schema
+ <li>Swagger 2.0
+ </ul>
+ </td>
+ <td><ul style='margin:0px 10px;'><li>Java 6</li></ul></td>
+ </tr>
+ <tr class='dark bb'>
+ <td class='code'><a class='doclink' href='#juneau-svl'>juneau-svl</a></td>
+ <td>
+ Simple Variable Language API
+ </td>
+ <td><ul style='margin:0px 10px;'><li>Java 6</li></ul></td>
+ </tr>
+ <tr class='dark bb'>
+ <td class='code'><a class='doclink' href='#juneau-config'>juneau-config</a></td>
+ <td>
+ Configuration file API
+ </td>
+ <td><ul style='margin:0px 10px;'><li>Java 6</li></ul></td>
+ </tr>
+ <tr class='light bb'>
+ <td rowspan="5" style='text-align:center;font-weight:bold;padding:20px;'><a class='doclink' href='#JuneauRest'>Juneau REST</a></td>
+ <td class='code'><a class='doclink' href='#juneau-rest-server'>juneau-rest-server</a></td>
+ <td>
+ REST Servlet API
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ <li>Servlet 3.1
+ </ul>
+ </td>
+ </tr>
+ <tr class='light bb'>
+ <td class='code'><a class='doclink' href='#juneau-rest-server-jaxrs'>juneau-rest-server-jaxrs</a></td>
+ <td>
+ Optional JAX-RS support
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ <li>JAX-RS 2.0
+ </ul>
+ </td>
+ </tr>
+ <tr class='light bb'>
+ <td class='code'><a class='doclink' href='#juneau-rest-client'>juneau-rest-client</a></td>
+ <td>
+ REST Client API
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ <li>Apache HttpClient 4.5
+ </ul>
+ </td>
+ </tr>
+ <tr class='light bb'>
+ <td class='code'><a class='doclink' href='#juneau-microservice'>juneau-microservice</a></td>
+ <td>
+ REST Microservice API
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 8
+ <li>Eclipse Jetty 9.4.3
+ </ul>
+ </td>
+ </tr>
+ <tr class='light bb'>
+ <td class='code'><a class='doclink' href='#juneau-microservice-template'>juneau-microservice-template</a></td>
+ <td>
+ Developer template project
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 8
+ <li>Eclipse Jetty 9.4.3
+ </ul>
+ </td>
+ </tr>
+ <tr class='dark bb'>
+ <td rowspan="2" style='text-align:center;font-weight:bold;padding:20px;'><a class='doclink' href='#Examples'>Examples</a></td>
+ <td class='code'><code>juneau-examples-core</code></td>
+ <td>
+ Core code examples
+ </td>
+ <td></td>
+ </tr>
+ <tr class='dark bb'>
+ <td class='code'><code>juneau-examples-rest</code></td>
+ <td>
+ REST code examples
+ </td>
+ <td></td>
+ </tr>
+ <tr class='light bb'>
+ <td rowspan="1" style='text-align:center;font-weight:bold;padding:20px;'><a class='doclink' href='#JuneauAll'>Juneau All</a></td>
+ <td class='code'><code>juneau-all</code></td>
+ <td>
+ Combination of the following:
+ <ul style='margin:0px 10px;'>
+ <li>juneau-marshall
+ <li>juneau-dto
+ <li>juneau-svl
+ <li>juneau-config
+ <li>juneau-rest-server
+ <li>juneau-rest-client
+ </ul>
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ <li>Servlet 3.1
+ <li>Apache HttpClient 4.5
+ </ul>
+ </td>
+ </tr>
+ </table>
- <h6 class='topic'>org.apache.juneau</h6>
+ <h6 class='topic'>juneau-marshall</h6>
<ul class='spaced-list'>
<li>
Serializers can now serialize to <a href="http://docs.oracle.com/javase/7/docs/api/java/util/StringBuilder.html?is-external=true" title="class or interface in java.util"><code>StringBuilders</code></a>.
@@ -7384,9 +7390,6 @@
</p>
This is mostly an internal change and doesn't affect the existing APIs.
<li>
- <a href="org/apache/juneau/dto/html5/HtmlElementMixed.html#children-java.lang.Object...-"><code>HtmlElementMixed.children(Object...)</code></a> can now take in collections
- of objects.
- <li>
<a href="org/apache/juneau/transform/PojoSwap.html#swap-org.apache.juneau.BeanSession-T-"><code>PojoSwap.swap(BeanSession,Object)</code></a> and <a href="org/apache/juneau/transform/PojoSwap.html#unswap-org.apache.juneau.BeanSession-S-org.apache.juneau.ClassMeta-"><code>PojoSwap.unswap(BeanSession,Object,ClassMeta)</code></a>
can now throw arbitrary exceptions instead of having to wrap them in <code>SerializeException</code>/<code>ParseException</code>.
<li>
@@ -7426,7 +7429,7 @@
<li><a href="org/apache/juneau/utils/PojoRest.html#getWithDefault-java.lang.String-T-java.lang.reflect.Type-java.lang.reflect.Type...-"><code>getWithDefault(String,Object,Type,Type...)</code></a>
</ul>
<li>
- Fixed bug where <a href="org/apache/juneau/BeanSession.html#getMediaType--"><code>BeanSession.getMediaType()</code></a> wasn't returning <jk>.
+ Fixed bug where <a href="org/apache/juneau/BeanSession.html#getMediaType--"><code>BeanSession.getMediaType()</code></a> wasn't returning a value.
<li>
Eliminated the <ja>@Consumes</ja> and <ja>@Produces</ja> annotations.
<br>The supported media types are now passed in through the constructors.
@@ -7434,12 +7437,22 @@
the call to <code>getClass()</code> to retrieve the annotation value could not be called before calling
the <code><jk>super</jk>()</code> method.
<li>
+ New class: <a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><code>PojoMerge</code></a>
+ <li>
New doc: <a class='doclink' href='#Core.PojoAnnotation'>2.6.2 - @Pojo annotation</a>
<li>
New doc: <a class='doclink' href='#Core.SerializingReadersAndInputStreams'>2.6.5 - Serializing Readers and InputStreams</a>
</ul>
- <h6 class='topic'>org.apache.juneau.rest</h6>
+ <h6 class='topic'>juneau-dto</h6>
+ <ul class='spaced-list'>
+ <li>
+ <a href="org/apache/juneau/dto/html5/HtmlElementMixed.html#children-java.lang.Object...-"><code>HtmlElementMixed.children(Object...)</code></a> can now take in collections
+ of objects.
+ </ul>
+
+
+ <h6 class='topic'>juneau-rest-server</h6>
<ul class='spaced-list'>
<li>
Revamped and simplified servlet and REST-call lifecycle handling through new
@@ -7499,9 +7512,14 @@
Stylesheet selection now stored in HTTP session when passed in via <code>?stylesheet</code> query parameter.
<li>
New doc: <a class='doclink' href='/org/apache/juneau/rest/package-summary.html#RestResources.RestHooks'>Lifecycle Hooks</a>
+ <li>
+ Eliminated the <code>RestServletJenaDefault</code> class to remove the Jena dependency class on
+ the <code>juneau-rest-server</code> artifact.
+ <br>It's simple enough to simply extend <code>RestServletDefault</code> and add the RDF serializers and
+ parsers.
</ul>
- <h6 class='topic'>org.apache.juneau.rest.microservice</h6>
+ <h6 class='topic'>juneau-microservice</h6>
<ul class='spaced-list'>
<li>
New methods on <a href="org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice"><code>RestMicroservice</code></a>:
@@ -9270,7 +9288,7 @@
<li><code><del>RestServlet.getConfigMgr()</del></code>
</ul>
<li>Removed <a href="org/apache/juneau/jso/JsoParser.html" title="class in org.apache.juneau.jso"><code>JsoParser</code></a>
- from <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a>.
+ from <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code>.
These may represent a security risk if not handled correctly, so removed
them as a precaution.
<li>Removed <code>RestServletProperties.REST_htDocsFolder</code>. Replaced with <a href="org/apache/juneau/rest/annotation/RestResource.html#staticFiles--"><code>RestResource.staticFiles()</code></a>.
@@ -9595,13 +9613,13 @@
<li><code>$E{var}</code> - Environment variables.
</ul>
<li>Added methods <code><del>RestServlet.getDescription(RestRequest)</del></code> and <del><code>RestServlet.getLabel(RestRequest)</code></del>.
- <li><a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> now provide default HTML titles
+ <li><a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code> now provide default HTML titles
and descriptions:
<p class='bcode'>
<ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"$R{servletTitle}"</js>),
<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"$R{servletDescription}"</js>)
</p>
- <li>Options pages on <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> now provide default descriptions and back links:
+ <li>Options pages on <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code> now provide default descriptions and back links:
and descriptions:
<p class='bcode'>
<ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{back:'$R{servletURI}"</js>),
@@ -9770,7 +9788,7 @@
<h6 class='topic'>Server</h6>
<ul class='spaced-list'>
- <li>Added a default OPTIONS page to <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a>.
+ <li>Added a default OPTIONS page to <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code>.
<li><code>RestServletProperties.REST_allowMethodParam</code> has been enhanced to allow you to
explicitely specify which HTTP methods can be used in the <code>&method</code> parameter.
<li>New methods added to <a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest"><code>RestRequest</code></a>:
@@ -9908,7 +9926,7 @@
<li><code>&noTrace=true</code> now prevents any errors from being logged in log file.
<li>Workaround for Jetty issue where <code>ServletContext.getContextPath()</code> always ends with <js>"null"</js>.
<li><code>RestServletProperties.REST_allowMethodParam</code> is now <jk>true</jk> by default on all subclasses
- of <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a>.
+ of <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code>.
</ul>
<h6 class='topic'>Client</h6>
@@ -9967,7 +9985,7 @@
<li>Removed properties parameters from <code><del>RestServlet.onPreCall(RestRequest)</del></code> and <code><del>RestServlet#onPostCall(RestRequest,RestResponse)</del></code> methods
since the properties are already accessible through <code>RestRequest.getProperties()</code>.
<li>Added <a href="org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon"><code>UonSerializer</code></a> and <a href="org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon"><code>UonParser</code></a> to serializer and parser lists on
- <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a>.
+ <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code>.
</ul>
<h6 class='topic'>Client</h6>
@@ -10891,10 +10909,10 @@
</ul>
</li>
<li>
- New <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
+ New <code><del>RestServletJenaDefault</del></code> servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
</li>
<li>
- New <a href="org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf"><code>DefaultJenaProvider</code></a> JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
+ New <code><del>DefaultJenaProvider</del></code> JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
</li>
<li>
Eliminated <code>RestServletChild</code> class.<br>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index 28648ff..6f1ac6b 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -94,6 +94,7 @@
<li><a href="org/apache/juneau/json/annotation/package-tree.html">org.apache.juneau.json.annotation</a>, </li>
<li><a href="org/apache/juneau/microservice/package-tree.html">org.apache.juneau.microservice</a>, </li>
<li><a href="org/apache/juneau/microservice/resources/package-tree.html">org.apache.juneau.microservice.resources</a>, </li>
+<li><a href="org/apache/juneau/microservice/sample/package-tree.html">org.apache.juneau.microservice.sample</a>, </li>
<li><a href="org/apache/juneau/msgpack/package-tree.html">org.apache.juneau.msgpack</a>, </li>
<li><a href="org/apache/juneau/parser/package-tree.html">org.apache.juneau.parser</a>, </li>
<li><a href="org/apache/juneau/plaintext/package-tree.html">org.apache.juneau.plaintext</a>, </li>
@@ -103,8 +104,6 @@
<li><a href="org/apache/juneau/rest/client/package-tree.html">org.apache.juneau.rest.client</a>, </li>
<li><a href="org/apache/juneau/rest/converters/package-tree.html">org.apache.juneau.rest.converters</a>, </li>
<li><a href="org/apache/juneau/rest/jaxrs/package-tree.html">org.apache.juneau.rest.jaxrs</a>, </li>
-<li><a href="org/apache/juneau/rest/jaxrs/rdf/package-tree.html">org.apache.juneau.rest.jaxrs.rdf</a>, </li>
-<li><a href="org/apache/juneau/rest/jena/package-tree.html">org.apache.juneau.rest.jena</a>, </li>
<li><a href="org/apache/juneau/rest/labels/package-tree.html">org.apache.juneau.rest.labels</a>, </li>
<li><a href="org/apache/juneau/rest/matchers/package-tree.html">org.apache.juneau.rest.matchers</a>, </li>
<li><a href="org/apache/juneau/rest/remoteable/package-tree.html">org.apache.juneau.rest.remoteable</a>, </li>
@@ -239,7 +238,6 @@
<li type="circle">org.apache.juneau.dto.atom.<a href="org/apache/juneau/dto/atom/AtomBuilder.html" title="class in org.apache.juneau.dto.atom"><span class="typeNameLink">AtomBuilder</span></a></li>
<li type="circle">org.apache.juneau.rest.jaxrs.<a href="org/apache/juneau/rest/jaxrs/BaseProvider.html" title="class in org.apache.juneau.rest.jaxrs"><span class="typeNameLink">BaseProvider</span></a> (implements javax.ws.rs.ext.MessageBodyReader<T>, javax.ws.rs.ext.MessageBodyWriter<T>)
<ul>
-<li type="circle">org.apache.juneau.rest.jaxrs.rdf.<a href="org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf"><span class="typeNameLink">DefaultJenaProvider</span></a></li>
<li type="circle">org.apache.juneau.rest.jaxrs.<a href="org/apache/juneau/rest/jaxrs/DefaultProvider.html" title="class in org.apache.juneau.rest.jaxrs"><span class="typeNameLink">DefaultProvider</span></a></li>
</ul>
</li>
@@ -615,26 +613,20 @@
<ul>
<li type="circle">org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">ConfigResource</span></a></li>
<li type="circle">org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/DirectoryResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">DirectoryResource</span></a></li>
+<li type="circle">org.apache.juneau.microservice.sample.<a href="org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">HelloWorldResource</span></a></li>
<li type="circle">org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/LogsResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">LogsResource</span></a></li>
<li type="circle">org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/ShutdownResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">ShutdownResource</span></a></li>
</ul>
</li>
+<li type="circle">org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceJena</span></a></li>
<li type="circle">org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServletGroupDefault</span></a>
<ul>
<li type="circle">org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceGroup</span></a>
<ul>
+<li type="circle">org.apache.juneau.microservice.sample.<a href="org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">RootResources</span></a></li>
<li type="circle">org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/SampleRootResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">SampleRootResource</span></a></li>
</ul>
</li>
-</ul>
-</li>
-</ul>
-</li>
-<li type="circle">org.apache.juneau.rest.jena.<a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">RestServletJenaDefault</span></a>
-<ul>
-<li type="circle">org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceJena</span></a></li>
-<li type="circle">org.apache.juneau.rest.jena.<a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">RestServletJenaGroupDefault</span></a>
-<ul>
<li type="circle">org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceJenaGroup</span></a></li>
</ul>
</li>
@@ -918,6 +910,7 @@
<li type="circle">org.apache.juneau.parser.<a href="org/apache/juneau/parser/ParserMatch.html" title="class in org.apache.juneau.parser"><span class="typeNameLink">ParserMatch</span></a></li>
<li type="circle">org.apache.juneau.parser.<a href="org/apache/juneau/parser/ParserPipe.html" title="class in org.apache.juneau.parser"><span class="typeNameLink">ParserPipe</span></a></li>
<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoIntrospector</span></a></li>
+<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoMerge</span></a></li>
<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoQuery</span></a></li>
<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoRest</span></a></li>
<li type="circle">org.apache.juneau.transform.<a href="org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><span class="typeNameLink">PojoSwap</span></a><T,S>
@@ -1318,7 +1311,7 @@
<li type="circle">org.apache.juneau.svl.<a href="org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">DefaultingVar</span></a>
<ul>
<li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ArgsVar</span></a></li>
-<li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ConfigFileVar</span></a></li>
+<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileVar</span></a></li>
<li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">EnvVariablesVar</span></a></li>
<li type="circle">org.apache.juneau.rest.vars.<a href="org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><span class="typeNameLink">FileVar</span></a></li>
<li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ManifestFileVar</span></a></li>
@@ -1484,14 +1477,14 @@
<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.<a href="org/apache/juneau/PartType.html" title="enum in org.apache.juneau"><span class="typeNameLink">PartType</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>
-<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileFormat</span></a></li>
<li type="circle">org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/ReturnValue.html" title="enum in org.apache.juneau.remoteable"><span class="typeNameLink">ReturnValue</span></a></li>
<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/CalendarUtils.Format.html" title="enum in org.apache.juneau.utils"><span class="typeNameLink">CalendarUtils.Format</span></a></li>
<li type="circle">org.apache.juneau.xml.annotation.<a href="org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in org.apache.juneau.xml.annotation"><span class="typeNameLink">XmlFormat</span></a></li>
<li type="circle">org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfCollectionFormat.html" title="enum in org.apache.juneau.jena"><span class="typeNameLink">RdfCollectionFormat</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.ini.<a href="org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileFormat</span></a></li>
<li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/Inherit.html" title="enum in org.apache.juneau.rest.annotation"><span class="typeNameLink">Inherit</span></a></li>
<li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/HookEvent.html" title="enum in org.apache.juneau.rest.annotation"><span class="typeNameLink">HookEvent</span></a></li>
<li type="circle">org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestParamType.html" title="enum in org.apache.juneau.rest"><span class="typeNameLink">RestParamType</span></a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/package-list
----------------------------------------------------------------------
diff --git a/content/site/apidocs/package-list b/content/site/apidocs/package-list
index 6457fe6..2f2c63a 100644
--- a/content/site/apidocs/package-list
+++ b/content/site/apidocs/package-list
@@ -20,6 +20,7 @@ org.apache.juneau.json
org.apache.juneau.json.annotation
org.apache.juneau.microservice
org.apache.juneau.microservice.resources
+org.apache.juneau.microservice.sample
org.apache.juneau.msgpack
org.apache.juneau.parser
org.apache.juneau.plaintext
@@ -29,8 +30,6 @@ org.apache.juneau.rest.annotation
org.apache.juneau.rest.client
org.apache.juneau.rest.converters
org.apache.juneau.rest.jaxrs
-org.apache.juneau.rest.jaxrs.rdf
-org.apache.juneau.rest.jena
org.apache.juneau.rest.labels
org.apache.juneau.rest.matchers
org.apache.juneau.rest.remoteable
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/serialized-form.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/serialized-form.html b/content/site/apidocs/serialized-form.html
index 0919305..abf0064 100644
--- a/content/site/apidocs/serialized-form.html
+++ b/content/site/apidocs/serialized-form.html
@@ -307,12 +307,12 @@
<li class="blockList"><a name="org.apache.juneau.microservice.ResourceJena">
<!-- -->
</a>
-<h3>Class <a href="org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice">org.apache.juneau.microservice.ResourceJena</a> extends <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a> implements Serializable</h3>
+<h3>Class <a href="org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice">org.apache.juneau.microservice.ResourceJena</a> extends <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a> implements Serializable</h3>
</li>
<li class="blockList"><a name="org.apache.juneau.microservice.ResourceJenaGroup">
<!-- -->
</a>
-<h3>Class <a href="org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice">org.apache.juneau.microservice.ResourceJenaGroup</a> extends <a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaGroupDefault</a> implements Serializable</h3>
+<h3>Class <a href="org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice">org.apache.juneau.microservice.ResourceJenaGroup</a> extends <a href="org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a> implements Serializable</h3>
</li>
</ul>
</li>
@@ -409,6 +409,29 @@
</ul>
</li>
<li class="blockList">
+<h2 title="Package">Package org.apache.juneau.microservice.sample</h2>
+<ul class="blockList">
+<li class="blockList"><a name="org.apache.juneau.microservice.sample.HelloWorldResource">
+<!-- -->
+</a>
+<h3>Class <a href="org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample">org.apache.juneau.microservice.sample.HelloWorldResource</a> extends <a href="org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a> implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>1L</dd>
+</dl>
+</li>
+<li class="blockList"><a name="org.apache.juneau.microservice.sample.RootResources">
+<!-- -->
+</a>
+<h3>Class <a href="org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample">org.apache.juneau.microservice.sample.RootResources</a> extends <a href="org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice">ResourceGroup</a> implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>1L</dd>
+</dl>
+</li>
+</ul>
+</li>
+<li class="blockList">
<h2 title="Package">Package org.apache.juneau.parser</h2>
<ul class="blockList">
<li class="blockList"><a name="org.apache.juneau.parser.ParseException">
@@ -700,29 +723,6 @@
</ul>
</li>
<li class="blockList">
-<h2 title="Package">Package org.apache.juneau.rest.jena</h2>
-<ul class="blockList">
-<li class="blockList"><a name="org.apache.juneau.rest.jena.RestServletJenaDefault">
-<!-- -->
-</a>
-<h3>Class <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">org.apache.juneau.rest.jena.RestServletJenaDefault</a> extends <a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a> implements Serializable</h3>
-<dl class="nameValue">
-<dt>serialVersionUID:</dt>
-<dd>1L</dd>
-</dl>
-</li>
-<li class="blockList"><a name="org.apache.juneau.rest.jena.RestServletJenaGroupDefault">
-<!-- -->
-</a>
-<h3>Class <a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">org.apache.juneau.rest.jena.RestServletJenaGroupDefault</a> extends <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a> implements Serializable</h3>
-<dl class="nameValue">
-<dt>serialVersionUID:</dt>
-<dd>1L</dd>
-</dl>
-</li>
-</ul>
-</li>
-<li class="blockList">
<h2 title="Package">Package org.apache.juneau.rest.labels</h2>
<ul class="blockList">
<li class="blockList"><a name="org.apache.juneau.rest.labels.ChildResourceDescriptions">
[08/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
index ce5ef20..177d54b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
@@ -20,24 +20,38 @@
<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
<span class="sourceLineNo">013</span>package org.apache.juneau.microservice;<a name="line.13"></a>
<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import org.apache.juneau.rest.annotation.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import org.apache.juneau.rest.jena.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>/**<a name="line.18"></a>
-<span class="sourceLineNo">019</span> * Superclass for all REST resources with RDF support.<a name="line.19"></a>
-<span class="sourceLineNo">020</span> */<a name="line.20"></a>
-<span class="sourceLineNo">021</span>@SuppressWarnings("serial")<a name="line.21"></a>
-<span class="sourceLineNo">022</span>@RestResource(<a name="line.22"></a>
-<span class="sourceLineNo">023</span> htmldoc=@HtmlDoc(<a name="line.23"></a>
-<span class="sourceLineNo">024</span> links={<a name="line.24"></a>
-<span class="sourceLineNo">025</span> "up: request:/..",<a name="line.25"></a>
-<span class="sourceLineNo">026</span> "options: servlet:/?method=OPTIONS"<a name="line.26"></a>
-<span class="sourceLineNo">027</span> },<a name="line.27"></a>
-<span class="sourceLineNo">028</span> stylesheet="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.28"></a>
-<span class="sourceLineNo">029</span> ),<a name="line.29"></a>
-<span class="sourceLineNo">030</span> config="$S{juneau.configFile}"<a name="line.30"></a>
-<span class="sourceLineNo">031</span>)<a name="line.31"></a>
-<span class="sourceLineNo">032</span>public abstract class ResourceJena extends RestServletJenaDefault {}<a name="line.32"></a>
+<span class="sourceLineNo">015</span>import org.apache.juneau.jena.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import org.apache.juneau.rest.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span>import org.apache.juneau.rest.annotation.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span><a name="line.18"></a>
+<span class="sourceLineNo">019</span>/**<a name="line.19"></a>
+<span class="sourceLineNo">020</span> * Superclass for all REST resources with RDF support.<a name="line.20"></a>
+<span class="sourceLineNo">021</span> */<a name="line.21"></a>
+<span class="sourceLineNo">022</span>@SuppressWarnings("serial")<a name="line.22"></a>
+<span class="sourceLineNo">023</span>@RestResource(<a name="line.23"></a>
+<span class="sourceLineNo">024</span> htmldoc=@HtmlDoc(<a name="line.24"></a>
+<span class="sourceLineNo">025</span> links={<a name="line.25"></a>
+<span class="sourceLineNo">026</span> "up: request:/..",<a name="line.26"></a>
+<span class="sourceLineNo">027</span> "options: servlet:/?method=OPTIONS"<a name="line.27"></a>
+<span class="sourceLineNo">028</span> },<a name="line.28"></a>
+<span class="sourceLineNo">029</span> stylesheet="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.29"></a>
+<span class="sourceLineNo">030</span> ),<a name="line.30"></a>
+<span class="sourceLineNo">031</span> config="$S{juneau.configFile}",<a name="line.31"></a>
+<span class="sourceLineNo">032</span> serializers={<a name="line.32"></a>
+<span class="sourceLineNo">033</span> RdfSerializer.Xml.class,<a name="line.33"></a>
+<span class="sourceLineNo">034</span> RdfSerializer.XmlAbbrev.class,<a name="line.34"></a>
+<span class="sourceLineNo">035</span> RdfSerializer.Turtle.class,<a name="line.35"></a>
+<span class="sourceLineNo">036</span> RdfSerializer.NTriple.class,<a name="line.36"></a>
+<span class="sourceLineNo">037</span> RdfSerializer.N3.class<a name="line.37"></a>
+<span class="sourceLineNo">038</span> },<a name="line.38"></a>
+<span class="sourceLineNo">039</span> parsers={<a name="line.39"></a>
+<span class="sourceLineNo">040</span> RdfParser.Xml.class,<a name="line.40"></a>
+<span class="sourceLineNo">041</span> RdfParser.Turtle.class,<a name="line.41"></a>
+<span class="sourceLineNo">042</span> RdfParser.NTriple.class,<a name="line.42"></a>
+<span class="sourceLineNo">043</span> RdfParser.N3.class<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>public abstract class ResourceJena extends RestServletDefault {}<a name="line.46"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html
index a625c9c..9ffa9db 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html
@@ -23,9 +23,9 @@
<span class="sourceLineNo">015</span>import static javax.servlet.http.HttpServletResponse.*;<a name="line.15"></a>
<span class="sourceLineNo">016</span>import static org.apache.juneau.rest.annotation.HookEvent.*;<a name="line.16"></a>
<span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.rest.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.rest.annotation.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.rest.jena.*;<a name="line.20"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.jena.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.rest.*;<a name="line.19"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.rest.annotation.*;<a name="line.20"></a>
<span class="sourceLineNo">021</span>import org.apache.juneau.svl.vars.*;<a name="line.21"></a>
<span class="sourceLineNo">022</span><a name="line.22"></a>
<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
@@ -62,26 +62,39 @@
<span class="sourceLineNo">054</span> },<a name="line.54"></a>
<span class="sourceLineNo">055</span> stylesheet="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.55"></a>
<span class="sourceLineNo">056</span> ),<a name="line.56"></a>
-<span class="sourceLineNo">057</span> config="$S{juneau.configFile}"<a name="line.57"></a>
-<span class="sourceLineNo">058</span>)<a name="line.58"></a>
-<span class="sourceLineNo">059</span>public abstract class ResourceJenaGroup extends RestServletJenaGroupDefault {<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> * Add <code>$ARGS</code> and <code>$MF</code> variable resolvers.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * <a name="line.63"></a>
-<span class="sourceLineNo">064</span> * @param config The resource config.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * @throws Exception<a name="line.65"></a>
-<span class="sourceLineNo">066</span> */<a name="line.66"></a>
-<span class="sourceLineNo">067</span> @RestHook(INIT) <a name="line.67"></a>
-<span class="sourceLineNo">068</span> public void addConfigVars(RestConfig config) throws Exception {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> if (Microservice.getArgs() == null || Microservice.getConfig() == null)<a name="line.69"></a>
-<span class="sourceLineNo">070</span> throw new RestException(SC_INTERNAL_SERVER_ERROR, "Attempting to use ResourceJenaGroup class outside of RestMicroservice.");<a name="line.70"></a>
-<span class="sourceLineNo">071</span> config<a name="line.71"></a>
-<span class="sourceLineNo">072</span> .addVars(ArgsVar.class, ManifestFileVar.class)<a name="line.72"></a>
-<span class="sourceLineNo">073</span> .addVarContextObject(ArgsVar.SESSION_args, Microservice.getArgs())<a name="line.73"></a>
-<span class="sourceLineNo">074</span> .addVarContextObject(ManifestFileVar.SESSION_manifest, Microservice.getManifest());<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">057</span> config="$S{juneau.configFile}",<a name="line.57"></a>
+<span class="sourceLineNo">058</span> serializers={<a name="line.58"></a>
+<span class="sourceLineNo">059</span> RdfSerializer.Xml.class,<a name="line.59"></a>
+<span class="sourceLineNo">060</span> RdfSerializer.XmlAbbrev.class,<a name="line.60"></a>
+<span class="sourceLineNo">061</span> RdfSerializer.Turtle.class,<a name="line.61"></a>
+<span class="sourceLineNo">062</span> RdfSerializer.NTriple.class,<a name="line.62"></a>
+<span class="sourceLineNo">063</span> RdfSerializer.N3.class<a name="line.63"></a>
+<span class="sourceLineNo">064</span> },<a name="line.64"></a>
+<span class="sourceLineNo">065</span> parsers={<a name="line.65"></a>
+<span class="sourceLineNo">066</span> RdfParser.Xml.class,<a name="line.66"></a>
+<span class="sourceLineNo">067</span> RdfParser.Turtle.class,<a name="line.67"></a>
+<span class="sourceLineNo">068</span> RdfParser.NTriple.class,<a name="line.68"></a>
+<span class="sourceLineNo">069</span> RdfParser.N3.class<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>public abstract class ResourceJenaGroup extends RestServletGroupDefault {<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> * Add <code>$ARGS</code> and <code>$MF</code> variable resolvers.<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <a name="line.76"></a>
+<span class="sourceLineNo">077</span> * @param config The resource config.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * @throws Exception<a name="line.78"></a>
+<span class="sourceLineNo">079</span> */<a name="line.79"></a>
+<span class="sourceLineNo">080</span> @RestHook(INIT) <a name="line.80"></a>
+<span class="sourceLineNo">081</span> public void addConfigVars(RestConfig config) throws Exception {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> if (Microservice.getArgs() == null || Microservice.getConfig() == null)<a name="line.82"></a>
+<span class="sourceLineNo">083</span> throw new RestException(SC_INTERNAL_SERVER_ERROR, "Attempting to use ResourceJenaGroup class outside of RestMicroservice.");<a name="line.83"></a>
+<span class="sourceLineNo">084</span> config<a name="line.84"></a>
+<span class="sourceLineNo">085</span> .addVars(ArgsVar.class, ManifestFileVar.class)<a name="line.85"></a>
+<span class="sourceLineNo">086</span> .addVarContextObject(ArgsVar.SESSION_args, Microservice.getArgs())<a name="line.86"></a>
+<span class="sourceLineNo">087</span> .addVarContextObject(ManifestFileVar.SESSION_manifest, Microservice.getManifest());<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>
[18/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/ini/ConfigFileVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigFileVar.html b/content/site/apidocs/org/apache/juneau/ini/ConfigFileVar.html
new file mode 100644
index 0000000..4f68528
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/ini/ConfigFileVar.html
@@ -0,0 +1,418 @@
+<!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>ConfigFileVar (Apache Juneau (incubating) 6.3.2-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="ConfigFileVar (Apache Juneau (incubating) 6.3.2-incubating-SNAPSHOT)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var methods = {"i0":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/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFileVar.html" target="_top">Frames</a></li>
+<li><a href="ConfigFileVar.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.juneau.ini</div>
+<h2 title="Class ConfigFileVar" class="title">Class ConfigFileVar</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="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.Var</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.SimpleVar</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.DefaultingVar</a></li>
+<li>
+<ul class="inheritance">
+<li>org.apache.juneau.ini.ConfigFileVar</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileVar.html#line.48">ConfigFileVar</a>
+extends <a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></pre>
+<div class="block">Config file variable resolver.
+
+ <p>
+ The format for this var is <js>"$C{key[,defaultValue]}"</js>.
+ See <a href="../../../../org/apache/juneau/ini/ConfigFile.html#getString-java.lang.String-"><code>ConfigFile.getString(String)</code></a> for the format of the key.
+
+ <p>
+ This variable resolver requires that a <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object be set as a context object on the resolver or a
+ session object on the resolver session.
+
+ <h5 class='section'>Example:</h5>
+ <p class='bcode'>
+ <jc>// Create a config file object.</jc>
+ ConfigFile configFile = new ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>);
+
+ <jc>// Create a variable resolver that resolves config file entries (e.g. "$C{MySection/myKey}")</jc>
+ VarResolver r = <jk>new</jk> VarResolver().addVars(ConfigVar.<js>class</js>)
+ .addContextObject(<jsf>SESSION_config</jsf>, configFile);
+
+ <jc>// Use it!</jc>
+ System.<jsf>out</jsf>.println(r.resolve(<js>"Value for myKey in section MySection is $C{MySection/myKey}"</js>));
+ </p>
+
+ <p>
+ Since this is a <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>, any variables contained in the result will be recursively resolved.
+ Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a>,
+<a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="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/ini/ConfigFileVar.html#NAME">NAME</a></span></code>
+<div class="block">The name of this variable.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html#SESSION_config">SESSION_config</a></span></code>
+<div class="block">The name of the session or context object that identifies the <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html#ConfigFileVar--">ConfigFileVar</a></span>()</code>
+<div class="block">Constructor.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="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/ini/ConfigFileVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve</a></span>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> session,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)</code>
+<div class="block">The interface that needs to be implemented for subclasses of <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.svl.DefaultingVar">
+<!-- -->
+</a>
+<h3>Methods inherited from class org.apache.juneau.svl.<a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></h3>
+<code><a href="../../../../org/apache/juneau/svl/DefaultingVar.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">doResolve</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.svl.SimpleVar">
+<!-- -->
+</a>
+<h3>Methods inherited from class org.apache.juneau.svl.<a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl">SimpleVar</a></h3>
+<code><a href="../../../../org/apache/juneau/svl/SimpleVar.html#resolveTo-org.apache.juneau.svl.VarResolverSession-java.io.Writer-java.lang.String-">resolveTo</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.svl.Var">
+<!-- -->
+</a>
+<h3>Methods inherited from class org.apache.juneau.svl.<a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></h3>
+<code><a href="../../../../org/apache/juneau/svl/Var.html#getName--">getName</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 java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang
/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a name="SESSION_config">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SESSION_config</h4>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileVar.html#line.53">SESSION_config</a></pre>
+<div class="block">The name of the session or context object that identifies the <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.apache.juneau.ini.ConfigFileVar.SESSION_config">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="NAME">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NAME</h4>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileVar.html#line.56">NAME</a></pre>
+<div class="block">The name of this variable.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.apache.juneau.ini.ConfigFileVar.NAME">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ConfigFileVar--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ConfigFileVar</h4>
+<pre>public <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileVar.html#line.61">ConfigFileVar</a>()</pre>
+<div class="block">Constructor.</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a name="resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>resolve</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileVar.html#line.66">resolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> session,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">Var</a></code></span></div>
+<div class="block">The interface that needs to be implemented for subclasses of <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve</a></code> in class <code><a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>session</code> - The session object used for a single instance of a var resolution.</dd>
+<dd><code>key</code> - The inside argument of the variable.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The resolved 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/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFileVar.html" target="_top">Frames</a></li>
+<li><a href="ConfigFileVar.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html b/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html
index 2dcf161..341177f 100644
--- a/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html
+++ b/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.38">ConfigFileWrapped</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.37">ConfigFileWrapped</a>
extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></pre>
<div class="block">Wraps an instance of <a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><code>ConfigFileImpl</code></a> in an interface that will automatically replace <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>
variables.
@@ -462,7 +462,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>clear</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.58">clear</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.57">clear</a>()</pre>
</li>
</ul>
<a name="containsKey-java.lang.Object-">
@@ -471,7 +471,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>containsKey</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.63">containsKey</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> key)</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.62">containsKey</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> key)</pre>
</li>
</ul>
<a name="containsValue-java.lang.Object-">
@@ -480,7 +480,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>containsValue</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.68">containsValue</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.67">containsValue</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
</li>
</ul>
<a name="entrySet--">
@@ -489,7 +489,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>entrySet</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>>> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.73">entrySet</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>>> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.72">entrySet</a>()</pre>
</li>
</ul>
<a name="get-java.lang.Object-">
@@ -498,7 +498,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.78">get</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> key)</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.77">get</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> key)</pre>
</li>
</ul>
<a name="isEmpty--">
@@ -507,7 +507,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>isEmpty</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.83">isEmpty</a>()</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.82">isEmpty</a>()</pre>
</li>
</ul>
<a name="keySet--">
@@ -516,7 +516,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>keySet</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.88">keySet</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.87">keySet</a>()</pre>
</li>
</ul>
<a name="put-java.lang.String-org.apache.juneau.ini.Section-">
@@ -525,7 +525,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>put</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.93">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key,
+<pre>public <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.92">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key,
<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a> value)</pre>
</li>
</ul>
@@ -535,7 +535,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>putAll</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.98">putAll</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><? extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>> map)</pre>
+<pre>public void <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.97">putAll</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><? extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>> map)</pre>
</li>
</ul>
<a name="remove-java.lang.Object-">
@@ -544,7 +544,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>remove</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.103">remove</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> key)</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.102">remove</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> key)</pre>
</li>
</ul>
<a name="size--">
@@ -553,7 +553,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>size</h4>
-<pre>public int <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.108">size</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.107">size</a>()</pre>
</li>
</ul>
<a name="values--">
@@ -562,7 +562,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>values</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.113">values</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.112">values</a>()</pre>
</li>
</ul>
<a name="loadIfModified--">
@@ -571,7 +571,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>loadIfModified</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.118">loadIfModified</a>()
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.117">loadIfModified</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#loadIfModified--">ConfigFile</a></code></span></div>
<div class="block">Reloads this config file object from the persisted file contents if the modified timestamp on the file has changed.</div>
@@ -591,7 +591,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>load</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.124">load</a>()
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.123">load</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: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#load--">ConfigFile</a></code></span></div>
<div class="block">Loads this config file object from the persisted file contents.</div>
@@ -611,7 +611,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>load</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.130">load</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> r)
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.129">load</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> r)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#load-java.io.Reader-">ConfigFile</a></code></span></div>
<div class="block">Loads this config file object from the specified reader.</div>
@@ -633,7 +633,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>isEncoded</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.137">isEncoded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.136">isEncoded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#isEncoded-java.lang.String-">ConfigFile</a></code></span></div>
<div class="block">Returns <jk>true</jk> if the encoding flag is set on the specified entry.</div>
<dl>
@@ -652,7 +652,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>addLines</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.142">addLines</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> section,
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.141">addLines</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> section,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... lines)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addLines-java.lang.String-java.lang.String...-">ConfigFile</a></code></span></div>
<div class="block">Adds arbitrary lines to the specified config file section.
@@ -687,7 +687,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>addHeaderComments</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.148">addHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> section,
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.147">addHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> section,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... headerComments)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addHeaderComments-java.lang.String-java.lang.String...-">ConfigFile</a></code></span></div>
<div class="block">Adds header comments to the specified section.
@@ -725,7 +725,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>clearHeaderComments</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.154">clearHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> section)</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.153">clearHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> section)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#clearHeaderComments-java.lang.String-">ConfigFile</a></code></span></div>
<div class="block">Removes any header comments from the specified section.</div>
<dl>
@@ -744,7 +744,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getSection</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.160">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.159">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getSection-java.lang.String-">ConfigFile</a></code></span></div>
<div class="block">Gets the section with the specified name.</div>
<dl>
@@ -763,7 +763,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getSection</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.165">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.164">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
boolean create)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getSection-java.lang.String-boolean-">ConfigFile</a></code></span></div>
<div class="block">Gets the section with the specified name and optionally creates it if it's not there.</div>
@@ -784,7 +784,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>addSection</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.170">addSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.169">addSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addSection-java.lang.String-">ConfigFile</a></code></span></div>
<div class="block">Appends a section to this config file if it does not already exist.
@@ -806,7 +806,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>setSection</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.176">setSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.175">setSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> contents)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#setSection-java.lang.String-java.util.Map-">ConfigFile</a></code></span></div>
<div class="block">Creates or overwrites the specified section.</div>
@@ -827,7 +827,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>removeSection</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.182">removeSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.181">removeSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#removeSection-java.lang.String-">ConfigFile</a></code></span></div>
<div class="block">Removes the section with the specified name.</div>
<dl>
@@ -846,7 +846,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>save</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.188">save</a>()
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.187">save</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: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#save--">ConfigFile</a></code></span></div>
<div class="block">Saves this config file to disk.</div>
@@ -866,7 +866,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>serializeTo</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.194">serializeTo</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> out,
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.193">serializeTo</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> out,
<a href="../../../../org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini">ConfigFileFormat</a> format)
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: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#serializeTo-java.io.Writer-org.apache.juneau.ini.ConfigFileFormat-">ConfigFile</a></code></span></div>
@@ -890,7 +890,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>toString</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.200">toString</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.199">toString</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#toString--">ConfigFile</a></code></span></div>
<div class="block">Returns the config file contents as a string.
@@ -908,7 +908,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getResolving</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.205">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a> varResolver)</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.204">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a> varResolver)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getResolving-org.apache.juneau.svl.VarResolver-">ConfigFile</a></code></span></div>
<div class="block">Returns a wrapped instance of this config file where calls to getters have their values first resolved by the
specified <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.</div>
@@ -928,7 +928,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getResolving</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.211">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> varSession)</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.210">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a> varSession)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getResolving-org.apache.juneau.svl.VarResolverSession-">ConfigFile</a></code></span></div>
<div class="block">Returns a wrapped instance of this config file where calls to getters have their values first resolved by the
specified <a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl"><code>VarResolverSession</code></a>.</div>
@@ -948,7 +948,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getResolving</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.217">getResolving</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.216">getResolving</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getResolving--">ConfigFile</a></code></span></div>
<div class="block">Returns a wrapped instance of this config file where calls to getters have their values first resolved by a
default <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.
@@ -976,7 +976,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>addListener</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.222">addListener</a>(<a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a> listener)</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.221">addListener</a>(<a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a> listener)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addListener-org.apache.juneau.ini.ConfigFileListener-">ConfigFile</a></code></span></div>
<div class="block">Add a listener to this config file to react to modification events.</div>
<dl>
@@ -995,7 +995,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>toWritable</h4>
-<pre>public <a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.228">toWritable</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.227">toWritable</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#toWritable--">ConfigFile</a></code></span></div>
<div class="block">Wraps this config file in a <a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau"><code>Writable</code></a> interface that renders it as plain text.</div>
<dl>
@@ -1012,7 +1012,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>merge</h4>
-<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.233">merge</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> newCf)</pre>
+<pre>public <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.232">merge</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> newCf)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#merge-org.apache.juneau.ini.ConfigFile-">ConfigFile</a></code></span></div>
<div class="block">Merges the contents of the specified config file into this config file.
@@ -1035,7 +1035,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getBeanSession</h4>
-<pre>protected <a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.239">getBeanSession</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.238">getBeanSession</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getBeanSession--">ConfigFile</a></code></span></div>
<div class="block">Returns the reusable bean session associated with this config file.
@@ -1055,7 +1055,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.244">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionName,
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.243">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionName,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionKey)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#get-java.lang.String-java.lang.String-">ConfigFile</a></code></span></div>
<div class="block">Retrieves an entry value from this config file.</div>
@@ -1076,7 +1076,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>put</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.252">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionName,
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.251">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionName,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionKey,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> value,
boolean encoded)</pre>
@@ -1101,7 +1101,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>put</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.257">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionName,
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.256">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionName,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionKey,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value,
<a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> serializer,
@@ -1134,7 +1134,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>remove</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.263">remove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionName,
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.262">remove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionName,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionKey)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#remove-java.lang.String-java.lang.String-">ConfigFile</a></code></span></div>
<div class="block">Removes an entry from this config file.</div>
@@ -1155,7 +1155,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getSectionKeys</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.268">getSectionKeys</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionName)</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.267">getSectionKeys</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sectionName)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getSectionKeys-java.lang.String-">ConfigFile</a></code></span></div>
<div class="block">Returns the current set of keys in the specified section.</div>
<dl>
@@ -1174,7 +1174,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>readLock</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.273">readLock</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.272">readLock</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#readLock--">ConfigFile</a></code></span></div>
<div class="block">Places a read lock on this config file.</div>
<dl>
@@ -1189,7 +1189,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>readUnlock</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.278">readUnlock</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.277">readUnlock</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#readUnlock--">ConfigFile</a></code></span></div>
<div class="block">Removes the read lock on this config file.</div>
<dl>
@@ -1204,7 +1204,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>serialize</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.283">serialize</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o,
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.282">serialize</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o,
<a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> s,
boolean newline)
throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
@@ -1238,7 +1238,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
<ul class="blockListLast">
<li class="blockList">
<h4>parse</h4>
-<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.288">parse</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> s,
+<pre>protected <T> T <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.287">parse</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> s,
<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> parser,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
@@ -1288,7 +1288,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/ini/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/package-frame.html b/content/site/apidocs/org/apache/juneau/ini/package-frame.html
index 5a0d580..0393d5e 100644
--- a/content/site/apidocs/org/apache/juneau/ini/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/ini/package-frame.html
@@ -22,6 +22,7 @@
<li><a href="ConfigFileContext.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileContext</a></li>
<li><a href="ConfigFileImpl.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileImpl</a></li>
<li><a href="ConfigFileListener.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileListener</a></li>
+<li><a href="ConfigFileVar.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileVar</a></li>
<li><a href="ConfigFileWrapped.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileWrapped</a></li>
<li><a href="ConfigUtils.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigUtils</a></li>
<li><a href="EntryListener.html" title="class in org.apache.juneau.ini" target="classFrame">EntryListener</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/ini/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/package-summary.html b/content/site/apidocs/org/apache/juneau/ini/package-summary.html
index 4818dcf..2523fc2 100644
--- a/content/site/apidocs/org/apache/juneau/ini/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/ini/package-summary.html
@@ -133,37 +133,43 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></td>
+<td class="colLast">
+<div class="block">Config file variable resolver.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></td>
<td class="colLast">
<div class="block">Wraps an instance of <a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><code>ConfigFileImpl</code></a> in an interface that will automatically replace <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>
variables.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini">ConfigUtils</a></td>
<td class="colLast">
<div class="block">Internal utility methods.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/ini/EntryListener.html" title="class in org.apache.juneau.ini">EntryListener</a></td>
<td class="colLast">
<div class="block">Listener that can be used to listen for change events for a specific entry in a config file.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a></td>
<td class="colLast">
<div class="block">Defines a section in a config file.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/ini/SectionListener.html" title="class in org.apache.juneau.ini">SectionListener</a></td>
<td class="colLast">
<div class="block">Listener that can be used to listen for change events for a specific section in a config file.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/ini/XorEncoder.html" title="class in org.apache.juneau.ini">XorEncoder</a></td>
<td class="colLast">
<div class="block">Simply XOR+Base64 encoder for obscuring passwords and other sensitive data in INI config files.</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/ini/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ini/package-tree.html b/content/site/apidocs/org/apache/juneau/ini/package-tree.html
index 6e9c0ef..46405b7 100644
--- a/content/site/apidocs/org/apache/juneau/ini/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/ini/package-tree.html
@@ -100,6 +100,19 @@
</ul>
</li>
<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Section</span></a> (implements java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><K,V>)</li>
+<li type="circle">org.apache.juneau.svl.<a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">Var</span></a>
+<ul>
+<li type="circle">org.apache.juneau.svl.<a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">SimpleVar</span></a>
+<ul>
+<li type="circle">org.apache.juneau.svl.<a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">DefaultingVar</span></a>
+<ul>
+<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileVar</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/XorEncoder.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">XorEncoder</span></a> (implements org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/Encoder.html" title="interface in org.apache.juneau.ini">Encoder</a>)</li>
</ul>
</li>
[02/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCallException.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCallException.html b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCallException.html
index d49502c..01cf8c8 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCallException.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCallException.html
@@ -157,73 +157,75 @@
<span class="sourceLineNo">149</span> if (c != null)<a name="line.149"></a>
<span class="sourceLineNo">150</span> t = (Throwable)c.newInstance();<a name="line.150"></a>
<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span> } catch (Exception e2) { /* Ignore */ }<a name="line.152"></a>
-<span class="sourceLineNo">153</span> if (t != null)<a name="line.153"></a>
-<span class="sourceLineNo">154</span> throw t;<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> /**<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * Sets the HTTP response object that caused this exception.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> *<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * @param httpResponse The HTTP response object.<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> */<a name="line.163"></a>
-<span class="sourceLineNo">164</span> protected RestCallException setHttpResponse(HttpResponse httpResponse) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> this.httpResponse = httpResponse;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return this;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> /**<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * Returns the HTTP response object that caused this exception.<a name="line.170"></a>
-<span class="sourceLineNo">171</span> *<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * @return<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * The HTTP response object that caused this exception, or <jk>null</jk> if no response was created yet when the<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * exception was thrown.<a name="line.174"></a>
-<span class="sourceLineNo">175</span> */<a name="line.175"></a>
-<span class="sourceLineNo">176</span> public HttpResponse getHttpResponse() {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> return this.httpResponse;<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 HTTP response status code.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> *<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * @return The response status code. If a connection could not be made at all, returns <code>0</code>.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> */<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public int getResponseCode() {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> return responseCode;<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 HTTP response message body text.<a name="line.190"></a>
-<span class="sourceLineNo">191</span> *<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * @return The response message body text.<a name="line.192"></a>
-<span class="sourceLineNo">193</span> */<a name="line.193"></a>
-<span class="sourceLineNo">194</span> public String getResponseMessage() {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return response;<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 response status message as a plain string.<a name="line.199"></a>
-<span class="sourceLineNo">200</span> *<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * @return The response status message.<a name="line.201"></a>
-<span class="sourceLineNo">202</span> */<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public String getResponseStatusMessage() {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return responseStatusMessage;<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> * Sets the inner cause for this exception.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> *<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * @param cause The inner cause.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * @return This object (for method chaining).<a name="line.211"></a>
-<span class="sourceLineNo">212</span> */<a name="line.212"></a>
-<span class="sourceLineNo">213</span> @Override /* Throwable */<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public synchronized RestCallException initCause(Throwable cause) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> super.initCause(cause);<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">152</span> } catch (Exception e2) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> e2.printStackTrace();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span> if (t != null)<a name="line.155"></a>
+<span class="sourceLineNo">156</span> throw t;<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> /**<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * Sets the HTTP response object that caused this exception.<a name="line.161"></a>
+<span class="sourceLineNo">162</span> *<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * @param httpResponse The HTTP response object.<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @return This object (for method chaining).<a name="line.164"></a>
+<span class="sourceLineNo">165</span> */<a name="line.165"></a>
+<span class="sourceLineNo">166</span> protected RestCallException setHttpResponse(HttpResponse httpResponse) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> this.httpResponse = httpResponse;<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return this;<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 HTTP response object that caused this exception.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> *<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * @return<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * The HTTP response object that caused this exception, or <jk>null</jk> if no response was created yet when the<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * exception was thrown.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> */<a name="line.177"></a>
+<span class="sourceLineNo">178</span> public HttpResponse getHttpResponse() {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> return this.httpResponse;<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 HTTP response status code.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> *<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * @return The response status code. If a connection could not be made at all, returns <code>0</code>.<a name="line.185"></a>
+<span class="sourceLineNo">186</span> */<a name="line.186"></a>
+<span class="sourceLineNo">187</span> public int getResponseCode() {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return responseCode;<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> * Returns the HTTP response message body text.<a name="line.192"></a>
+<span class="sourceLineNo">193</span> *<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * @return The response message body text.<a name="line.194"></a>
+<span class="sourceLineNo">195</span> */<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public String getResponseMessage() {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> return response;<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> * Returns the response status message as a plain string.<a name="line.201"></a>
+<span class="sourceLineNo">202</span> *<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * @return The response status message.<a name="line.203"></a>
+<span class="sourceLineNo">204</span> */<a name="line.204"></a>
+<span class="sourceLineNo">205</span> public String getResponseStatusMessage() {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> return responseStatusMessage;<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> * Sets the inner cause for this exception.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> *<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * @param cause The inner cause.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> * @return This object (for method chaining).<a name="line.213"></a>
+<span class="sourceLineNo">214</span> */<a name="line.214"></a>
+<span class="sourceLineNo">215</span> @Override /* Throwable */<a name="line.215"></a>
+<span class="sourceLineNo">216</span> public synchronized RestCallException initCause(Throwable cause) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> super.initCause(cause);<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html b/content/site/apidocs/src-html/org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html
deleted file mode 100644
index 05b36a7..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../../../javadoc.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
-<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *<a name="line.2"></a>
-<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *<a name="line.3"></a>
-<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *<a name="line.4"></a>
-<span class="sourceLineNo">005</span>// * with the License. You may obtain a copy of the License at *<a name="line.5"></a>
-<span class="sourceLineNo">006</span>// * *<a name="line.6"></a>
-<span class="sourceLineNo">007</span>// * http://www.apache.org/licenses/LICENSE-2.0 *<a name="line.7"></a>
-<span class="sourceLineNo">008</span>// * *<a name="line.8"></a>
-<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *<a name="line.9"></a>
-<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *<a name="line.10"></a>
-<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License. *<a name="line.11"></a>
-<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
-<span class="sourceLineNo">013</span>package org.apache.juneau.rest.jaxrs.rdf;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import javax.ws.rs.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import javax.ws.rs.ext.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.html.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.jena.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.jso.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.json.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.rest.jaxrs.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.rest.jena.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.soap.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.urlencoding.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.xml.*;<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> * JAX-RS provider for the same serialize/parse support provided by the {@link RestServletJenaDefault} class.<a name="line.29"></a>
-<span class="sourceLineNo">030</span> */<a name="line.30"></a>
-<span class="sourceLineNo">031</span>@Provider<a name="line.31"></a>
-<span class="sourceLineNo">032</span>@Produces({<a name="line.32"></a>
-<span class="sourceLineNo">033</span> "application/json", "text/json", // JsonSerializer<a name="line.33"></a>
-<span class="sourceLineNo">034</span> "application/json+simple","text/json+simple", // JsonSerializer.Simple<a name="line.34"></a>
-<span class="sourceLineNo">035</span> "application/json+schema","text/json+schema", // JsonSchemaSerializer<a name="line.35"></a>
-<span class="sourceLineNo">036</span> "text/xml", // XmlDocSerializer.Ns<a name="line.36"></a>
-<span class="sourceLineNo">037</span> "text/xml+simple", // XmlDocSerializer<a name="line.37"></a>
-<span class="sourceLineNo">038</span> "text/xml+schema", // XmlSchemaDocSerializer<a name="line.38"></a>
-<span class="sourceLineNo">039</span> "text/html", // HtmlDocSerializer<a name="line.39"></a>
-<span class="sourceLineNo">040</span> "application/x-www-form-urlencoded", // UrlEncodingSerializer<a name="line.40"></a>
-<span class="sourceLineNo">041</span> "text/xml+soap", // SoapXmlSerializer<a name="line.41"></a>
-<span class="sourceLineNo">042</span> "text/xml+rdf", // RdfSerializer.Xml<a name="line.42"></a>
-<span class="sourceLineNo">043</span> "text/xml+rdf+abbrev", // RdfSerializer.XmlAbbrev<a name="line.43"></a>
-<span class="sourceLineNo">044</span> "text/n-triple", // RdfSerializer.NTriple<a name="line.44"></a>
-<span class="sourceLineNo">045</span> "text/turtle", // RdfSerializer.Turtle<a name="line.45"></a>
-<span class="sourceLineNo">046</span> "text/n3", // RdfSerializer.N3<a name="line.46"></a>
-<span class="sourceLineNo">047</span> "application/x-java-serialized-object" // JavaSerializedObjectSerializer<a name="line.47"></a>
-<span class="sourceLineNo">048</span>})<a name="line.48"></a>
-<span class="sourceLineNo">049</span>@Consumes({<a name="line.49"></a>
-<span class="sourceLineNo">050</span> "application/json", "text/json", // JsonParser<a name="line.50"></a>
-<span class="sourceLineNo">051</span> "text/xml", // XmlParser<a name="line.51"></a>
-<span class="sourceLineNo">052</span> "text/html", // HtmlParser<a name="line.52"></a>
-<span class="sourceLineNo">053</span> "application/x-www-form-urlencoded", // UrlEncodingParser<a name="line.53"></a>
-<span class="sourceLineNo">054</span> "text/xml+rdf", // RdfParser.Xml<a name="line.54"></a>
-<span class="sourceLineNo">055</span> "text/n-triple", // RdfParser.NTriple<a name="line.55"></a>
-<span class="sourceLineNo">056</span> "text/turtle", // RdfParser.Turtle<a name="line.56"></a>
-<span class="sourceLineNo">057</span> "text/n3", // RdfParser.N3<a name="line.57"></a>
-<span class="sourceLineNo">058</span> "application/x-java-serialized-object" // JavaSerializedObjectParser<a name="line.58"></a>
-<span class="sourceLineNo">059</span>})<a name="line.59"></a>
-<span class="sourceLineNo">060</span>@JuneauProvider(<a name="line.60"></a>
-<span class="sourceLineNo">061</span> serializers={<a name="line.61"></a>
-<span class="sourceLineNo">062</span> JsonSerializer.class,<a name="line.62"></a>
-<span class="sourceLineNo">063</span> JsonSerializer.Simple.class,<a name="line.63"></a>
-<span class="sourceLineNo">064</span> JsonSchemaSerializer.class,<a name="line.64"></a>
-<span class="sourceLineNo">065</span> XmlDocSerializer.Ns.class,<a name="line.65"></a>
-<span class="sourceLineNo">066</span> XmlSchemaDocSerializer.class,<a name="line.66"></a>
-<span class="sourceLineNo">067</span> HtmlDocSerializer.class,<a name="line.67"></a>
-<span class="sourceLineNo">068</span> UrlEncodingSerializer.class,<a name="line.68"></a>
-<span class="sourceLineNo">069</span> SoapXmlSerializer.class,<a name="line.69"></a>
-<span class="sourceLineNo">070</span> RdfSerializer.Xml.class,<a name="line.70"></a>
-<span class="sourceLineNo">071</span> RdfSerializer.XmlAbbrev.class,<a name="line.71"></a>
-<span class="sourceLineNo">072</span> RdfSerializer.NTriple.class,<a name="line.72"></a>
-<span class="sourceLineNo">073</span> RdfSerializer.Turtle.class,<a name="line.73"></a>
-<span class="sourceLineNo">074</span> RdfSerializer.N3.class,<a name="line.74"></a>
-<span class="sourceLineNo">075</span> JsoSerializer.class<a name="line.75"></a>
-<span class="sourceLineNo">076</span> },<a name="line.76"></a>
-<span class="sourceLineNo">077</span> parsers={<a name="line.77"></a>
-<span class="sourceLineNo">078</span> JsonParser.class,<a name="line.78"></a>
-<span class="sourceLineNo">079</span> XmlParser.class,<a name="line.79"></a>
-<span class="sourceLineNo">080</span> HtmlParser.class,<a name="line.80"></a>
-<span class="sourceLineNo">081</span> UrlEncodingParser.class,<a name="line.81"></a>
-<span class="sourceLineNo">082</span> RdfParser.Xml.class,<a name="line.82"></a>
-<span class="sourceLineNo">083</span> RdfParser.NTriple.class,<a name="line.83"></a>
-<span class="sourceLineNo">084</span> RdfParser.Turtle.class,<a name="line.84"></a>
-<span class="sourceLineNo">085</span> RdfParser.N3.class<a name="line.85"></a>
-<span class="sourceLineNo">086</span> }<a name="line.86"></a>
-<span class="sourceLineNo">087</span>)<a name="line.87"></a>
-<span class="sourceLineNo">088</span>public final class DefaultJenaProvider extends BaseProvider {}<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/jena/RestServletJenaDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/jena/RestServletJenaDefault.html b/content/site/apidocs/src-html/org/apache/juneau/rest/jena/RestServletJenaDefault.html
deleted file mode 100644
index 4a00f88..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/jena/RestServletJenaDefault.html
+++ /dev/null
@@ -1,353 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../../javadoc.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
-<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *<a name="line.2"></a>
-<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *<a name="line.3"></a>
-<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *<a name="line.4"></a>
-<span class="sourceLineNo">005</span>// * with the License. You may obtain a copy of the License at *<a name="line.5"></a>
-<span class="sourceLineNo">006</span>// * *<a name="line.6"></a>
-<span class="sourceLineNo">007</span>// * http://www.apache.org/licenses/LICENSE-2.0 *<a name="line.7"></a>
-<span class="sourceLineNo">008</span>// * *<a name="line.8"></a>
-<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *<a name="line.9"></a>
-<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *<a name="line.10"></a>
-<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License. *<a name="line.11"></a>
-<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
-<span class="sourceLineNo">013</span>package org.apache.juneau.rest.jena;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static org.apache.juneau.rest.RestContext.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.dto.swagger.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.html.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.jena.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.jso.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.json.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.msgpack.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.plaintext.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.rest.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.rest.annotation.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.soap.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.uon.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.urlencoding.*;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.juneau.xml.*;<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> * Subclass of {@link RestServlet} with default sets of serializers and parsers that include RDF support.<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <p><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * Extends the {@link org.apache.juneau.rest.RestServletDefault} class with additional RDF support.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <p><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * </p><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <table class='styled'><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <tr><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <th>Accept</th><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <th>Content-Type</th><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <th>Serializer</th><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * </tr><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <tr><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <td class='code'><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * application/json<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <br>text/json<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * </td><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <td class='code'>application/json</td><a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <td>{@link JsonSerializer}</td><a name="line.52"></a>
-<span class="sourceLineNo">053</span> * </tr><a name="line.53"></a>
-<span class="sourceLineNo">054</span> * <tr><a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <td class='code'><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * application/json+simple<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <br>text/json+simple<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * </td><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * <td class='code'>application/json</td><a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <td>{@link org.apache.juneau.json.JsonSerializer.Simple}</td><a name="line.60"></a>
-<span class="sourceLineNo">061</span> * </tr><a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <tr><a name="line.62"></a>
-<span class="sourceLineNo">063</span> * <td class='code'><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * application/json+schema<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * <br>text/json+schema<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * </td><a name="line.66"></a>
-<span class="sourceLineNo">067</span> * <td class='code'>application/json</td><a name="line.67"></a>
-<span class="sourceLineNo">068</span> * <td>{@link JsonSchemaSerializer}</td><a name="line.68"></a>
-<span class="sourceLineNo">069</span> * </tr><a name="line.69"></a>
-<span class="sourceLineNo">070</span> * <tr><a name="line.70"></a>
-<span class="sourceLineNo">071</span> * <td class='code'>text/xml</td><a name="line.71"></a>
-<span class="sourceLineNo">072</span> * <td class='code'>text/xml</td><a name="line.72"></a>
-<span class="sourceLineNo">073</span> * <td>{@link XmlDocSerializer}</td><a name="line.73"></a>
-<span class="sourceLineNo">074</span> * </tr><a name="line.74"></a>
-<span class="sourceLineNo">075</span> * <tr><a name="line.75"></a>
-<span class="sourceLineNo">076</span> * <td class='code'>text/xml+schema</td><a name="line.76"></a>
-<span class="sourceLineNo">077</span> * <td class='code'>text/xml</td><a name="line.77"></a>
-<span class="sourceLineNo">078</span> * <td>{@link XmlSchemaDocSerializer}</td><a name="line.78"></a>
-<span class="sourceLineNo">079</span> * </tr><a name="line.79"></a>
-<span class="sourceLineNo">080</span> * <tr><a name="line.80"></a>
-<span class="sourceLineNo">081</span> * <td class='code'>text/html</td><a name="line.81"></a>
-<span class="sourceLineNo">082</span> * <td class='code'>text/html</td><a name="line.82"></a>
-<span class="sourceLineNo">083</span> * <td>{@link HtmlDocSerializer}</td><a name="line.83"></a>
-<span class="sourceLineNo">084</span> * </tr><a name="line.84"></a>
-<span class="sourceLineNo">085</span> * <tr><a name="line.85"></a>
-<span class="sourceLineNo">086</span> * <td class='code'>text/html+stripped</td><a name="line.86"></a>
-<span class="sourceLineNo">087</span> * <td class='code'>text/html</td><a name="line.87"></a>
-<span class="sourceLineNo">088</span> * <td>{@link HtmlStrippedDocSerializer}</td><a name="line.88"></a>
-<span class="sourceLineNo">089</span> * </tr><a name="line.89"></a>
-<span class="sourceLineNo">090</span> * <tr><a name="line.90"></a>
-<span class="sourceLineNo">091</span> * <td class='code'>text/uon</td><a name="line.91"></a>
-<span class="sourceLineNo">092</span> * <td class='code'>text/uon</td><a name="line.92"></a>
-<span class="sourceLineNo">093</span> * <td>{@link UonSerializer}</td><a name="line.93"></a>
-<span class="sourceLineNo">094</span> * </tr><a name="line.94"></a>
-<span class="sourceLineNo">095</span> * <tr><a name="line.95"></a>
-<span class="sourceLineNo">096</span> * <td class='code'>application/x-www-form-urlencoded</td><a name="line.96"></a>
-<span class="sourceLineNo">097</span> * <td class='code'>application/x-www-form-urlencoded</td><a name="line.97"></a>
-<span class="sourceLineNo">098</span> * <td>{@link UrlEncodingSerializer}</td><a name="line.98"></a>
-<span class="sourceLineNo">099</span> * </tr><a name="line.99"></a>
-<span class="sourceLineNo">100</span> * <tr><a name="line.100"></a>
-<span class="sourceLineNo">101</span> * <td class='code'>text/xml+soap</td><a name="line.101"></a>
-<span class="sourceLineNo">102</span> * <td class='code'>text/xml</td><a name="line.102"></a>
-<span class="sourceLineNo">103</span> * <td>{@link SoapXmlSerializer}</td><a name="line.103"></a>
-<span class="sourceLineNo">104</span> * </tr><a name="line.104"></a>
-<span class="sourceLineNo">105</span> * <tr><a name="line.105"></a>
-<span class="sourceLineNo">106</span> * <td class='code'>text/plain</td><a name="line.106"></a>
-<span class="sourceLineNo">107</span> * <td class='code'>text/plain</td><a name="line.107"></a>
-<span class="sourceLineNo">108</span> * <td>{@link PlainTextSerializer}</td><a name="line.108"></a>
-<span class="sourceLineNo">109</span> * </tr><a name="line.109"></a>
-<span class="sourceLineNo">110</span> * <tr><a name="line.110"></a>
-<span class="sourceLineNo">111</span> * <td class='code'>text/plain</td><a name="line.111"></a>
-<span class="sourceLineNo">112</span> * <td class='code'>text/plain</td><a name="line.112"></a>
-<span class="sourceLineNo">113</span> * <td>{@link PlainTextSerializer}</td><a name="line.113"></a>
-<span class="sourceLineNo">114</span> * </tr><a name="line.114"></a>
-<span class="sourceLineNo">115</span> * <tr><a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <td class='code'>application/x-java-serialized-object</td><a name="line.116"></a>
-<span class="sourceLineNo">117</span> * <td class='code'>application/x-java-serialized-object</td><a name="line.117"></a>
-<span class="sourceLineNo">118</span> * <td>{@link JsoSerializer}</td><a name="line.118"></a>
-<span class="sourceLineNo">119</span> * </tr><a name="line.119"></a>
-<span class="sourceLineNo">120</span> * <tr><a name="line.120"></a>
-<span class="sourceLineNo">121</span> * <td class='code'>text/xml+rdf</td><a name="line.121"></a>
-<span class="sourceLineNo">122</span> * <td class='code'>text/xml+rdf</td><a name="line.122"></a>
-<span class="sourceLineNo">123</span> * <td>{@link org.apache.juneau.jena.RdfSerializer.Xml}</td><a name="line.123"></a>
-<span class="sourceLineNo">124</span> * </tr><a name="line.124"></a>
-<span class="sourceLineNo">125</span> * <tr><a name="line.125"></a>
-<span class="sourceLineNo">126</span> * <td class='code'>text/xml+rdf+abbrev</td><a name="line.126"></a>
-<span class="sourceLineNo">127</span> * <td class='code'>text/xml+rdf</td><a name="line.127"></a>
-<span class="sourceLineNo">128</span> * <td>{@link org.apache.juneau.jena.RdfSerializer.XmlAbbrev}</td><a name="line.128"></a>
-<span class="sourceLineNo">129</span> * </tr><a name="line.129"></a>
-<span class="sourceLineNo">130</span> * <tr><a name="line.130"></a>
-<span class="sourceLineNo">131</span> * <td class='code'>text/n3</td><a name="line.131"></a>
-<span class="sourceLineNo">132</span> * <td class='code'>text/n3</td><a name="line.132"></a>
-<span class="sourceLineNo">133</span> * <td>{@link org.apache.juneau.jena.RdfSerializer.N3}</td><a name="line.133"></a>
-<span class="sourceLineNo">134</span> * </tr><a name="line.134"></a>
-<span class="sourceLineNo">135</span> * <tr><a name="line.135"></a>
-<span class="sourceLineNo">136</span> * <td class='code'>text/n-triple</td><a name="line.136"></a>
-<span class="sourceLineNo">137</span> * <td class='code'>text/n-triple</td><a name="line.137"></a>
-<span class="sourceLineNo">138</span> * <td>{@link org.apache.juneau.jena.RdfSerializer.NTriple}</td><a name="line.138"></a>
-<span class="sourceLineNo">139</span> * </tr><a name="line.139"></a>
-<span class="sourceLineNo">140</span> * <tr><a name="line.140"></a>
-<span class="sourceLineNo">141</span> * <td class='code'>text/turtle</td><a name="line.141"></a>
-<span class="sourceLineNo">142</span> * <td class='code'>text/turtle</td><a name="line.142"></a>
-<span class="sourceLineNo">143</span> * <td>{@link org.apache.juneau.jena.RdfSerializer.Turtle}</td><a name="line.143"></a>
-<span class="sourceLineNo">144</span> * </tr><a name="line.144"></a>
-<span class="sourceLineNo">145</span> * </table><a name="line.145"></a>
-<span class="sourceLineNo">146</span> * <p><a name="line.146"></a>
-<span class="sourceLineNo">147</span> * Supports the following request <code>Content-Type</code> header values:<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * </p><a name="line.148"></a>
-<span class="sourceLineNo">149</span> * <table class='styled'><a name="line.149"></a>
-<span class="sourceLineNo">150</span> * <tr><a name="line.150"></a>
-<span class="sourceLineNo">151</span> * <th>Content-Type</th><a name="line.151"></a>
-<span class="sourceLineNo">152</span> * <th>Parser</th><a name="line.152"></a>
-<span class="sourceLineNo">153</span> * </tr><a name="line.153"></a>
-<span class="sourceLineNo">154</span> * <tr><a name="line.154"></a>
-<span class="sourceLineNo">155</span> * <td class='code'><a name="line.155"></a>
-<span class="sourceLineNo">156</span> * application/json<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * <br>text/json<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * </td><a name="line.158"></a>
-<span class="sourceLineNo">159</span> * <td>{@link JsonParser}</td><a name="line.159"></a>
-<span class="sourceLineNo">160</span> * </tr><a name="line.160"></a>
-<span class="sourceLineNo">161</span> * <tr><a name="line.161"></a>
-<span class="sourceLineNo">162</span> * <td class='code'><a name="line.162"></a>
-<span class="sourceLineNo">163</span> * text/xml<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * <br>application/xml<a name="line.164"></a>
-<span class="sourceLineNo">165</span> * </td><a name="line.165"></a>
-<span class="sourceLineNo">166</span> * <td>{@link XmlParser}</td><a name="line.166"></a>
-<span class="sourceLineNo">167</span> * </tr><a name="line.167"></a>
-<span class="sourceLineNo">168</span> * <tr><a name="line.168"></a>
-<span class="sourceLineNo">169</span> * <td class='code'><a name="line.169"></a>
-<span class="sourceLineNo">170</span> * text/html<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * <br>text/html+stripped<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * </td><a name="line.172"></a>
-<span class="sourceLineNo">173</span> * <td>{@link HtmlParser}</td><a name="line.173"></a>
-<span class="sourceLineNo">174</span> * </tr><a name="line.174"></a>
-<span class="sourceLineNo">175</span> * <tr><a name="line.175"></a>
-<span class="sourceLineNo">176</span> * <td class='code'>text/uon</td><a name="line.176"></a>
-<span class="sourceLineNo">177</span> * <td>{@link UonParser}</td><a name="line.177"></a>
-<span class="sourceLineNo">178</span> * </tr><a name="line.178"></a>
-<span class="sourceLineNo">179</span> * <tr><a name="line.179"></a>
-<span class="sourceLineNo">180</span> * <td class='code'>application/x-www-form-urlencoded</td><a name="line.180"></a>
-<span class="sourceLineNo">181</span> * <td>{@link UrlEncodingParser}</td><a name="line.181"></a>
-<span class="sourceLineNo">182</span> * </tr><a name="line.182"></a>
-<span class="sourceLineNo">183</span> * <tr><a name="line.183"></a>
-<span class="sourceLineNo">184</span> * <td class='code'>text/plain</td><a name="line.184"></a>
-<span class="sourceLineNo">185</span> * <td>{@link PlainTextParser}</td><a name="line.185"></a>
-<span class="sourceLineNo">186</span> * </tr><a name="line.186"></a>
-<span class="sourceLineNo">187</span> * <tr><a name="line.187"></a>
-<span class="sourceLineNo">188</span> * <td class='code'>text/xml+rdf</td><a name="line.188"></a>
-<span class="sourceLineNo">189</span> * <td>{@link org.apache.juneau.jena.RdfParser.Xml}</td><a name="line.189"></a>
-<span class="sourceLineNo">190</span> * </tr><a name="line.190"></a>
-<span class="sourceLineNo">191</span> * <tr><a name="line.191"></a>
-<span class="sourceLineNo">192</span> * <td class='code'>text/n3</td><a name="line.192"></a>
-<span class="sourceLineNo">193</span> * <td>{@link org.apache.juneau.jena.RdfParser.N3}</td><a name="line.193"></a>
-<span class="sourceLineNo">194</span> * </tr><a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <tr><a name="line.195"></a>
-<span class="sourceLineNo">196</span> * <td class='code'>text/n-triple</td><a name="line.196"></a>
-<span class="sourceLineNo">197</span> * <td>{@link org.apache.juneau.jena.RdfParser.NTriple}</td><a name="line.197"></a>
-<span class="sourceLineNo">198</span> * </tr><a name="line.198"></a>
-<span class="sourceLineNo">199</span> * <tr><a name="line.199"></a>
-<span class="sourceLineNo">200</span> * <td class='code'>text/turtle</td><a name="line.200"></a>
-<span class="sourceLineNo">201</span> * <td>{@link org.apache.juneau.jena.RdfParser.Turtle}</td><a name="line.201"></a>
-<span class="sourceLineNo">202</span> * </tr><a name="line.202"></a>
-<span class="sourceLineNo">203</span> * </table><a name="line.203"></a>
-<span class="sourceLineNo">204</span> *<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * <p><a name="line.205"></a>
-<span class="sourceLineNo">206</span> * Note that the list of serializers and parsers can be appended to using the<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * {@link RestResource#serializers() @RestResource.serializers()} and<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * {@link RestResource#parsers() @RestResource.parsers()} annotations on subclasses.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>@RestResource(<a name="line.210"></a>
-<span class="sourceLineNo">211</span> serializers={<a name="line.211"></a>
-<span class="sourceLineNo">212</span> HtmlDocSerializer.class, // HTML must be listed first because Internet Explore does not include text/html in their Accept header.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> HtmlStrippedDocSerializer.class,<a name="line.213"></a>
-<span class="sourceLineNo">214</span> HtmlSchemaDocSerializer.class,<a name="line.214"></a>
-<span class="sourceLineNo">215</span> JsonSerializer.class,<a name="line.215"></a>
-<span class="sourceLineNo">216</span> JsonSerializer.Simple.class,<a name="line.216"></a>
-<span class="sourceLineNo">217</span> JsonSchemaSerializer.class,<a name="line.217"></a>
-<span class="sourceLineNo">218</span> XmlDocSerializer.class,<a name="line.218"></a>
-<span class="sourceLineNo">219</span> XmlSchemaDocSerializer.class,<a name="line.219"></a>
-<span class="sourceLineNo">220</span> UonSerializer.class,<a name="line.220"></a>
-<span class="sourceLineNo">221</span> UrlEncodingSerializer.class,<a name="line.221"></a>
-<span class="sourceLineNo">222</span> MsgPackSerializer.class,<a name="line.222"></a>
-<span class="sourceLineNo">223</span> SoapXmlSerializer.class,<a name="line.223"></a>
-<span class="sourceLineNo">224</span> PlainTextSerializer.class,<a name="line.224"></a>
-<span class="sourceLineNo">225</span> RdfSerializer.Xml.class,<a name="line.225"></a>
-<span class="sourceLineNo">226</span> RdfSerializer.XmlAbbrev.class,<a name="line.226"></a>
-<span class="sourceLineNo">227</span> RdfSerializer.N3.class,<a name="line.227"></a>
-<span class="sourceLineNo">228</span> RdfSerializer.NTriple.class,<a name="line.228"></a>
-<span class="sourceLineNo">229</span> RdfSerializer.Turtle.class,<a name="line.229"></a>
-<span class="sourceLineNo">230</span> },<a name="line.230"></a>
-<span class="sourceLineNo">231</span> parsers={<a name="line.231"></a>
-<span class="sourceLineNo">232</span> JsonParser.class,<a name="line.232"></a>
-<span class="sourceLineNo">233</span> XmlParser.class,<a name="line.233"></a>
-<span class="sourceLineNo">234</span> HtmlParser.class,<a name="line.234"></a>
-<span class="sourceLineNo">235</span> UonParser.class,<a name="line.235"></a>
-<span class="sourceLineNo">236</span> UrlEncodingParser.class,<a name="line.236"></a>
-<span class="sourceLineNo">237</span> MsgPackParser.class,<a name="line.237"></a>
-<span class="sourceLineNo">238</span> RdfParser.Xml.class,<a name="line.238"></a>
-<span class="sourceLineNo">239</span> RdfParser.N3.class,<a name="line.239"></a>
-<span class="sourceLineNo">240</span> RdfParser.NTriple.class,<a name="line.240"></a>
-<span class="sourceLineNo">241</span> RdfParser.Turtle.class<a name="line.241"></a>
-<span class="sourceLineNo">242</span> },<a name="line.242"></a>
-<span class="sourceLineNo">243</span> properties={<a name="line.243"></a>
-<span class="sourceLineNo">244</span> // Allow &method parameter on safe HTTP methods.<a name="line.244"></a>
-<span class="sourceLineNo">245</span> @Property(name=REST_allowMethodParam, value="OPTIONS")<a name="line.245"></a>
-<span class="sourceLineNo">246</span> },<a name="line.246"></a>
-<span class="sourceLineNo">247</span> htmldoc=@HtmlDoc(<a name="line.247"></a>
-<span class="sourceLineNo">248</span> header={<a name="line.248"></a>
-<span class="sourceLineNo">249</span> "<h1>$R{servletTitle}</h1>",<a name="line.249"></a>
-<span class="sourceLineNo">250</span> "<h2>$R{methodSummary,$R{servletDescription}}</h2>",<a name="line.250"></a>
-<span class="sourceLineNo">251</span> "<a href='http://juneau.apache.org'><img src='$U{servlet:/htdocs/juneau.png}' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/></a>"<a name="line.251"></a>
-<span class="sourceLineNo">252</span> },<a name="line.252"></a>
-<span class="sourceLineNo">253</span> stylesheet="servlet:/styles/light.css"<a name="line.253"></a>
-<span class="sourceLineNo">254</span> ),<a name="line.254"></a>
-<span class="sourceLineNo">255</span> favicon="htdocs/juneau.png",<a name="line.255"></a>
-<span class="sourceLineNo">256</span> staticFiles="{htdocs:'htdocs',styles:'styles'}"<a name="line.256"></a>
-<span class="sourceLineNo">257</span>)<a name="line.257"></a>
-<span class="sourceLineNo">258</span>public abstract class RestServletJenaDefault extends RestServlet {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> private static final long serialVersionUID = 1L;<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> * [OPTIONS /*] - Show resource options.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> *<a name="line.263"></a>
-<span class="sourceLineNo">264</span> * @param req The HTTP request.<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * @return The bean containing the contents of the OPTIONS page.<a name="line.265"></a>
-<span class="sourceLineNo">266</span> */<a name="line.266"></a>
-<span class="sourceLineNo">267</span> @RestMethod(name="OPTIONS", path="/*",<a name="line.267"></a>
-<span class="sourceLineNo">268</span> htmldoc=@HtmlDoc(<a name="line.268"></a>
-<span class="sourceLineNo">269</span> links={<a name="line.269"></a>
-<span class="sourceLineNo">270</span> "back: servlet:/",<a name="line.270"></a>
-<span class="sourceLineNo">271</span> "json: servlet:/?method=OPTIONS&Accept=text/json&plainText=true"<a name="line.271"></a>
-<span class="sourceLineNo">272</span> },<a name="line.272"></a>
-<span class="sourceLineNo">273</span> aside="NONE"<a name="line.273"></a>
-<span class="sourceLineNo">274</span> ),<a name="line.274"></a>
-<span class="sourceLineNo">275</span> summary="Swagger documentation",<a name="line.275"></a>
-<span class="sourceLineNo">276</span> description="Auto-generated swagger documentation for this resource"<a name="line.276"></a>
-<span class="sourceLineNo">277</span> )<a name="line.277"></a>
-<span class="sourceLineNo">278</span> public Swagger getOptions(RestRequest req) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> return req.getSwagger();<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>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html b/content/site/apidocs/src-html/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html
deleted file mode 100644
index 27e5121..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../../javadoc.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
-<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *<a name="line.2"></a>
-<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *<a name="line.3"></a>
-<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *<a name="line.4"></a>
-<span class="sourceLineNo">005</span>// * with the License. You may obtain a copy of the License at *<a name="line.5"></a>
-<span class="sourceLineNo">006</span>// * *<a name="line.6"></a>
-<span class="sourceLineNo">007</span>// * http://www.apache.org/licenses/LICENSE-2.0 *<a name="line.7"></a>
-<span class="sourceLineNo">008</span>// * *<a name="line.8"></a>
-<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *<a name="line.9"></a>
-<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *<a name="line.10"></a>
-<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License. *<a name="line.11"></a>
-<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
-<span class="sourceLineNo">013</span>package org.apache.juneau.rest.jena;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import org.apache.juneau.rest.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import org.apache.juneau.rest.annotation.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.rest.labels.*;<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> * Specialized subclass of {@link RestServletJenaDefault} for showing "group" pages.<a name="line.20"></a>
-<span class="sourceLineNo">021</span> *<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * <p><a name="line.22"></a>
-<span class="sourceLineNo">023</span> * Group pages consist of simple lists of child resource URLs and their labels.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * They're meant to be used as jumping-off points for child resources.<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
-<span class="sourceLineNo">027</span> * Child resources are specified using the {@link RestResource#children()} annotation.<a name="line.27"></a>
-<span class="sourceLineNo">028</span> */<a name="line.28"></a>
-<span class="sourceLineNo">029</span>@RestResource()<a name="line.29"></a>
-<span class="sourceLineNo">030</span>public abstract class RestServletJenaGroupDefault extends RestServletJenaDefault {<a name="line.30"></a>
-<span class="sourceLineNo">031</span> private static final long serialVersionUID = 1L;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span> /**<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * [GET /] - Get child resources.<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * @param req The HTTP request<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * @return The bean containing links to the child resources.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> */<a name="line.38"></a>
-<span class="sourceLineNo">039</span> @RestMethod(name="GET", path="/", description="Child resources")<a name="line.39"></a>
-<span class="sourceLineNo">040</span> public ChildResourceDescriptions getChildren(RestRequest req) {<a name="line.40"></a>
-<span class="sourceLineNo">041</span> return new ChildResourceDescriptions(getContext(), req);<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>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
[06/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/microservice/sample/HelloWorldResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/sample/HelloWorldResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/sample/HelloWorldResource.html
new file mode 100644
index 0000000..a3679dc
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/sample/HelloWorldResource.html
@@ -0,0 +1,107 @@
+<!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.microservice.sample;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import org.apache.juneau.microservice.Resource;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import org.apache.juneau.rest.annotation.RestMethod;<a name="line.16"></a>
+<span class="sourceLineNo">017</span>import org.apache.juneau.rest.annotation.RestResource;<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> * Sample REST resource that prints out a simple "Hello world!" message.<a name="line.20"></a>
+<span class="sourceLineNo">021</span> */<a name="line.21"></a>
+<span class="sourceLineNo">022</span>@RestResource(<a name="line.22"></a>
+<span class="sourceLineNo">023</span> title="Hello World example",<a name="line.23"></a>
+<span class="sourceLineNo">024</span> path="/helloworld",<a name="line.24"></a>
+<span class="sourceLineNo">025</span> description="Simplest possible REST resource"<a name="line.25"></a>
+<span class="sourceLineNo">026</span>)<a name="line.26"></a>
+<span class="sourceLineNo">027</span>public class HelloWorldResource extends Resource {<a name="line.27"></a>
+<span class="sourceLineNo">028</span> private static final long serialVersionUID = 1L;<a name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span> /** GET request handler */<a name="line.30"></a>
+<span class="sourceLineNo">031</span> @RestMethod(name="GET", path="/*")<a name="line.31"></a>
+<span class="sourceLineNo">032</span> public String sayHello() {<a name="line.32"></a>
+<span class="sourceLineNo">033</span> return "Hello world!";<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>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/microservice/sample/RootResources.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/sample/RootResources.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/sample/RootResources.html
new file mode 100644
index 0000000..43d9670
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/sample/RootResources.html
@@ -0,0 +1,113 @@
+<!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.microservice.sample;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import static org.apache.juneau.html.HtmlDocSerializerContext.HTMLDOC_links;<a name="line.15"></a>
+<span class="sourceLineNo">016</span><a name="line.16"></a>
+<span class="sourceLineNo">017</span>import org.apache.juneau.microservice.ResourceGroup;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.microservice.resources.ConfigResource;<a name="line.18"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.microservice.resources.LogsResource;<a name="line.19"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.rest.annotation.Property;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.rest.annotation.RestResource;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Root microservice page.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> */<a name="line.25"></a>
+<span class="sourceLineNo">026</span>@RestResource(<a name="line.26"></a>
+<span class="sourceLineNo">027</span> path="/",<a name="line.27"></a>
+<span class="sourceLineNo">028</span> title="Juneau Microservice Template",<a name="line.28"></a>
+<span class="sourceLineNo">029</span> description="Template for creating REST microservices",<a name="line.29"></a>
+<span class="sourceLineNo">030</span> properties={<a name="line.30"></a>
+<span class="sourceLineNo">031</span> @Property(name=HTMLDOC_links, value="{options:'?method=OPTIONS'}")<a name="line.31"></a>
+<span class="sourceLineNo">032</span> },<a name="line.32"></a>
+<span class="sourceLineNo">033</span> children={<a name="line.33"></a>
+<span class="sourceLineNo">034</span> HelloWorldResource.class,<a name="line.34"></a>
+<span class="sourceLineNo">035</span> ConfigResource.class,<a name="line.35"></a>
+<span class="sourceLineNo">036</span> LogsResource.class<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>public class RootResources extends ResourceGroup {<a name="line.39"></a>
+<span class="sourceLineNo">040</span> private static final long serialVersionUID = 1L;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>}<a name="line.41"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.Builder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.Builder.html b/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.Builder.html
index 76a599f..ce806d7 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.Builder.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.Builder.html
@@ -267,7 +267,7 @@
<span class="sourceLineNo">259</span> if ("html".equals(subType) || "xhtml".equals(subType) || "xml".equals(subType))<a name="line.259"></a>
<span class="sourceLineNo">260</span> s = s.replaceAll("(?s)<!--(.*?)-->\\s*", "");<a name="line.260"></a>
<span class="sourceLineNo">261</span> else if ("json".equals(subType) || "javascript".equals(subType) || "css".equals(subType))<a name="line.261"></a>
-<span class="sourceLineNo">262</span> s.replaceAll("(?s)\\/\\*(.*?)\\*\\/\\s*", "");<a name="line.262"></a>
+<span class="sourceLineNo">262</span> s = s.replaceAll("(?s)\\/\\*(.*?)\\*\\/\\s*", "");<a name="line.262"></a>
<span class="sourceLineNo">263</span> return s;<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.html b/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.html
index 76a599f..ce806d7 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/ReaderResource.html
@@ -267,7 +267,7 @@
<span class="sourceLineNo">259</span> if ("html".equals(subType) || "xhtml".equals(subType) || "xml".equals(subType))<a name="line.259"></a>
<span class="sourceLineNo">260</span> s = s.replaceAll("(?s)<!--(.*?)-->\\s*", "");<a name="line.260"></a>
<span class="sourceLineNo">261</span> else if ("json".equals(subType) || "javascript".equals(subType) || "css".equals(subType))<a name="line.261"></a>
-<span class="sourceLineNo">262</span> s.replaceAll("(?s)\\/\\*(.*?)\\*\\/\\s*", "");<a name="line.262"></a>
+<span class="sourceLineNo">262</span> s = s.replaceAll("(?s)\\/\\*(.*?)\\*\\/\\s*", "");<a name="line.262"></a>
<span class="sourceLineNo">263</span> return s;<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/RequestPathMatch.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RequestPathMatch.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RequestPathMatch.html
index 24c2c3d..c63e70e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RequestPathMatch.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RequestPathMatch.html
@@ -69,7 +69,7 @@
<span class="sourceLineNo">061</span> * @param value The parameter value.<a name="line.61"></a>
<span class="sourceLineNo">062</span> */<a name="line.62"></a>
<span class="sourceLineNo">063</span> public void put(String name, Object value) {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> put(name, value);<a name="line.64"></a>
+<span class="sourceLineNo">064</span> super.put(name, value.toString());<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/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 326f4a9..b4b01c8 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
@@ -415,7 +415,7 @@
<span class="sourceLineNo">407</span> } else if (c == 'R') {<a name="line.407"></a>
<span class="sourceLineNo">408</span> if ("Request".equals(category)) {<a name="line.408"></a>
<span class="sourceLineNo">409</span> char c2 = StringUtils.charAt(name, 0);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> if (c == 'c') {<a name="line.410"></a>
+<span class="sourceLineNo">410</span> if (c2 == 'c') {<a name="line.410"></a>
<span class="sourceLineNo">411</span> if ("contextPath".equals(name))<a name="line.411"></a>
<span class="sourceLineNo">412</span> return getContextPath();<a name="line.412"></a>
<span class="sourceLineNo">413</span> } else if (c2 == 'm') {<a name="line.413"></a>
[04/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/RestServlet.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestServlet.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestServlet.html
index 076aad2..975919d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestServlet.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestServlet.html
@@ -48,7 +48,7 @@
<span class="sourceLineNo">040</span><a name="line.40"></a>
<span class="sourceLineNo">041</span> private RestConfig config;<a name="line.41"></a>
<span class="sourceLineNo">042</span> private RestContext context;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> private boolean isInitialized = false;<a name="line.43"></a>
+<span class="sourceLineNo">043</span> private volatile boolean isInitialized = false;<a name="line.43"></a>
<span class="sourceLineNo">044</span> private Exception initException;<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
index bc03f91..564219e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
@@ -182,7 +182,7 @@
<span class="sourceLineNo">174</span> */<a name="line.174"></a>
<span class="sourceLineNo">175</span> static String[] parseKeyValuePair(String s) {<a name="line.175"></a>
<span class="sourceLineNo">176</span> int i = -1;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> for (int j = 0; j < s.length() && i < 0; j++) { s.indexOf(':');<a name="line.177"></a>
+<span class="sourceLineNo">177</span> for (int j = 0; j < s.length() && i < 0; j++) {<a name="line.177"></a>
<span class="sourceLineNo">178</span> char c = s.charAt(j);<a name="line.178"></a>
<span class="sourceLineNo">179</span> if (c == '=' || c == ':')<a name="line.179"></a>
<span class="sourceLineNo">180</span> i = j;<a name="line.180"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Property.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Property.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Property.html
index db01e76..3174fb4 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Property.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Property.html
@@ -26,52 +26,48 @@
<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.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.jena.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.json.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.parser.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.serializer.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.xml.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>/**<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * Property name/value pair used in the {@link RestResource#properties()} annotation.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <p><a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Any of the following property names can be specified:<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <ul><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * <li>{@link BeanContext}<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <li>{@link SerializerContext}<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <li>{@link ParserContext}<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <li>{@link JsonSerializerContext}<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <li>{@link RdfSerializerContext}<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <li>{@link RdfParserContext}<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <li>{@link RdfCommonContext}<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <li>{@link XmlSerializerContext}<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <li>{@link XmlParserContext}<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * </ul><a name="line.42"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.json.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.parser.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.juneau.serializer.*;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.juneau.xml.*;<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> * Property name/value pair used in the {@link RestResource#properties()} annotation.<a name="line.27"></a>
+<span class="sourceLineNo">028</span> *<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * <p><a name="line.29"></a>
+<span class="sourceLineNo">030</span> * Any of the following property names can be specified:<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <ul><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <li>{@link BeanContext}<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <li>{@link SerializerContext}<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * <li>{@link ParserContext}<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * <li>{@link JsonSerializerContext}<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * <li>{@link XmlSerializerContext}<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <li>{@link XmlParserContext}<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * </ul><a name="line.38"></a>
+<span class="sourceLineNo">039</span> *<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <p><a name="line.40"></a>
+<span class="sourceLineNo">041</span> * Property values types that are not <code>Strings</code> will automatically be converted to the correct type<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * (e.g. <code>Boolean</code>, etc...).<a name="line.42"></a>
<span class="sourceLineNo">043</span> *<a name="line.43"></a>
<span class="sourceLineNo">044</span> * <p><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * Property values types that are not <code>Strings</code> will automatically be converted to the correct type<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * (e.g. <code>Boolean</code>, etc...).<a name="line.46"></a>
-<span class="sourceLineNo">047</span> *<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * <p><a name="line.48"></a>
-<span class="sourceLineNo">049</span> * See {@link RestResource#properties} for more information.<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(ANNOTATION_TYPE)<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 Property {<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> * Property name.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> */<a name="line.59"></a>
-<span class="sourceLineNo">060</span> String name();<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> * Property value.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> */<a name="line.64"></a>
-<span class="sourceLineNo">065</span> String value();<a name="line.65"></a>
-<span class="sourceLineNo">066</span>}<a name="line.66"></a>
+<span class="sourceLineNo">045</span> * See {@link RestResource#properties} for more information.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>@Documented<a name="line.47"></a>
+<span class="sourceLineNo">048</span>@Target(ANNOTATION_TYPE)<a name="line.48"></a>
+<span class="sourceLineNo">049</span>@Retention(RUNTIME)<a name="line.49"></a>
+<span class="sourceLineNo">050</span>@Inherited<a name="line.50"></a>
+<span class="sourceLineNo">051</span>public @interface Property {<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> * Property name.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> */<a name="line.55"></a>
+<span class="sourceLineNo">056</span> String name();<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> * Property value.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> */<a name="line.60"></a>
+<span class="sourceLineNo">061</span> String value();<a name="line.61"></a>
+<span class="sourceLineNo">062</span>}<a name="line.62"></a>
[10/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html
index 6d3fe29..0a14ca9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html
@@ -30,273 +30,272 @@
<span class="sourceLineNo">022</span>import org.apache.juneau.parser.*;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import org.apache.juneau.serializer.*;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import org.apache.juneau.svl.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.svl.vars.*;<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> * Wraps an instance of {@link ConfigFileImpl} in an interface that will automatically replace {@link VarResolver}<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * variables.<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * <p><a name="line.31"></a>
-<span class="sourceLineNo">032</span> * The {@link ConfigFile#getResolving(VarResolver)} returns an instance of this class.<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <p><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * This class overrides the {@link #getString(String, String)} to resolve string variables.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * All other method calls are passed through to the inner config file.<a name="line.36"></a>
-<span class="sourceLineNo">037</span> */<a name="line.37"></a>
-<span class="sourceLineNo">038</span>public final class ConfigFileWrapped extends ConfigFile {<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span> private final ConfigFileImpl cf;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> private final VarResolverSession vs;<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span> ConfigFileWrapped(ConfigFileImpl cf, VarResolver vr) {<a name="line.43"></a>
-<span class="sourceLineNo">044</span> this.cf = cf;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> this.vs = vr.builder()<a name="line.45"></a>
-<span class="sourceLineNo">046</span> .vars(ConfigFileVar.class)<a name="line.46"></a>
-<span class="sourceLineNo">047</span> .contextObject(ConfigFileVar.SESSION_config, cf)<a name="line.47"></a>
-<span class="sourceLineNo">048</span> .build()<a name="line.48"></a>
-<span class="sourceLineNo">049</span> .createSession();<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> ConfigFileWrapped(ConfigFileImpl cf, VarResolverSession vs) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> this.cf = cf;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> this.vs = vs;<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 /* ConfigFile */<a name="line.57"></a>
-<span class="sourceLineNo">058</span> public void clear() {<a name="line.58"></a>
-<span class="sourceLineNo">059</span> cf.clear();<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> @Override /* ConfigFile */<a name="line.62"></a>
-<span class="sourceLineNo">063</span> public boolean containsKey(Object key) {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> return cf.containsKey(key);<a name="line.64"></a>
-<span class="sourceLineNo">065</span> }<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span> @Override /* ConfigFile */<a name="line.67"></a>
-<span class="sourceLineNo">068</span> public boolean containsValue(Object value) {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> return cf.containsValue(value);<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> @Override /* ConfigFile */<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public Set<java.util.Map.Entry<String,Section>> entrySet() {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> return cf.entrySet();<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> @Override /* ConfigFile */<a name="line.77"></a>
-<span class="sourceLineNo">078</span> public Section get(Object key) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> return cf.get(key);<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 /* ConfigFile */<a name="line.82"></a>
-<span class="sourceLineNo">083</span> public boolean isEmpty() {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> return cf.isEmpty();<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> @Override /* ConfigFile */<a name="line.87"></a>
-<span class="sourceLineNo">088</span> public Set<String> keySet() {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return cf.keySet();<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 /* ConfigFile */<a name="line.92"></a>
-<span class="sourceLineNo">093</span> public Section put(String key, Section value) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> return cf.put(key, value);<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> @Override /* ConfigFile */<a name="line.97"></a>
-<span class="sourceLineNo">098</span> public void putAll(Map<? extends String,? extends Section> map) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> cf.putAll(map);<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> @Override /* ConfigFile */<a name="line.102"></a>
-<span class="sourceLineNo">103</span> public Section remove(Object key) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> return cf.remove(key);<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> @Override /* ConfigFile */<a name="line.107"></a>
-<span class="sourceLineNo">108</span> public int size() {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> return cf.size();<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 /* ConfigFile */<a name="line.112"></a>
-<span class="sourceLineNo">113</span> public Collection<Section> values() {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> return cf.values();<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> @Override /* ConfigFile */<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public ConfigFile loadIfModified() throws IOException {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> cf.loadIfModified();<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return this;<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> @Override /* ConfigFile */<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public ConfigFile load() throws IOException {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> cf.load();<a name="line.125"></a>
-<span class="sourceLineNo">126</span> return this;<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 /* ConfigFile */<a name="line.129"></a>
-<span class="sourceLineNo">130</span> public ConfigFile load(Reader r) throws IOException {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> cf.load(r);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return this;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></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> * Wraps an instance of {@link ConfigFileImpl} in an interface that will automatically replace {@link VarResolver}<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * variables.<a name="line.28"></a>
+<span class="sourceLineNo">029</span> *<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <p><a name="line.30"></a>
+<span class="sourceLineNo">031</span> * The {@link ConfigFile#getResolving(VarResolver)} returns an instance of this class.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> *<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <p><a name="line.33"></a>
+<span class="sourceLineNo">034</span> * This class overrides the {@link #getString(String, String)} to resolve string variables.<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * All other method calls are passed through to the inner config file.<a name="line.35"></a>
+<span class="sourceLineNo">036</span> */<a name="line.36"></a>
+<span class="sourceLineNo">037</span>public final class ConfigFileWrapped extends ConfigFile {<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span> private final ConfigFileImpl cf;<a name="line.39"></a>
+<span class="sourceLineNo">040</span> private final VarResolverSession vs;<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span> ConfigFileWrapped(ConfigFileImpl cf, VarResolver vr) {<a name="line.42"></a>
+<span class="sourceLineNo">043</span> this.cf = cf;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> this.vs = vr.builder()<a name="line.44"></a>
+<span class="sourceLineNo">045</span> .vars(ConfigFileVar.class)<a name="line.45"></a>
+<span class="sourceLineNo">046</span> .contextObject(ConfigFileVar.SESSION_config, cf)<a name="line.46"></a>
+<span class="sourceLineNo">047</span> .build()<a name="line.47"></a>
+<span class="sourceLineNo">048</span> .createSession();<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> ConfigFileWrapped(ConfigFileImpl cf, VarResolverSession vs) {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> this.cf = cf;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> this.vs = vs;<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> @Override /* ConfigFile */<a name="line.56"></a>
+<span class="sourceLineNo">057</span> public void clear() {<a name="line.57"></a>
+<span class="sourceLineNo">058</span> cf.clear();<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> @Override /* ConfigFile */<a name="line.61"></a>
+<span class="sourceLineNo">062</span> public boolean containsKey(Object key) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> return cf.containsKey(key);<a name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> @Override /* ConfigFile */<a name="line.66"></a>
+<span class="sourceLineNo">067</span> public boolean containsValue(Object value) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> return cf.containsValue(value);<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 /* ConfigFile */<a name="line.71"></a>
+<span class="sourceLineNo">072</span> public Set<java.util.Map.Entry<String,Section>> entrySet() {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> return cf.entrySet();<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> @Override /* ConfigFile */<a name="line.76"></a>
+<span class="sourceLineNo">077</span> public Section get(Object key) {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> return cf.get(key);<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 /* ConfigFile */<a name="line.81"></a>
+<span class="sourceLineNo">082</span> public boolean isEmpty() {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> return cf.isEmpty();<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> @Override /* ConfigFile */<a name="line.86"></a>
+<span class="sourceLineNo">087</span> public Set<String> keySet() {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> return cf.keySet();<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 /* ConfigFile */<a name="line.91"></a>
+<span class="sourceLineNo">092</span> public Section put(String key, Section value) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> return cf.put(key, value);<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> @Override /* ConfigFile */<a name="line.96"></a>
+<span class="sourceLineNo">097</span> public void putAll(Map<? extends String,? extends Section> map) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> cf.putAll(map);<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> @Override /* ConfigFile */<a name="line.101"></a>
+<span class="sourceLineNo">102</span> public Section remove(Object key) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> return cf.remove(key);<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 /* ConfigFile */<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public int size() {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return cf.size();<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> @Override /* ConfigFile */<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public Collection<Section> values() {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> return cf.values();<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> @Override /* ConfigFile */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> public ConfigFile loadIfModified() throws IOException {<a name="line.117"></a>
+<span class="sourceLineNo">118</span> cf.loadIfModified();<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> @Override /* ConfigFile */<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public ConfigFile load() throws IOException {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> cf.load();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> return this;<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> @Override /* ConfigFile */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public ConfigFile load(Reader r) throws IOException {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> cf.load(r);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> return this;<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><a name="line.135"></a>
-<span class="sourceLineNo">136</span> @Override /* ConfigFile */<a name="line.136"></a>
-<span class="sourceLineNo">137</span> public boolean isEncoded(String key) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> return cf.isEncoded(key);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span> @Override /* ConfigFile */<a name="line.141"></a>
-<span class="sourceLineNo">142</span> public ConfigFile addLines(String section, String... lines) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> cf.addLines(section, lines);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> return this;<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> @Override /* ConfigFile */<a name="line.147"></a>
-<span class="sourceLineNo">148</span> public ConfigFile addHeaderComments(String section, String... headerComments) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> cf.addHeaderComments(section, headerComments);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> return this;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> @Override /* ConfigFile */<a name="line.153"></a>
-<span class="sourceLineNo">154</span> public ConfigFile clearHeaderComments(String section) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> cf.clearHeaderComments(section);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> return this;<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> @Override /* ConfigFile */<a name="line.159"></a>
-<span class="sourceLineNo">160</span> public Section getSection(String name) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> return cf.getSection(name);<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> @Override /* ConfigFile */<a name="line.164"></a>
-<span class="sourceLineNo">165</span> public Section getSection(String name, boolean create) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return cf.getSection(name, create);<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 /* ConfigFile */<a name="line.169"></a>
-<span class="sourceLineNo">170</span> public ConfigFile addSection(String name) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> cf.addSection(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 /* ConfigFile */<a name="line.175"></a>
-<span class="sourceLineNo">176</span> public ConfigFile setSection(String name, Map<String,String> contents) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> cf.setSection(name, contents);<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 /* ConfigFile */<a name="line.181"></a>
-<span class="sourceLineNo">182</span> public ConfigFile removeSection(String name) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> cf.removeSection(name);<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 /* ConfigFile */<a name="line.187"></a>
-<span class="sourceLineNo">188</span> public ConfigFile save() throws IOException {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> cf.save();<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 /* ConfigFile */<a name="line.193"></a>
-<span class="sourceLineNo">194</span> public ConfigFile serializeTo(Writer out, ConfigFileFormat format) throws IOException {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> cf.serializeTo(out, format);<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 /* ConfigFile */<a name="line.199"></a>
-<span class="sourceLineNo">200</span> public String toString() {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> return cf.toString();<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 /* ConfigFile */<a name="line.204"></a>
-<span class="sourceLineNo">205</span> public ConfigFile getResolving(VarResolver varResolver) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> assertFieldNotNull(varResolver, "vr");<a name="line.206"></a>
-<span class="sourceLineNo">207</span> return new ConfigFileWrapped(cf, varResolver);<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 /* ConfigFile */<a name="line.210"></a>
-<span class="sourceLineNo">211</span> public ConfigFile getResolving(VarResolverSession varSession) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> assertFieldNotNull(varSession, "vs");<a name="line.212"></a>
-<span class="sourceLineNo">213</span> return new ConfigFileWrapped(cf, varSession);<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 /* ConfigFile */<a name="line.216"></a>
-<span class="sourceLineNo">217</span> public ConfigFile getResolving() {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> return new ConfigFileWrapped(cf, VarResolver.DEFAULT);<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 /* ConfigFile */<a name="line.221"></a>
-<span class="sourceLineNo">222</span> public ConfigFile addListener(ConfigFileListener listener) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> cf.addListener(listener);<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 /* ConfigFile */<a name="line.227"></a>
-<span class="sourceLineNo">228</span> public Writable toWritable() {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> return cf.toWritable();<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 /* ConfigFile */<a name="line.232"></a>
-<span class="sourceLineNo">233</span> public ConfigFile merge(ConfigFile newCf) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> cf.merge(newCf);<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 /* ConfigFile */<a name="line.238"></a>
-<span class="sourceLineNo">239</span> protected BeanSession getBeanSession() {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> return cf.getBeanSession();<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 /* ConfigFile */<a name="line.243"></a>
-<span class="sourceLineNo">244</span> public String get(String sectionName, String sectionKey) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> String s = cf.get(sectionName, sectionKey);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> if (s == null)<a name="line.246"></a>
-<span class="sourceLineNo">247</span> return null;<a name="line.247"></a>
-<span class="sourceLineNo">248</span> return vs.resolve(s);<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 /* ConfigFile */<a name="line.251"></a>
-<span class="sourceLineNo">252</span> public String put(String sectionName, String sectionKey, String value, boolean encoded) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> return cf.put(sectionName, sectionKey, value, encoded);<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 /* ConfigFile */<a name="line.256"></a>
-<span class="sourceLineNo">257</span> public String put(String sectionName, String sectionKey, Object value, Serializer serializer, boolean encoded,<a name="line.257"></a>
-<span class="sourceLineNo">258</span> boolean newline) throws SerializeException {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> return cf.put(sectionName, sectionKey, value, serializer, encoded, newline);<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 /* ConfigFile */<a name="line.262"></a>
-<span class="sourceLineNo">263</span> public String remove(String sectionName, String sectionKey) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> return cf.remove(sectionName, sectionKey);<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> @Override /* ConfigFile */<a name="line.267"></a>
-<span class="sourceLineNo">268</span> public Set<String> getSectionKeys(String sectionName) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> return cf.getSectionKeys(sectionName);<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> @Override /* ConfigFile */<a name="line.272"></a>
-<span class="sourceLineNo">273</span> protected void readLock() {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> cf.readLock();<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 /* ConfigFile */<a name="line.277"></a>
-<span class="sourceLineNo">278</span> protected void readUnlock() {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> cf.readUnlock();<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> @Override /* ConfigFile */<a name="line.282"></a>
-<span class="sourceLineNo">283</span> protected String serialize(Object o, Serializer s, boolean newline) throws SerializeException {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> return cf.serialize(o, s, newline);<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 /* ConfigFile */<a name="line.287"></a>
-<span class="sourceLineNo">288</span> protected <T> T parse(String s, Parser parser, Type type, Type... args) throws ParseException {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> return cf.parse(s, parser, type, args);<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">135</span> @Override /* ConfigFile */<a name="line.135"></a>
+<span class="sourceLineNo">136</span> public boolean isEncoded(String key) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> return cf.isEncoded(key);<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> @Override /* ConfigFile */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public ConfigFile addLines(String section, String... lines) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> cf.addLines(section, lines);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return this;<a name="line.143"></a>
+<span class="sourceLineNo">144</span> }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span> @Override /* ConfigFile */<a name="line.146"></a>
+<span class="sourceLineNo">147</span> public ConfigFile addHeaderComments(String section, String... headerComments) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> cf.addHeaderComments(section, headerComments);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> return this;<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> @Override /* ConfigFile */<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public ConfigFile clearHeaderComments(String section) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> cf.clearHeaderComments(section);<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> @Override /* ConfigFile */<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public Section getSection(String name) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> return cf.getSection(name);<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 /* ConfigFile */<a name="line.163"></a>
+<span class="sourceLineNo">164</span> public Section getSection(String name, boolean create) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> return cf.getSection(name, create);<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> @Override /* ConfigFile */<a name="line.168"></a>
+<span class="sourceLineNo">169</span> public ConfigFile addSection(String name) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> cf.addSection(name);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> return this;<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 /* ConfigFile */<a name="line.174"></a>
+<span class="sourceLineNo">175</span> public ConfigFile setSection(String name, Map<String,String> contents) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> cf.setSection(name, contents);<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 /* ConfigFile */<a name="line.180"></a>
+<span class="sourceLineNo">181</span> public ConfigFile removeSection(String name) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> cf.removeSection(name);<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 /* ConfigFile */<a name="line.186"></a>
+<span class="sourceLineNo">187</span> public ConfigFile save() throws IOException {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> cf.save();<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 /* ConfigFile */<a name="line.192"></a>
+<span class="sourceLineNo">193</span> public ConfigFile serializeTo(Writer out, ConfigFileFormat format) throws IOException {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> cf.serializeTo(out, format);<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 /* ConfigFile */<a name="line.198"></a>
+<span class="sourceLineNo">199</span> public String toString() {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> return cf.toString();<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 /* ConfigFile */<a name="line.203"></a>
+<span class="sourceLineNo">204</span> public ConfigFile getResolving(VarResolver varResolver) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> assertFieldNotNull(varResolver, "vr");<a name="line.205"></a>
+<span class="sourceLineNo">206</span> return new ConfigFileWrapped(cf, varResolver);<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 /* ConfigFile */<a name="line.209"></a>
+<span class="sourceLineNo">210</span> public ConfigFile getResolving(VarResolverSession varSession) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> assertFieldNotNull(varSession, "vs");<a name="line.211"></a>
+<span class="sourceLineNo">212</span> return new ConfigFileWrapped(cf, varSession);<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 /* ConfigFile */<a name="line.215"></a>
+<span class="sourceLineNo">216</span> public ConfigFile getResolving() {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> return new ConfigFileWrapped(cf, VarResolver.DEFAULT);<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 /* ConfigFile */<a name="line.220"></a>
+<span class="sourceLineNo">221</span> public ConfigFile addListener(ConfigFileListener listener) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> cf.addListener(listener);<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 /* ConfigFile */<a name="line.226"></a>
+<span class="sourceLineNo">227</span> public Writable toWritable() {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> return cf.toWritable();<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 /* ConfigFile */<a name="line.231"></a>
+<span class="sourceLineNo">232</span> public ConfigFile merge(ConfigFile newCf) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span> cf.merge(newCf);<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 /* ConfigFile */<a name="line.237"></a>
+<span class="sourceLineNo">238</span> protected BeanSession getBeanSession() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> return cf.getBeanSession();<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 /* ConfigFile */<a name="line.242"></a>
+<span class="sourceLineNo">243</span> public String get(String sectionName, String sectionKey) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> String s = cf.get(sectionName, sectionKey);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> if (s == null)<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return null;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> return vs.resolve(s);<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 /* ConfigFile */<a name="line.250"></a>
+<span class="sourceLineNo">251</span> public String put(String sectionName, String sectionKey, String value, boolean encoded) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> return cf.put(sectionName, sectionKey, value, encoded);<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> @Override /* ConfigFile */<a name="line.255"></a>
+<span class="sourceLineNo">256</span> public String put(String sectionName, String sectionKey, Object value, Serializer serializer, boolean encoded,<a name="line.256"></a>
+<span class="sourceLineNo">257</span> boolean newline) throws SerializeException {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return cf.put(sectionName, sectionKey, value, serializer, encoded, newline);<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> @Override /* ConfigFile */<a name="line.261"></a>
+<span class="sourceLineNo">262</span> public String remove(String sectionName, String sectionKey) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> return cf.remove(sectionName, sectionKey);<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> @Override /* ConfigFile */<a name="line.266"></a>
+<span class="sourceLineNo">267</span> public Set<String> getSectionKeys(String sectionName) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> return cf.getSectionKeys(sectionName);<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 /* ConfigFile */<a name="line.271"></a>
+<span class="sourceLineNo">272</span> protected void readLock() {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> cf.readLock();<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> @Override /* ConfigFile */<a name="line.276"></a>
+<span class="sourceLineNo">277</span> protected void readUnlock() {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> cf.readUnlock();<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> @Override /* ConfigFile */<a name="line.281"></a>
+<span class="sourceLineNo">282</span> protected String serialize(Object o, Serializer s, boolean newline) throws SerializeException {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return cf.serialize(o, s, newline);<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> @Override /* ConfigFile */<a name="line.286"></a>
+<span class="sourceLineNo">287</span> protected <T> T parse(String s, Parser parser, Type type, Type... args) throws ParseException {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> return cf.parse(s, parser, type, args);<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>
[11/19] incubator-juneau-website git commit: Update javadocs.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/annotation/NameProperty.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/annotation/NameProperty.html b/content/site/apidocs/src-html/org/apache/juneau/annotation/NameProperty.html
index ec85309..0d32094 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/annotation/NameProperty.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/annotation/NameProperty.html
@@ -25,44 +25,41 @@
<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.ini.*;<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> * Identifies a setter as a method for setting the name of a POJO as it's known by its parent object.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> *<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
-<span class="sourceLineNo">026</span> * For example, the {@link Section} class must know the name it's known by it's parent {@link ConfigFileImpl} class,<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * so parsers will call this method with the section name<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * using the {@link Section#setName(String)} method.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <p><a name="line.29"></a>
-<span class="sourceLineNo">030</span> * A commonly-used case is when you're parsing a JSON map containing beans where one of the bean properties is the key<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * used in the map.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * <p><a name="line.33"></a>
-<span class="sourceLineNo">034</span> * For example:<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <p class='bcode'><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * {<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * id1: {name: <js>'John Smith'</js>, sex:<js>'M'</js>},<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * id2: {name: <js>'Jane Doe'</js>, sex:<js>'F'</js>}<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * }<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * </p><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <p class='bcode'><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <jk>public class</jk> Person {<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <ja>@NameProperty</ja> <jk>public</jk> String <jf>id</jf>;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <jk>public</jk> String <jf>name</jf>;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <jk>public char</jk> <jf>sex</jf>;<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * }<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * </p><a name="line.47"></a>
-<span class="sourceLineNo">048</span> *<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <h5 class='section'>Notes:</h5><a name="line.49"></a>
-<span class="sourceLineNo">050</span> * <ul><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <li>The annotated field or method does not need to be public.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * </ul><a name="line.52"></a>
-<span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>@Target({METHOD,FIELD})<a name="line.54"></a>
-<span class="sourceLineNo">055</span>@Retention(RUNTIME)<a name="line.55"></a>
-<span class="sourceLineNo">056</span>@Inherited<a name="line.56"></a>
-<span class="sourceLineNo">057</span>public @interface NameProperty {}<a name="line.57"></a>
+<span class="sourceLineNo">020</span>/**<a name="line.20"></a>
+<span class="sourceLineNo">021</span> * Identifies a setter as a method for setting the name of a POJO as it's known by its parent object.<a name="line.21"></a>
+<span class="sourceLineNo">022</span> *<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * <p><a name="line.23"></a>
+<span class="sourceLineNo">024</span> * For example, the <code>Section</code> class must know the name it's known by it's parent <code>ConfigFileImpl</code> class,<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * so parsers will call this method with the section name using the <code>Section.setName(String)</code> method.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * A commonly-used case is when you're parsing a JSON map containing beans where one of the bean properties is the key<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * used in the map.<a name="line.28"></a>
+<span class="sourceLineNo">029</span> *<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <p><a name="line.30"></a>
+<span class="sourceLineNo">031</span> * For example:<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <p class='bcode'><a name="line.32"></a>
+<span class="sourceLineNo">033</span> * {<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * id1: {name: <js>'John Smith'</js>, sex:<js>'M'</js>},<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * id2: {name: <js>'Jane Doe'</js>, sex:<js>'F'</js>}<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * }<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * </p><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <p class='bcode'><a name="line.38"></a>
+<span class="sourceLineNo">039</span> * <jk>public class</jk> Person {<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <ja>@NameProperty</ja> <jk>public</jk> String <jf>id</jf>;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <jk>public</jk> String <jf>name</jf>;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <jk>public char</jk> <jf>sex</jf>;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * }<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * </p><a name="line.44"></a>
+<span class="sourceLineNo">045</span> *<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <h5 class='section'>Notes:</h5><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <ul><a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <li>The annotated field or method does not need to be public.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * </ul><a name="line.49"></a>
+<span class="sourceLineNo">050</span> */<a name="line.50"></a>
+<span class="sourceLineNo">051</span>@Target({METHOD,FIELD})<a name="line.51"></a>
+<span class="sourceLineNo">052</span>@Retention(RUNTIME)<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@Inherited<a name="line.53"></a>
+<span class="sourceLineNo">054</span>public @interface NameProperty {}<a name="line.54"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/annotation/ParentProperty.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/annotation/ParentProperty.html b/content/site/apidocs/src-html/org/apache/juneau/annotation/ParentProperty.html
index 9296372..e7bed27 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/annotation/ParentProperty.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/annotation/ParentProperty.html
@@ -25,39 +25,37 @@
<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.ini.*;<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> * Identifies a setter as a method for adding a parent reference to a child object.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> *<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Used by the parsers to add references to parent objects in child objects.<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * For example, the {@link Section} class cannot exist outside the scope of a parent {@link ConfigFileImpl} class, so<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * parsers will add a reference to the config file using the {@link Section#setParent(ConfigFileImpl)} method.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <p><a name="line.30"></a>
-<span class="sourceLineNo">031</span> * A commonly-used case is when you're parsing beans, and a child bean has a reference to a parent bean.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <p class='bcode'><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * <jk>public class</jk> AddressBook {<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <jk>public</jk> List&lt;Person&gt; <jf>people</jf>;<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> * <jk>public class</jk> Person {<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <ja>@ParentProperty</ja> <jk>public</jk> AddressBook <jf>addressBook</jf>;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <jk>public</jk> String <jf>name</jf>;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <jk>public char</jk> <jf>sex</jf>;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * }<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * </p><a name="line.42"></a>
-<span class="sourceLineNo">043</span> *<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <h5 class='section'>Notes:</h5><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <ul><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <li>The annotated field or method does not need to be public.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * </ul><a name="line.47"></a>
-<span class="sourceLineNo">048</span> */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>@Target({METHOD,FIELD})<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 ParentProperty {}<a name="line.52"></a>
+<span class="sourceLineNo">020</span>/**<a name="line.20"></a>
+<span class="sourceLineNo">021</span> * Identifies a setter as a method for adding a parent reference to a child object.<a name="line.21"></a>
+<span class="sourceLineNo">022</span> *<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * <p><a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Used by the parsers to add references to parent objects in child objects.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * For example, the <code>Section</code> class cannot exist outside the scope of a parent <code>ConfigFileImpl</code> class, so<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * parsers will add a reference to the config file using the <code>Section.setParent(ConfigFileImpl)</code> method.<a name="line.26"></a>
+<span class="sourceLineNo">027</span> *<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <p><a name="line.28"></a>
+<span class="sourceLineNo">029</span> * A commonly-used case is when you're parsing beans, and a child bean has a reference to a parent bean.<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <p class='bcode'><a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <jk>public class</jk> AddressBook {<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <jk>public</jk> List&lt;Person&gt; <jf>people</jf>;<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> * <jk>public class</jk> Person {<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * <ja>@ParentProperty</ja> <jk>public</jk> AddressBook <jf>addressBook</jf>;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <jk>public</jk> String <jf>name</jf>;<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <jk>public char</jk> <jf>sex</jf>;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * }<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * </p><a name="line.40"></a>
+<span class="sourceLineNo">041</span> *<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <h5 class='section'>Notes:</h5><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <ul><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <li>The annotated field or method does not need to be public.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * </ul><a name="line.45"></a>
+<span class="sourceLineNo">046</span> */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>@Target({METHOD,FIELD})<a name="line.47"></a>
+<span class="sourceLineNo">048</span>@Retention(RUNTIME)<a name="line.48"></a>
+<span class="sourceLineNo">049</span>@Inherited<a name="line.49"></a>
+<span class="sourceLineNo">050</span>public @interface ParentProperty {}<a name="line.50"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/dto/html5/A.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/A.html b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/A.html
index 9dd8df9..8730834 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/A.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/A.html
@@ -20,162 +20,161 @@
<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
<span class="sourceLineNo">013</span>package org.apache.juneau.dto.html5;<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>import java.net.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span>import java.net.URI;<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>import org.apache.juneau.annotation.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>/**<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-a-element">&lt;a&gt;</a><a name="line.23"></a>
-<span class="sourceLineNo">024</span> * element.<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <h6 class='topic'>Additional Information</h6><a name="line.26"></a>
-<span class="sourceLineNo">027</span> * <ul class='doctree'><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * <li class='link'><a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * (org.apache.juneau.dto)</a><a name="line.30"></a>
-<span class="sourceLineNo">031</span> * <ul><a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <li class='sublink'><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * <a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a><a name="line.33"></a>
-<span class="sourceLineNo">034</span> * </ul><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * </li><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * </ul><a name="line.36"></a>
-<span class="sourceLineNo">037</span> */<a name="line.37"></a>
-<span class="sourceLineNo">038</span>@Bean(typeName="a")<a name="line.38"></a>
-<span class="sourceLineNo">039</span>public class A extends HtmlElementMixed {<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 class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-download">download</a> attribute.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> *<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <p><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * Whether to download the resource instead of navigating to it, and its file name if so.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> *<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * @param download<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * The new value for this attribute.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * Typically a {@link Boolean} or {@link String}.<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 final A download(Object download) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> attr("download", download);<a name="line.53"></a>
-<span class="sourceLineNo">054</span> return this;<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> /**<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-href">href</a> attribute.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> *<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <p><a name="line.60"></a>
-<span class="sourceLineNo">061</span> * Address of the hyperlink.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> *<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * <p><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * Strings must be valid URIs.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> *<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * <p><a name="line.67"></a>
-<span class="sourceLineNo">068</span> * URIs defined by {@link UriResolver} can be used for values.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> *<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * @param href<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * The new value for this attribute.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * Typically a {@link URL} or {@link String}.<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 final A href(Object href) {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> attrUri("href", href);<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> * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-hreflang">hreflang</a> attribute.<a name="line.81"></a>
-<span class="sourceLineNo">082</span> *<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * <p><a name="line.83"></a>
-<span class="sourceLineNo">084</span> * Language of the linked resource.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> *<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * @param hreflang The new value for this attribute.<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> */<a name="line.88"></a>
-<span class="sourceLineNo">089</span> public final A hreflang(String hreflang) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> attr("hreflang", hreflang);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> return this;<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> * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-rel">rel</a> attribute.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> *<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * <p><a name="line.97"></a>
-<span class="sourceLineNo">098</span> * Relationship between the document containing the hyperlink and the destination resource.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> *<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @param rel The new value for this attribute.<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> */<a name="line.102"></a>
-<span class="sourceLineNo">103</span> public final A rel(String rel) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> attr("rel", rel);<a name="line.104"></a>
-<span class="sourceLineNo">105</span> return this;<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> * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-target">target</a> attribute.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> *<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * <p><a name="line.111"></a>
-<span class="sourceLineNo">112</span> * Default browsing context for hyperlink navigation and form submission.<a name="line.112"></a>
-<span class="sourceLineNo">113</span> *<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * @param target The new value for this attribute.<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * @return This object (for method chaining).<a name="line.115"></a>
-<span class="sourceLineNo">116</span> */<a name="line.116"></a>
-<span class="sourceLineNo">117</span> public final A target(String target) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> attr("target", target);<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> * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-type">type</a> attribute.<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> * Hint for the type of the referenced resource.<a name="line.126"></a>
-<span class="sourceLineNo">127</span> *<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * @param type The new value for this attribute.<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> */<a name="line.130"></a>
-<span class="sourceLineNo">131</span> public final A type(String type) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> attr("type", type);<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">015</span>import java.net.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import java.net.URI;<a name="line.16"></a>
+<span class="sourceLineNo">017</span><a name="line.17"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.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> * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-a-element">&lt;a&gt;</a><a name="line.22"></a>
+<span class="sourceLineNo">023</span> * element.<a name="line.23"></a>
+<span class="sourceLineNo">024</span> *<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * <h6 class='topic'>Additional Information</h6><a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <ul class='doctree'><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * <li class='link'><a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * (org.apache.juneau.dto)</a><a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <ul><a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <li class='sublink'><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a><a name="line.32"></a>
+<span class="sourceLineNo">033</span> * </ul><a name="line.33"></a>
+<span class="sourceLineNo">034</span> * </li><a name="line.34"></a>
+<span class="sourceLineNo">035</span> * </ul><a name="line.35"></a>
+<span class="sourceLineNo">036</span> */<a name="line.36"></a>
+<span class="sourceLineNo">037</span>@Bean(typeName="a")<a name="line.37"></a>
+<span class="sourceLineNo">038</span>public class A extends HtmlElementMixed {<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 class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-download">download</a> attribute.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> *<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <p><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * Whether to download the resource instead of navigating to it, and its file name if so.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * @param download<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * The new value for this attribute.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * Typically a {@link Boolean} or {@link String}.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * @return This object (for method chaining).<a name="line.49"></a>
+<span class="sourceLineNo">050</span> */<a name="line.50"></a>
+<span class="sourceLineNo">051</span> public final A download(Object download) {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> attr("download", download);<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> * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-href">href</a> attribute.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> *<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <p><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * Address of the hyperlink.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> *<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * <p><a name="line.62"></a>
+<span class="sourceLineNo">063</span> * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * Strings must be valid URIs.<a name="line.64"></a>
+<span class="sourceLineNo">065</span> *<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * <p><a name="line.66"></a>
+<span class="sourceLineNo">067</span> * URIs defined by {@link UriResolver} can be used for values.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> *<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * @param href<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * The new value for this attribute.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * Typically a {@link URL} or {@link String}.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * @return This object (for method chaining).<a name="line.72"></a>
+<span class="sourceLineNo">073</span> */<a name="line.73"></a>
+<span class="sourceLineNo">074</span> public final A href(Object href) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span> attrUri("href", href);<a name="line.75"></a>
+<span class="sourceLineNo">076</span> return this;<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 class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-hreflang">hreflang</a> attribute.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> *<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * <p><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * Language of the linked resource.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> *<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * @param hreflang The new value for this attribute.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * @return This object (for method chaining).<a name="line.86"></a>
+<span class="sourceLineNo">087</span> */<a name="line.87"></a>
+<span class="sourceLineNo">088</span> public final A hreflang(String hreflang) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> attr("hreflang", hreflang);<a name="line.89"></a>
+<span class="sourceLineNo">090</span> return this;<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> * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-rel">rel</a> attribute.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> *<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * <p><a name="line.96"></a>
+<span class="sourceLineNo">097</span> * Relationship between the document containing the hyperlink and the destination resource.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> *<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * @param rel The new value for this attribute.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * @return This object (for method chaining).<a name="line.100"></a>
+<span class="sourceLineNo">101</span> */<a name="line.101"></a>
+<span class="sourceLineNo">102</span> public final A rel(String rel) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> attr("rel", rel);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> return this;<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> * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-target">target</a> attribute.<a name="line.108"></a>
+<span class="sourceLineNo">109</span> *<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * <p><a name="line.110"></a>
+<span class="sourceLineNo">111</span> * Default browsing context for hyperlink navigation and form submission.<a name="line.111"></a>
+<span class="sourceLineNo">112</span> *<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * @param target The new value for this attribute.<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> */<a name="line.115"></a>
+<span class="sourceLineNo">116</span> public final A target(String target) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> attr("target", target);<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> /**<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-type">type</a> attribute.<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> * Hint for the type of the referenced resource.<a name="line.125"></a>
+<span class="sourceLineNo">126</span> *<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @param type The new value for this attribute.<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> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public final A type(String type) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> attr("type", type);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> return this;<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><a name="line.136"></a>
-<span class="sourceLineNo">137</span> //--------------------------------------------------------------------------------<a name="line.137"></a>
-<span class="sourceLineNo">138</span> // Overridden methods<a name="line.138"></a>
-<span class="sourceLineNo">139</span> //--------------------------------------------------------------------------------<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span> @Override /* HtmlElement */<a name="line.141"></a>
-<span class="sourceLineNo">142</span> public final A _class(String _class) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> super._class(_class);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> return this;<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> @Override /* HtmlElement */<a name="line.147"></a>
-<span class="sourceLineNo">148</span> public final A id(String id) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> super.id(id);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> return this;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> @Override /* HtmlElement */<a name="line.153"></a>
-<span class="sourceLineNo">154</span> public final A style(String style) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> super.style(style);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> return this;<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> @Override /* HtmlElementMixed */<a name="line.159"></a>
-<span class="sourceLineNo">160</span> public A children(Object...children) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> super.children(children);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> return this;<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span> @Override /* HtmlElementMixed */<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public A child(Object child) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> super.child(child);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return this;<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">136</span> //--------------------------------------------------------------------------------<a name="line.136"></a>
+<span class="sourceLineNo">137</span> // Overridden methods<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> @Override /* HtmlElement */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public final A _class(String _class) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> super._class(_class);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return this;<a name="line.143"></a>
+<span class="sourceLineNo">144</span> }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span> @Override /* HtmlElement */<a name="line.146"></a>
+<span class="sourceLineNo">147</span> public final A id(String id) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> super.id(id);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> return this;<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> @Override /* HtmlElement */<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public final A style(String style) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> super.style(style);<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> @Override /* HtmlElementMixed */<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public A children(Object...children) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> super.children(children);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> return this;<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> @Override /* HtmlElementMixed */<a name="line.164"></a>
+<span class="sourceLineNo">165</span> public A child(Object child) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> super.child(child);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> return this;<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html b/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html
index 139fb81..d01d39a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html
@@ -105,10 +105,10 @@
<span class="sourceLineNo">097</span> MediaType mt = mediaTypes[i];<a name="line.97"></a>
<span class="sourceLineNo">098</span> int matchQuant2 = mt.match(this);<a name="line.98"></a>
<span class="sourceLineNo">099</span> if (matchQuant2 > matchQuant) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span> matchIndex = i;<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><a name="line.103"></a>
+<span class="sourceLineNo">100</span> matchQuant = matchQuant2;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> matchIndex = i;<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> return matchIndex;<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/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html b/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html
index c0e24eb..462166a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html
@@ -181,9 +181,9 @@
<span class="sourceLineNo">173</span> /**<a name="line.173"></a>
<span class="sourceLineNo">174</span> * Returns <jk>true</jk> if the subtype contains the specified <js>'+'</js> delimited subtype value.<a name="line.174"></a>
<span class="sourceLineNo">175</span> *<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * @param st <a name="line.176"></a>
+<span class="sourceLineNo">176</span> * @param st<a name="line.176"></a>
<span class="sourceLineNo">177</span> * The subtype string.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * Case is ignored. <a name="line.178"></a>
+<span class="sourceLineNo">178</span> * Case is ignored.<a name="line.178"></a>
<span class="sourceLineNo">179</span> * @return <jk>true</jk> if the subtype contains the specified subtype string.<a name="line.179"></a>
<span class="sourceLineNo">180</span> */<a name="line.180"></a>
<span class="sourceLineNo">181</span> public final boolean hasSubType(String st) {<a name="line.181"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileVar.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileVar.html
new file mode 100644
index 0000000..c6171d1
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileVar.html
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
+<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *<a name="line.2"></a>
+<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *<a name="line.3"></a>
+<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *<a name="line.4"></a>
+<span class="sourceLineNo">005</span>// * with the License. You may obtain a copy of the License at *<a name="line.5"></a>
+<span class="sourceLineNo">006</span>// * *<a name="line.6"></a>
+<span class="sourceLineNo">007</span>// * http://www.apache.org/licenses/LICENSE-2.0 *<a name="line.7"></a>
+<span class="sourceLineNo">008</span>// * *<a name="line.8"></a>
+<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *<a name="line.9"></a>
+<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *<a name="line.10"></a>
+<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License. *<a name="line.11"></a>
+<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
+<span class="sourceLineNo">013</span>package org.apache.juneau.ini;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import org.apache.juneau.svl.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span><a name="line.16"></a>
+<span class="sourceLineNo">017</span>/**<a name="line.17"></a>
+<span class="sourceLineNo">018</span> * Config file variable resolver.<a name="line.18"></a>
+<span class="sourceLineNo">019</span> *<a name="line.19"></a>
+<span class="sourceLineNo">020</span> * <p><a name="line.20"></a>
+<span class="sourceLineNo">021</span> * The format for this var is <js>"$C{key[,defaultValue]}"</js>.<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * See {@link ConfigFile#getString(String)} for the format of the key.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> *<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * <p><a name="line.24"></a>
+<span class="sourceLineNo">025</span> * This variable resolver requires that a {@link ConfigFile} object be set as a context object on the resolver or a<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * session object on the resolver session.<a name="line.26"></a>
+<span class="sourceLineNo">027</span> *<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <h5 class='section'>Example:</h5><a name="line.28"></a>
+<span class="sourceLineNo">029</span> * <p class='bcode'><a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <jc>// Create a config file object.</jc><a name="line.30"></a>
+<span class="sourceLineNo">031</span> * ConfigFile configFile = new ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>);<a name="line.31"></a>
+<span class="sourceLineNo">032</span> *<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <jc>// Create a variable resolver that resolves config file entries (e.g. "$C{MySection/myKey}")</jc><a name="line.33"></a>
+<span class="sourceLineNo">034</span> * VarResolver r = <jk>new</jk> VarResolver().addVars(ConfigVar.<js>class</js>)<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * .addContextObject(<jsf>SESSION_config</jsf>, configFile);<a name="line.35"></a>
+<span class="sourceLineNo">036</span> *<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <jc>// Use it!</jc><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * System.<jsf>out</jsf>.println(r.resolve(<js>"Value for myKey in section MySection is $C{MySection/myKey}"</js>));<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * </p><a name="line.39"></a>
+<span class="sourceLineNo">040</span> *<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <p><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * @see org.apache.juneau.ini.ConfigFile<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * @see org.apache.juneau.svl<a name="line.46"></a>
+<span class="sourceLineNo">047</span> */<a name="line.47"></a>
+<span class="sourceLineNo">048</span>public class ConfigFileVar extends DefaultingVar {<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> * The name of the session or context object that identifies the {@link ConfigFile} object.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> */<a name="line.52"></a>
+<span class="sourceLineNo">053</span> public static final String SESSION_config = "config";<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> /** The name of this variable. */<a name="line.55"></a>
+<span class="sourceLineNo">056</span> public static final String NAME = "C";<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> */<a name="line.60"></a>
+<span class="sourceLineNo">061</span> public ConfigFileVar() {<a name="line.61"></a>
+<span class="sourceLineNo">062</span> super(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> @Override /* Var */<a name="line.65"></a>
+<span class="sourceLineNo">066</span> public String resolve(VarResolverSession session, String key) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> return session.getSessionObject(ConfigFile.class, SESSION_config).getString(key);<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>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>