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/08/14 00:27:38 UTC
[02/25] incubator-juneau-website git commit: Add @RestHook support.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/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 7e225a0..076aad2 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
@@ -56,266 +56,200 @@
<span class="sourceLineNo">048</span> public final synchronized void init(ServletConfig servletConfig) throws ServletException {<a name="line.48"></a>
<span class="sourceLineNo">049</span> try {<a name="line.49"></a>
<span class="sourceLineNo">050</span> RestConfig rsc = new RestConfig(servletConfig, this.getClass(), null);<a name="line.50"></a>
-<span class="sourceLineNo">051</span> init(rsc);<a name="line.51"></a>
-<span class="sourceLineNo">052</span> if (! isInitialized) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> // Subclass may not have called super.init(RestServletConfig), so initialize here.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> createContext(rsc);<a name="line.54"></a>
-<span class="sourceLineNo">055</span> super.init(servletConfig);<a name="line.55"></a>
-<span class="sourceLineNo">056</span> }<a name="line.56"></a>
-<span class="sourceLineNo">057</span> } catch (RestException e) {<a name="line.57"></a>
-<span class="sourceLineNo">058</span> // Thrown RestExceptions are simply caught and re-thrown on subsequent calls to service().<a name="line.58"></a>
-<span class="sourceLineNo">059</span> initException = e;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> log(SEVERE, e, "Servlet init error on class ''{0}''", getClass().getName());<a name="line.60"></a>
-<span class="sourceLineNo">061</span> } catch (ServletException e) {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> initException = e;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> log(SEVERE, e, "Servlet init error on class ''{0}''", getClass().getName());<a name="line.63"></a>
-<span class="sourceLineNo">064</span> throw e;<a name="line.64"></a>
-<span class="sourceLineNo">065</span> } catch (Exception e) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> initException = e;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> log(SEVERE, e, "Servlet init error on class ''{0}''", getClass().getName());<a name="line.67"></a>
-<span class="sourceLineNo">068</span> throw new ServletException(e);<a name="line.68"></a>
-<span class="sourceLineNo">069</span> } catch (Throwable e) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> initException = new Exception(e);<a name="line.70"></a>
-<span class="sourceLineNo">071</span> log(SEVERE, e, "Servlet init error on class ''{0}''", getClass().getName());<a name="line.71"></a>
-<span class="sourceLineNo">072</span> throw new ServletException(e);<a name="line.72"></a>
-<span class="sourceLineNo">073</span> } finally {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> isInitialized = true;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> }<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> /**<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * Resource initialization method.<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> * Identical to {@link Servlet#init(ServletConfig)} except the config object provides access to the external config<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * file, configuration properties, and variable resolver defined for this resource.<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> * Classes can also use {@link HttpServlet#init()} and {@link RestServlet#getServletConfig()} as well to perform<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * initialization.<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> * Note that if you override this method, you must first call <code><jk>super</jk>.init(servletConfig)</code>!<a name="line.90"></a>
-<span class="sourceLineNo">091</span> *<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * <p><a name="line.92"></a>
-<span class="sourceLineNo">093</span> * Resource classes that don't extend from {@link RestServlet} can add this method to their class to get access to<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * the config object.<a name="line.94"></a>
-<span class="sourceLineNo">095</span> *<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * @param config The servlet configuration.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * @throws Exception Any exception can be thrown to signal an initialization failure.<a name="line.97"></a>
-<span class="sourceLineNo">098</span> */<a name="line.98"></a>
-<span class="sourceLineNo">099</span> public synchronized void init(RestConfig config) throws Exception {<a name="line.99"></a>
-<span class="sourceLineNo">100</span> if (isInitialized)<a name="line.100"></a>
-<span class="sourceLineNo">101</span> return;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> createContext(config);<a name="line.102"></a>
-<span class="sourceLineNo">103</span> super.init(config);<a name="line.103"></a>
-<span class="sourceLineNo">104</span> init(context);<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> * Convenience method if you want to perform initialization on your resource after all configuration settings<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * have been made.<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> * This allows you to get access to the {@link RestContext} object during initialization.<a name="line.112"></a>
-<span class="sourceLineNo">113</span> *<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * <p><a name="line.114"></a>
-<span class="sourceLineNo">115</span> * The default implementation does nothing.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> *<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * @param context The servlet context containing all the set-in-stone configurations for this resource.<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * @throws Exception Any exception can be thrown to signal an initialization failure.<a name="line.118"></a>
-<span class="sourceLineNo">119</span> */<a name="line.119"></a>
-<span class="sourceLineNo">120</span> public synchronized void init(RestContext context) throws Exception {}<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> private synchronized void createContext(RestConfig config) throws Exception {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> if (isInitialized)<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return;<a name="line.125"></a>
-<span class="sourceLineNo">126</span> this.config = config;<a name="line.126"></a>
-<span class="sourceLineNo">127</span> this.context = new RestContext(this, this.getServletContext(), config);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> this.isInitialized = true;<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> //--------------------------------------------------------------------------------<a name="line.132"></a>
-<span class="sourceLineNo">133</span> // Other methods<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> * The main service method.<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> * Subclasses can optionally override this method if they want to tailor the behavior of requests.<a name="line.140"></a>
-<span class="sourceLineNo">141</span> */<a name="line.141"></a>
-<span class="sourceLineNo">142</span> @Override /* Servlet */<a name="line.142"></a>
-<span class="sourceLineNo">143</span> public void service(HttpServletRequest r1, HttpServletResponse r2) throws ServletException, IOException {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> try {<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> if (initException != null) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> if (initException instanceof RestException)<a name="line.147"></a>
-<span class="sourceLineNo">148</span> throw (RestException)initException;<a name="line.148"></a>
-<span class="sourceLineNo">149</span> throw new RestException(SC_INTERNAL_SERVER_ERROR, initException);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span> if (context == null)<a name="line.151"></a>
-<span class="sourceLineNo">152</span> throw new RestException(SC_INTERNAL_SERVER_ERROR, "Servlet {0} not initialized. init(RestConfig) was not called. This can occur if you've overridden this method but didn't call super.init(RestConfig).", getClass().getName());<a name="line.152"></a>
-<span class="sourceLineNo">153</span> if (! isInitialized)<a name="line.153"></a>
-<span class="sourceLineNo">154</span> throw new RestException(SC_INTERNAL_SERVER_ERROR, "Servlet {0} has not been initialized", getClass().getName());<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> context.getCallHandler().service(r1, r2);<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> } catch (RestException e) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> r2.sendError(SC_INTERNAL_SERVER_ERROR, e.getLocalizedMessage());<a name="line.159"></a>
-<span class="sourceLineNo">160</span> } catch (Throwable e) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> r2.sendError(SC_INTERNAL_SERVER_ERROR, e.getLocalizedMessage());<a name="line.161"></a>
-<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span> /**<a name="line.165"></a>
-<span class="sourceLineNo">166</span> * Returns the read-only context object that contains all the configuration information about this resource.<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> * This object is <jk>null</jk> during the call to {@link #init(RestConfig)} but is populated by the time<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * {@link #init()} is called.<a name="line.170"></a>
-<span class="sourceLineNo">171</span> *<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * <p><a name="line.172"></a>
-<span class="sourceLineNo">173</span> * Resource classes that don't extend from {@link RestServlet} can add the following method to their class to get<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * access to this context object:<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * <p class='bcode'><a name="line.175"></a>
-<span class="sourceLineNo">176</span> * <jk>public void</jk> init(RestServletContext context) <jk>throws</jk> Exception;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * </p><a name="line.177"></a>
-<span class="sourceLineNo">178</span> *<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * @return The context information on this servlet.<a name="line.179"></a>
-<span class="sourceLineNo">180</span> */<a name="line.180"></a>
-<span class="sourceLineNo">181</span> protected RestContext getContext() {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> return context;<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> /**<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * Callback method for listening for successful completion of requests.<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> * Subclasses can override this method for gathering performance statistics.<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> * The default implementation does nothing.<a name="line.192"></a>
-<span class="sourceLineNo">193</span> *<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * <p><a name="line.194"></a>
-<span class="sourceLineNo">195</span> * Resources that don't extend from {@link RestServlet} can implement an equivalent method by overriding the<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * {@link RestCallHandler#onSuccess(RestRequest, RestResponse, long)} method.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> *<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * @param req The HTTP request.<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * @param res The HTTP response.<a name="line.199"></a>
-<span class="sourceLineNo">200</span> * @param time The time in milliseconds it took to process the request.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> */<a name="line.201"></a>
-<span class="sourceLineNo">202</span> protected void onSuccess(RestRequest req, RestResponse res, long time) {}<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> * Callback method that gets invoked right before the REST Java method is invoked.<a name="line.205"></a>
-<span class="sourceLineNo">206</span> *<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * <p><a name="line.207"></a>
-<span class="sourceLineNo">208</span> * Subclasses can override this method to override request headers or set request-duration properties before the<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * Java method is invoked.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> *<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * <p><a name="line.211"></a>
-<span class="sourceLineNo">212</span> * Resources that don't extend from {@link RestServlet} can implement an equivalent method by overriding the<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * {@link RestCallHandler#onPreCall(RestRequest)} method.<a name="line.213"></a>
-<span class="sourceLineNo">214</span> *<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * @param req The HTTP servlet request object.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * @throws RestException If any error occurs.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> */<a name="line.217"></a>
-<span class="sourceLineNo">218</span> protected void onPreCall(RestRequest req) throws RestException {}<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> * Callback method that gets invoked right after the REST Java method is invoked, but before the serializer is<a name="line.221"></a>
-<span class="sourceLineNo">222</span> * invoked.<a name="line.222"></a>
-<span class="sourceLineNo">223</span> *<a name="line.223"></a>
-<span class="sourceLineNo">224</span> * <p><a name="line.224"></a>
-<span class="sourceLineNo">225</span> * Subclasses can override this method to override request and response headers, or set/override properties used by<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * the serializer.<a name="line.226"></a>
+<span class="sourceLineNo">051</span> rsc.init(this);<a name="line.51"></a>
+<span class="sourceLineNo">052</span> RestContext context = createContext(rsc);<a name="line.52"></a>
+<span class="sourceLineNo">053</span> super.init(servletConfig);<a name="line.53"></a>
+<span class="sourceLineNo">054</span> context.postInit();<a name="line.54"></a>
+<span class="sourceLineNo">055</span> context.postInitChildFirst();<a name="line.55"></a>
+<span class="sourceLineNo">056</span> } catch (RestException e) {<a name="line.56"></a>
+<span class="sourceLineNo">057</span> // Thrown RestExceptions are simply caught and re-thrown on subsequent calls to service().<a name="line.57"></a>
+<span class="sourceLineNo">058</span> initException = e;<a name="line.58"></a>
+<span class="sourceLineNo">059</span> log(SEVERE, e, "Servlet init error on class ''{0}''", getClass().getName());<a name="line.59"></a>
+<span class="sourceLineNo">060</span> } catch (ServletException e) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> initException = e;<a name="line.61"></a>
+<span class="sourceLineNo">062</span> log(SEVERE, e, "Servlet init error on class ''{0}''", getClass().getName());<a name="line.62"></a>
+<span class="sourceLineNo">063</span> throw e;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> } catch (Exception e) {<a name="line.64"></a>
+<span class="sourceLineNo">065</span> initException = e;<a name="line.65"></a>
+<span class="sourceLineNo">066</span> log(SEVERE, e, "Servlet init error on class ''{0}''", getClass().getName());<a name="line.66"></a>
+<span class="sourceLineNo">067</span> throw new ServletException(e);<a name="line.67"></a>
+<span class="sourceLineNo">068</span> } catch (Throwable e) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> initException = new Exception(e);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> log(SEVERE, e, "Servlet init error on class ''{0}''", getClass().getName());<a name="line.70"></a>
+<span class="sourceLineNo">071</span> throw new ServletException(e);<a name="line.71"></a>
+<span class="sourceLineNo">072</span> } finally {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> isInitialized = true;<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span> }<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span> /*<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * Bypasses the init(ServletConfig) method and just calls the super.init(ServletConfig) method directly.<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * Used when subclasses of RestServlet are attached as child resources.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> */<a name="line.80"></a>
+<span class="sourceLineNo">081</span> void innerInit(ServletConfig servletConfig) throws ServletException {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> super.init(servletConfig);<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> /*<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * Sets the context object for this servlet.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * Used when subclasses of RestServlet are attached as child resources.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> */<a name="line.88"></a>
+<span class="sourceLineNo">089</span> void setContext(RestContext context) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> this.config = context.config;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> this.context = context;<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> * Convenience method if you want to perform initialization on your resource after all configuration settings<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * have been made.<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> * This allows you to get access to the {@link RestContext} object during initialization.<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 default implementation does nothing.<a name="line.102"></a>
+<span class="sourceLineNo">103</span> *<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * @param context The servlet context containing all the set-in-stone configurations for this resource.<a name="line.104"></a>
+<span class="sourceLineNo">105</span> * @throws Exception Any exception can be thrown to signal an initialization failure.<a name="line.105"></a>
+<span class="sourceLineNo">106</span> */<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public synchronized void init(RestContext context) throws Exception {}<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> private synchronized RestContext createContext(RestConfig config) throws Exception {<a name="line.110"></a>
+<span class="sourceLineNo">111</span> if (! isInitialized) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> this.config = config;<a name="line.112"></a>
+<span class="sourceLineNo">113</span> this.context = new RestContext(this, this.getServletContext(), config);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> this.isInitialized = true;<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span> return context;<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> //--------------------------------------------------------------------------------<a name="line.120"></a>
+<span class="sourceLineNo">121</span> // Other methods<a name="line.121"></a>
+<span class="sourceLineNo">122</span> //--------------------------------------------------------------------------------<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span> /**<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * The main service method.<a name="line.125"></a>
+<span class="sourceLineNo">126</span> *<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * <p><a name="line.127"></a>
+<span class="sourceLineNo">128</span> * Subclasses can optionally override this method if they want to tailor the behavior of requests.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> @Override /* Servlet */<a name="line.130"></a>
+<span class="sourceLineNo">131</span> public void service(HttpServletRequest r1, HttpServletResponse r2) throws ServletException, IOException {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> try {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (initException != null) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> if (initException instanceof RestException)<a name="line.134"></a>
+<span class="sourceLineNo">135</span> throw (RestException)initException;<a name="line.135"></a>
+<span class="sourceLineNo">136</span> throw new RestException(SC_INTERNAL_SERVER_ERROR, initException);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> }<a name="line.137"></a>
+<span class="sourceLineNo">138</span> if (context == null)<a name="line.138"></a>
+<span class="sourceLineNo">139</span> throw new RestException(SC_INTERNAL_SERVER_ERROR, "Servlet {0} not initialized. init(RestConfig) was not called. This can occur if you've overridden this method but didn't call super.init(RestConfig).", getClass().getName());<a name="line.139"></a>
+<span class="sourceLineNo">140</span> if (! isInitialized)<a name="line.140"></a>
+<span class="sourceLineNo">141</span> throw new RestException(SC_INTERNAL_SERVER_ERROR, "Servlet {0} has not been initialized", getClass().getName());<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> context.getCallHandler().service(r1, r2);<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> } catch (RestException e) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> r2.sendError(SC_INTERNAL_SERVER_ERROR, e.getLocalizedMessage());<a name="line.146"></a>
+<span class="sourceLineNo">147</span> } catch (Throwable e) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> r2.sendError(SC_INTERNAL_SERVER_ERROR, e.getLocalizedMessage());<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> /**<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * Returns the read-only context object that contains all the configuration information about this resource.<a name="line.153"></a>
+<span class="sourceLineNo">154</span> *<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * <p><a name="line.155"></a>
+<span class="sourceLineNo">156</span> * This object is <jk>null</jk> during the call to {@link #init(ServletConfig)} but is populated by the time<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * {@link #init()} is called.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> *<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * <p><a name="line.159"></a>
+<span class="sourceLineNo">160</span> * Resource classes that don't extend from {@link RestServlet} can add the following method to their class to get<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * access to this context object:<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * <p class='bcode'><a name="line.162"></a>
+<span class="sourceLineNo">163</span> * <jk>public void</jk> init(RestServletContext context) <jk>throws</jk> Exception;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * </p><a name="line.164"></a>
+<span class="sourceLineNo">165</span> *<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @return The context information on this servlet.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> */<a name="line.167"></a>
+<span class="sourceLineNo">168</span> protected RestContext getContext() {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> return context;<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> * Convenience method for calling <code>getContext().getLogger().log(level, msg, args);</code><a name="line.173"></a>
+<span class="sourceLineNo">174</span> *<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * @param level The log level.<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @param msg The message to log.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * @param args Optional {@link MessageFormat}-style arguments.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> */<a name="line.178"></a>
+<span class="sourceLineNo">179</span> protected void log(Level level, String msg, Object...args) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> if (context != null)<a name="line.180"></a>
+<span class="sourceLineNo">181</span> context.getLogger().log(level, msg, args);<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> /**<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * Convenience method for calling <code>getContext().getLogger().log(level, cause, msg, args);</code><a name="line.185"></a>
+<span class="sourceLineNo">186</span> *<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * @param level The log level.<a name="line.187"></a>
+<span class="sourceLineNo">188</span> * @param cause The cause.<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * @param msg The message to log.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * @param args Optional {@link MessageFormat}-style arguments.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> */<a name="line.191"></a>
+<span class="sourceLineNo">192</span> protected void log(Level level, Throwable cause, String msg, Object...args) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> if (context != null)<a name="line.193"></a>
+<span class="sourceLineNo">194</span> context.getLogger().log(level, cause, msg, args);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> else {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // If context failed to initialize, log to the console.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> System.err.println(format(msg, args));<a name="line.197"></a>
+<span class="sourceLineNo">198</span> if (cause != null)<a name="line.198"></a>
+<span class="sourceLineNo">199</span> cause.printStackTrace();<a name="line.199"></a>
+<span class="sourceLineNo">200</span> }<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> @Override /* GenericServlet */<a name="line.203"></a>
+<span class="sourceLineNo">204</span> public RestConfig getServletConfig() {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> return config;<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> @Override /* GenericServlet */<a name="line.208"></a>
+<span class="sourceLineNo">209</span> public void destroy() {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (context != null)<a name="line.210"></a>
+<span class="sourceLineNo">211</span> context.destroy();<a name="line.211"></a>
+<span class="sourceLineNo">212</span> super.destroy();<a name="line.212"></a>
+<span class="sourceLineNo">213</span> }<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span> /**<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * Convenience method for calling <code>getContext().getMessages();</code><a name="line.216"></a>
+<span class="sourceLineNo">217</span> *<a name="line.217"></a>
+<span class="sourceLineNo">218</span> * @return The resource bundle for this resource. Never <jk>null</jk>.<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * @see RestContext#getProperties()<a name="line.219"></a>
+<span class="sourceLineNo">220</span> */<a name="line.220"></a>
+<span class="sourceLineNo">221</span> public MessageBundle getMessages() {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> return context.getMessages();<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> * Convenience method for calling <code>getContext().getProperties();</code><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> * Resources that don't extend from {@link RestServlet} can implement an equivalent method by overriding the<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * {@link RestCallHandler#onPostCall(RestRequest,RestResponse)} method.<a name="line.230"></a>
-<span class="sourceLineNo">231</span> *<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * @param req The HTTP servlet request object.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * @param res The HTTP servlet response object.<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * @throws RestException If any error occurs.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> */<a name="line.235"></a>
-<span class="sourceLineNo">236</span> protected void onPostCall(RestRequest req, RestResponse res) throws RestException {}<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> /**<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * Convenience method for calling <code>getContext().getLogger().log(level, msg, args);</code><a name="line.239"></a>
-<span class="sourceLineNo">240</span> *<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * @param level The log level.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * @param msg The message to log.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * @param args Optional {@link MessageFormat}-style arguments.<a name="line.243"></a>
-<span class="sourceLineNo">244</span> */<a name="line.244"></a>
-<span class="sourceLineNo">245</span> protected void log(Level level, String msg, Object...args) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> if (context != null)<a name="line.246"></a>
-<span class="sourceLineNo">247</span> context.getLogger().log(level, msg, args);<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> /**<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * Convenience method for calling <code>getContext().getLogger().log(level, cause, msg, args);</code><a name="line.251"></a>
-<span class="sourceLineNo">252</span> *<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * @param level The log level.<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * @param cause The cause.<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * @param msg The message to log.<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * @param args Optional {@link MessageFormat}-style arguments.<a name="line.256"></a>
-<span class="sourceLineNo">257</span> */<a name="line.257"></a>
-<span class="sourceLineNo">258</span> protected void log(Level level, Throwable cause, String msg, Object...args) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> if (context != null)<a name="line.259"></a>
-<span class="sourceLineNo">260</span> context.getLogger().log(level, cause, msg, args);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> else {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> // If context failed to initialize, log to the console.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> System.err.println(format(msg, args));<a name="line.263"></a>
-<span class="sourceLineNo">264</span> if (cause != null)<a name="line.264"></a>
-<span class="sourceLineNo">265</span> cause.printStackTrace();<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> @Override /* GenericServlet */<a name="line.269"></a>
-<span class="sourceLineNo">270</span> public RestConfig getServletConfig() {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> return config;<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> @Override /* GenericServlet */<a name="line.274"></a>
-<span class="sourceLineNo">275</span> public void destroy() {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> if (context != null)<a name="line.276"></a>
-<span class="sourceLineNo">277</span> context.destroy();<a name="line.277"></a>
-<span class="sourceLineNo">278</span> super.destroy();<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> /**<a name="line.281"></a>
-<span class="sourceLineNo">282</span> * Convenience method for calling <code>getContext().getMessages();</code><a name="line.282"></a>
-<span class="sourceLineNo">283</span> *<a name="line.283"></a>
-<span class="sourceLineNo">284</span> * @return The resource bundle for this resource. Never <jk>null</jk>.<a name="line.284"></a>
-<span class="sourceLineNo">285</span> * @see RestContext#getProperties()<a name="line.285"></a>
-<span class="sourceLineNo">286</span> */<a name="line.286"></a>
-<span class="sourceLineNo">287</span> public MessageBundle getMessages() {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> return context.getMessages();<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> /**<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * Convenience method for calling <code>getContext().getProperties();</code><a name="line.292"></a>
-<span class="sourceLineNo">293</span> *<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * @return The resource properties as an {@link ObjectMap}.<a name="line.294"></a>
-<span class="sourceLineNo">295</span> * @see RestContext#getProperties()<a name="line.295"></a>
-<span class="sourceLineNo">296</span> */<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public ObjectMap getProperties() {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> return getContext().getProperties();<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> /**<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * Convenience method for calling <code>getContext().getBeanContext();</code><a name="line.302"></a>
-<span class="sourceLineNo">303</span> *<a name="line.303"></a>
-<span class="sourceLineNo">304</span> * @return The bean context used for parsing path variables and header values.<a name="line.304"></a>
-<span class="sourceLineNo">305</span> * @see RestContext#getBeanContext()<a name="line.305"></a>
-<span class="sourceLineNo">306</span> */<a name="line.306"></a>
-<span class="sourceLineNo">307</span> public BeanContext getBeanContext() {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> return getContext().getBeanContext();<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>}<a name="line.310"></a>
+<span class="sourceLineNo">228</span> * @return The resource properties as an {@link ObjectMap}.<a name="line.228"></a>
+<span class="sourceLineNo">229</span> * @see RestContext#getProperties()<a name="line.229"></a>
+<span class="sourceLineNo">230</span> */<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public ObjectMap getProperties() {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> return getContext().getProperties();<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> /**<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * Convenience method for calling <code>getContext().getBeanContext();</code><a name="line.236"></a>
+<span class="sourceLineNo">237</span> *<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * @return The bean context used for parsing path variables and header values.<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * @see RestContext#getBeanContext()<a name="line.239"></a>
+<span class="sourceLineNo">240</span> */<a name="line.240"></a>
+<span class="sourceLineNo">241</span> public BeanContext getBeanContext() {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> return getContext().getBeanContext();<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletDefault.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletDefault.html
index aaeaf1e..17ade01 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletDefault.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletDefault.html
@@ -203,7 +203,7 @@
<span class="sourceLineNo">195</span> "<h2>$R{methodSummary,$R{servletDescription}}</h2>",<a name="line.195"></a>
<span class="sourceLineNo">196</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.196"></a>
<span class="sourceLineNo">197</span> },<a name="line.197"></a>
-<span class="sourceLineNo">198</span> stylesheet="servlet:/styles/devops.css"<a name="line.198"></a>
+<span class="sourceLineNo">198</span> stylesheet="servlet:/styles/light.css"<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> // The location on the classpath or file system of the fav-icon.<a name="line.201"></a>