http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5f11cb85/content/site/apidocs/src-html/org/apache/juneau/internal/DateUtils.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/internal/DateUtils.html 
b/content/site/apidocs/src-html/org/apache/juneau/internal/DateUtils.html
index a4fcb0f..034fe58 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/DateUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/DateUtils.html
@@ -115,143 +115,151 @@
 <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 name="line.109"></a>
-<span class="sourceLineNo">110</span>    * Formats the given date according to 
the RFC 1123 pattern.<a name="line.110"></a>
+<span class="sourceLineNo">110</span>    * Parses an ISO8601 string and 
converts it to a {@link Calendar}.<a name="line.110"></a>
 <span class="sourceLineNo">111</span>    *<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    * @param date The date to format.<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>    * @return An RFC 1123 formatted date 
string.<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    *<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    * @see #PATTERN_RFC1123<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>    */<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   public static String formatDate(final 
Date date) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      return formatDate(date, 
PATTERN_RFC1123);<a name="line.118"></a>
+<span class="sourceLineNo">112</span>    * @param s The string to parse.<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    * @return The parsed value, or 
&lt;jk&gt;null&lt;/jk&gt; if the string was &lt;jk&gt;null&lt;/jk&gt; or 
empty.<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    */<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   public static Calendar 
parseISO8601Calendar(String s) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      if (StringUtils.isEmpty(s))<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>         return null;<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>      return 
DatatypeConverter.parseDateTime(toValidISO8601DT(s));<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>    * Formats the given date according to 
the specified pattern. The pattern must conform to that used by the<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>    * {@link SimpleDateFormat simple date 
format} class.<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    *<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    * @param date The date to format.<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    * @param pattern The pattern to use 
for formatting the date.<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * @return A formatted date string.<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>    * @throws IllegalArgumentException If 
the given date pattern is invalid.<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    * @see SimpleDateFormat<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>    */<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   public static String formatDate(final 
Date date, final String pattern) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      final SimpleDateFormat formatter = 
DateFormatHolder.formatFor(pattern);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      return formatter.format(date);<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>    * Clears thread-local variable 
containing {@link java.text.DateFormat} cache.<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    */<a name="line.138"></a>
-<span class="sourceLineNo">139</span>   public static void clearThreadLocal() 
{<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      
DateFormatHolder.clearThreadLocal();<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>   /** This class should not be 
instantiated. */<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   private DateUtils() {<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>    * A factory for {@link 
SimpleDateFormat}s. The instances are stored in a threadlocal way because 
SimpleDateFormat<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    * is not threadsafe as noted in 
{@link SimpleDateFormat its javadoc}.<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>   final static class DateFormatHolder 
{<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      private static final 
ThreadLocal&lt;SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt;&gt; 
THREADLOCAL_FORMATS = new 
ThreadLocal&lt;SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt;&gt;() 
{<a name="line.153"></a>
-<span class="sourceLineNo">154</span>         @Override<a name="line.154"></a>
-<span class="sourceLineNo">155</span>         protected 
SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt; initialValue() {<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>            return new 
SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt;(new 
HashMap&lt;String,SimpleDateFormat&gt;());<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>       * creates a {@link 
SimpleDateFormat} for the requested format string.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>       *<a name="line.162"></a>
-<span class="sourceLineNo">163</span>       * @param pattern a 
non-&lt;code&gt;null&lt;/code&gt; format String according to {@link 
SimpleDateFormat}. The format is not<a name="line.163"></a>
-<span class="sourceLineNo">164</span>       *    checked against 
&lt;code&gt;null&lt;/code&gt; since all paths go through {@link DateUtils}.<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>       * @return the requested format. 
This simple dateformat should not be used to<a name="line.165"></a>
-<span class="sourceLineNo">166</span>       *    {@link 
SimpleDateFormat#applyPattern(String) apply} to a different pattern.<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>       */<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      public static SimpleDateFormat 
formatFor(final String pattern) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>         final 
SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt; ref = 
THREADLOCAL_FORMATS.get();<a name="line.169"></a>
-<span class="sourceLineNo">170</span>         
Map&lt;String,SimpleDateFormat&gt; formats = ref.get();<a name="line.170"></a>
-<span class="sourceLineNo">171</span>         if (formats == null) {<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>            formats = new 
HashMap&lt;String,SimpleDateFormat&gt;();<a name="line.172"></a>
-<span class="sourceLineNo">173</span>            THREADLOCAL_FORMATS.set(new 
SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt;(formats));<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>         }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>         SimpleDateFormat format = 
formats.get(pattern);<a name="line.175"></a>
-<span class="sourceLineNo">176</span>         if (format == null) {<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>            format = new 
SimpleDateFormat(pattern, Locale.US);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>            
format.setTimeZone(TimeZone.getTimeZone("GMT"));<a name="line.178"></a>
-<span class="sourceLineNo">179</span>            formats.put(pattern, 
format);<a name="line.179"></a>
-<span class="sourceLineNo">180</span>         }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>         return format;<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>      public static void 
clearThreadLocal() {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>         THREADLOCAL_FORMATS.remove();<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>    * Pads out an ISO8601 string so that 
it can be parsed using {@link DatatypeConverter#parseDateTime(String)}.<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    * &lt;ul&gt;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04T15:30:45-05:00"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-04T15:30:45-05:00"&lt;/js&gt;<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04T15:30:45Z"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-04T15:30:45Z"&lt;/js&gt;<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04T15:30:45.1Z"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-04T15:30:45.1Z"&lt;/js&gt;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04T15:30Z"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-04T15:30:00Z"&lt;/js&gt;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04T15:30"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-04T15:30:00"&lt;/js&gt;<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04"&lt;/js&gt; --&amp;gt; 
&lt;li&gt;&lt;js&gt;"2001-07-04T00:00:00"&lt;/js&gt;<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-01T00:00:00"&lt;/js&gt;<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    *    
&lt;li&gt;&lt;js&gt;"2001"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-01-01T00:00:00"&lt;/js&gt;<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    * &lt;/ul&gt;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    *<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    * @param in The string to pad.<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    * @return The padded string.<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>    */<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   public static final String 
toValidISO8601DT(String in) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>      // "2001-07-04T15:30:45Z"<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>      final int<a name="line.208"></a>
-<span class="sourceLineNo">209</span>         S1 = 1, // Looking for -<a 
name="line.209"></a>
-<span class="sourceLineNo">210</span>         S2 = 2, // Found -, looking for 
-<a name="line.210"></a>
-<span class="sourceLineNo">211</span>         S3 = 3, // Found -, looking for 
T<a name="line.211"></a>
-<span class="sourceLineNo">212</span>         S4 = 4, // Found T, looking for 
:<a name="line.212"></a>
-<span class="sourceLineNo">213</span>         S5 = 5, // Found :, looking for 
:<a name="line.213"></a>
-<span class="sourceLineNo">214</span>         S6 = 6; // Found :<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span>      int state = 1;<a 
name="line.216"></a>
-<span class="sourceLineNo">217</span>      for (int i = 0; i &lt; in.length(); 
i++) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>         char c = in.charAt(i);<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>         if (state == S1) {<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>            if (c == '-')<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>               state = S2;<a 
name="line.221"></a>
-<span class="sourceLineNo">222</span>         } else if (state == S2) {<a 
name="line.222"></a>
-<span class="sourceLineNo">223</span>            if (c == '-')<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>               state = S3;<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>         } else if (state == S3) {<a 
name="line.225"></a>
-<span class="sourceLineNo">226</span>            if (c == 'T')<a 
name="line.226"></a>
-<span class="sourceLineNo">227</span>               state = S4;<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>         } else if (state == S4) {<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>            if (c == ':')<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>               state = S5;<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>         } else if (state == S5) {<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>            if (c == ':')<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>               state = S6;<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>         }<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>      switch(state) {<a 
name="line.237"></a>
-<span class="sourceLineNo">238</span>         case S1: return in + 
"-01-01T00:00:00";<a name="line.238"></a>
-<span class="sourceLineNo">239</span>         case S2: return in + 
"-01T00:00:00";<a name="line.239"></a>
-<span class="sourceLineNo">240</span>         case S3: return in + 
"T00:00:00";<a name="line.240"></a>
-<span class="sourceLineNo">241</span>         case S4: return in + ":00:00";<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>         case S5: return in + ":00";<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>         default: return in;<a 
name="line.243"></a>
-<span class="sourceLineNo">244</span>      }<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>}<a name="line.246"></a>
+<span class="sourceLineNo">122</span>    * Formats the given date according to 
the RFC 1123 pattern.<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    *<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    * @param date The date to format.<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    * @return An RFC 1123 formatted date 
string.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    *<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    * @see #PATTERN_RFC1123<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    */<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   public static String formatDate(final 
Date date) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      return formatDate(date, 
PATTERN_RFC1123);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   }<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span>   /**<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    * Formats the given date according to 
the specified pattern. The pattern must conform to that used by the<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>    * {@link SimpleDateFormat simple date 
format} class.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    *<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    * @param date The date to format.<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>    * @param pattern The pattern to use 
for formatting the date.<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    * @return A formatted date string.<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>    * @throws IllegalArgumentException If 
the given date pattern is invalid.<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    * @see SimpleDateFormat<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    */<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   public static String formatDate(final 
Date date, final String pattern) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      final SimpleDateFormat formatter = 
DateFormatHolder.formatFor(pattern);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      return formatter.format(date);<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>    * Clears thread-local variable 
containing {@link java.text.DateFormat} cache.<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    */<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   public static void clearThreadLocal() 
{<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      
DateFormatHolder.clearThreadLocal();<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>    * A factory for {@link 
SimpleDateFormat}s. The instances are stored in a threadlocal way because 
SimpleDateFormat<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    * is not threadsafe as noted in 
{@link SimpleDateFormat its javadoc}.<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>   final static class DateFormatHolder 
{<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      private static final 
ThreadLocal&lt;SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt;&gt; 
THREADLOCAL_FORMATS = new 
ThreadLocal&lt;SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt;&gt;() 
{<a name="line.161"></a>
+<span class="sourceLineNo">162</span>         @Override<a name="line.162"></a>
+<span class="sourceLineNo">163</span>         protected 
SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt; initialValue() {<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>            return new 
SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt;(new 
HashMap&lt;String,SimpleDateFormat&gt;());<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>      /**<a name="line.168"></a>
+<span class="sourceLineNo">169</span>       * creates a {@link 
SimpleDateFormat} for the requested format string.<a name="line.169"></a>
+<span class="sourceLineNo">170</span>       *<a name="line.170"></a>
+<span class="sourceLineNo">171</span>       * @param pattern a 
non-&lt;code&gt;null&lt;/code&gt; format String according to {@link 
SimpleDateFormat}. The format is not<a name="line.171"></a>
+<span class="sourceLineNo">172</span>       *    checked against 
&lt;code&gt;null&lt;/code&gt; since all paths go through {@link DateUtils}.<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>       * @return the requested format. 
This simple dateformat should not be used to<a name="line.173"></a>
+<span class="sourceLineNo">174</span>       *    {@link 
SimpleDateFormat#applyPattern(String) apply} to a different pattern.<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>       */<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      public static SimpleDateFormat 
formatFor(final String pattern) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>         final 
SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt; ref = 
THREADLOCAL_FORMATS.get();<a name="line.177"></a>
+<span class="sourceLineNo">178</span>         
Map&lt;String,SimpleDateFormat&gt; formats = ref.get();<a name="line.178"></a>
+<span class="sourceLineNo">179</span>         if (formats == null) {<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>            formats = new 
HashMap&lt;String,SimpleDateFormat&gt;();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>            THREADLOCAL_FORMATS.set(new 
SoftReference&lt;Map&lt;String,SimpleDateFormat&gt;&gt;(formats));<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>         }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>         SimpleDateFormat format = 
formats.get(pattern);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>         if (format == null) {<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>            format = new 
SimpleDateFormat(pattern, Locale.US);<a name="line.185"></a>
+<span class="sourceLineNo">186</span>            
format.setTimeZone(TimeZone.getTimeZone("GMT"));<a name="line.186"></a>
+<span class="sourceLineNo">187</span>            formats.put(pattern, 
format);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>         }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>         return format;<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>      public static void 
clearThreadLocal() {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>         THREADLOCAL_FORMATS.remove();<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span>   /**<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    * Pads out an ISO8601 string so that 
it can be parsed using {@link DatatypeConverter#parseDateTime(String)}.<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>    * &lt;ul&gt;<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04T15:30:45-05:00"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-04T15:30:45-05:00"&lt;/js&gt;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04T15:30:45Z"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-04T15:30:45Z"&lt;/js&gt;<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04T15:30:45.1Z"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-04T15:30:45.1Z"&lt;/js&gt;<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04T15:30Z"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-04T15:30:00Z"&lt;/js&gt;<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04T15:30"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-04T15:30:00"&lt;/js&gt;<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07-04"&lt;/js&gt; --&amp;gt; 
&lt;li&gt;&lt;js&gt;"2001-07-04T00:00:00"&lt;/js&gt;<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    *    
&lt;li&gt;&lt;js&gt;"2001-07"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-07-01T00:00:00"&lt;/js&gt;<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    *    
&lt;li&gt;&lt;js&gt;"2001"&lt;/js&gt; --&amp;gt; 
&lt;js&gt;"2001-01-01T00:00:00"&lt;/js&gt;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    * &lt;/ul&gt;<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    *<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    * @param in The string to pad.<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>    * @return The padded string.<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>    */<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   public static final String 
toValidISO8601DT(String in) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>      // "2001-07-04T15:30:45Z"<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>      final int<a name="line.216"></a>
+<span class="sourceLineNo">217</span>         S1 = 1, // Looking for -<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>         S2 = 2, // Found -, looking for 
-<a name="line.218"></a>
+<span class="sourceLineNo">219</span>         S3 = 3, // Found -, looking for 
T<a name="line.219"></a>
+<span class="sourceLineNo">220</span>         S4 = 4, // Found T, looking for 
:<a name="line.220"></a>
+<span class="sourceLineNo">221</span>         S5 = 5, // Found :, looking for 
:<a name="line.221"></a>
+<span class="sourceLineNo">222</span>         S6 = 6; // Found :<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>      int state = 1;<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span>      for (int i = 0; i &lt; in.length(); 
i++) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>         char c = in.charAt(i);<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>         if (state == S1) {<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>            if (c == '-')<a 
name="line.228"></a>
+<span class="sourceLineNo">229</span>               state = S2;<a 
name="line.229"></a>
+<span class="sourceLineNo">230</span>         } else if (state == S2) {<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>            if (c == '-')<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>               state = S3;<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>         } else if (state == S3) {<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>            if (c == 'T')<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>               state = S4;<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>         } else if (state == S4) {<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>            if (c == ':')<a 
name="line.237"></a>
+<span class="sourceLineNo">238</span>               state = S5;<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>         } else if (state == S5) {<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>            if (c == ':')<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>               state = S6;<a 
name="line.241"></a>
+<span class="sourceLineNo">242</span>         }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      }<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>      switch(state) {<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>         case S1: return in + 
"-01-01T00:00:00";<a name="line.246"></a>
+<span class="sourceLineNo">247</span>         case S2: return in + 
"-01T00:00:00";<a name="line.247"></a>
+<span class="sourceLineNo">248</span>         case S3: return in + 
"T00:00:00";<a name="line.248"></a>
+<span class="sourceLineNo">249</span>         case S4: return in + ":00:00";<a 
name="line.249"></a>
+<span class="sourceLineNo">250</span>         case S5: return in + ":00";<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>         default: return in;<a 
name="line.251"></a>
+<span class="sourceLineNo">252</span>      }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>   }<a name="line.253"></a>
+<span class="sourceLineNo">254</span>}<a name="line.254"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5f11cb85/content/site/apidocs/src-html/org/apache/juneau/internal/JuneauLogger.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/internal/JuneauLogger.html 
b/content/site/apidocs/src-html/org/apache/juneau/internal/JuneauLogger.html
index 72cac30..430ca54 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/JuneauLogger.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/JuneauLogger.html
@@ -21,286 +21,287 @@
 <span class="sourceLineNo">013</span>package org.apache.juneau.internal;<a 
name="line.13"></a>
 <span class="sourceLineNo">014</span><a name="line.14"></a>
 <span class="sourceLineNo">015</span>import static 
java.util.logging.Level.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import java.text.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import java.util.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import java.util.concurrent.*;<a 
name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.logging.*;<a 
name="line.20"></a>
-<span class="sourceLineNo">021</span><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.serializer.*;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.transforms.*;<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> * Wraps and extends the {@link 
java.util.logging.Logger} class to provide some additional convenience 
methods.<a name="line.27"></a>
-<span class="sourceLineNo">028</span> */<a name="line.28"></a>
-<span class="sourceLineNo">029</span>public class JuneauLogger extends 
java.util.logging.Logger {<a name="line.29"></a>
-<span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>   private static final WriterSerializer 
serializer = new JsonSerializerBuilder()<a name="line.31"></a>
-<span class="sourceLineNo">032</span>      .pojoSwaps(<a name="line.32"></a>
-<span class="sourceLineNo">033</span>         CalendarSwap.ISO8601DTZ.class,<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>         DateSwap.ISO8601DTZ.class,<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>         EnumerationSwap.class,<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>         IteratorSwap.class<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>      )<a name="line.37"></a>
-<span class="sourceLineNo">038</span>      .simple()<a name="line.38"></a>
-<span class="sourceLineNo">039</span>      .build();<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>   private static final 
ConcurrentHashMap&lt;Class&lt;?&gt;,String&gt; rbMap = new 
ConcurrentHashMap&lt;Class&lt;?&gt;,String&gt;();<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>   private final ResourceBundle rb;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>   private final java.util.logging.Logger 
innerLogger;<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>    * Get logger for specified class.<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>    *<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    * @param forClass The class to create 
a logger for.<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    * @return A new 
&lt;l&gt;Logger&lt;/l&gt;.<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    */<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   public static JuneauLogger 
getLogger(Class&lt;?&gt; forClass) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      return new 
JuneauLogger(java.util.logging.Logger.getLogger(forClass.getName()));<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>    * Get logger for specified class 
using the specified resource bundle name.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    *<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    * @param forClass The class to create 
a logger for.<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * @param resourceBundleName The name 
of the resource bundle.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * Can be any of the following 
formats:<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * &lt;ol&gt;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    *    &lt;li&gt;An absolute path.  
E.g. &lt;js&gt;"com/foo/nls/Messages"&lt;/js&gt;.<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    *    &lt;li&gt;A path relative to the 
package of the class.  E.g. &lt;js&gt;"nls/Messages"&lt;/js&gt;.<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>    * &lt;/ol&gt;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    * Both &lt;js&gt;'.'&lt;/js&gt; and 
&lt;js&gt;'/'&lt;/js&gt; can be used as path delimiters.<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    * @return A new 
&lt;l&gt;Logger&lt;/l&gt;.<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    */<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   public static JuneauLogger 
getLogger(Class&lt;?&gt; forClass, String resourceBundleName) {<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>      return new 
JuneauLogger(java.util.logging.Logger.getLogger(forClass.getName(), 
resolveResourceBundleName(forClass, resourceBundleName)));<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   }<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>   /**<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    * Get logger with specified name 
using the specified resource bundle name.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    *<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    * @param name The name of the logger 
to use.<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    * @param resourceBundleName The name 
of the resource bundle.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    *    Can be any of the following 
formats:<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    *    &lt;ol&gt;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    *       &lt;li&gt;An absolute path.  
E.g. &lt;js&gt;"com/foo/nls/Messages"&lt;/js&gt;.<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    *       &lt;li&gt;A path relative to 
the package of the class.  E.g. &lt;js&gt;"nls/Messages"&lt;/js&gt;.<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>    *    &lt;/ol&gt;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    *    Both &lt;js&gt;'.'&lt;/js&gt; 
and &lt;js&gt;'/'&lt;/js&gt; can be used as path delimiters.<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>    * @return A new 
&lt;l&gt;Logger&lt;/l&gt;.<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    */<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   public static synchronized 
JuneauLogger getLogger(String name, String resourceBundleName) {<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>      return new 
JuneauLogger(java.util.logging.Logger.getLogger(name, resourceBundleName));<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>   }<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>   /**<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    * Constructor.<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    *<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    * @param innerLogger The wrapped 
logger.<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    */<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   protected 
JuneauLogger(java.util.logging.Logger innerLogger) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      super(innerLogger.getName(), 
innerLogger.getResourceBundleName());<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      this.innerLogger = innerLogger;<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>      this.rb = getResourceBundle();<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>   /**<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#SEVERE} level.<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>    *<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    * @param msg The message to log.<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    */<a name="line.106"></a>
-<span class="sourceLineNo">107</span>   public void severe(String msg, 
Object...args) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      if (isLoggable(SEVERE))<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>         log(SEVERE, msg, args);<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>   }<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>   /**<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#WARNING} level.<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>    *<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    * @param msg The message to log.<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    */<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   public void warning(String msg, 
Object...args) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      if (isLoggable(WARNING))<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>         log(WARNING, msg, args);<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 name="line.123"></a>
-<span class="sourceLineNo">124</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#INFO} level.<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>    *<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    * @param msg The message to log.<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    */<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   public void info(String msg, 
Object...args) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      if (isLoggable(INFO))<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>         log(INFO, msg, args);<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>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#CONFIG} level.<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>    *<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    * @param msg The message to log.<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    */<a name="line.139"></a>
-<span class="sourceLineNo">140</span>   public void config(String msg, 
Object...args) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      if (isLoggable(CONFIG))<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>         log(CONFIG, msg, args);<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>   }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>   /**<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#FINE} level.<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>    *<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    * @param msg The message to log.<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    */<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   public void fine(String msg, 
Object...args) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      if (isLoggable(FINE))<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>         log(FINE, msg, args);<a 
name="line.153"></a>
-<span class="sourceLineNo">154</span>   }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span>   /**<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#FINER} level.<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>    *<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    * @param msg The message to log.<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    */<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   public void finer(String msg, 
Object...args) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      if (isLoggable(FINER))<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>         log(FINER, msg, args);<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>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#FINEST} level.<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>    *<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    * @param msg The message to log.<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    */<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   public void finest(String msg, 
Object...args) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      if (isLoggable(FINEST))<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>         log(FINEST, msg, args);<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>   }<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>   /**<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    * Logs an exception as {@link 
Level#SEVERE} level.<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    *<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    * @param t The Throwable object to 
log.<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    */<a name="line.182"></a>
-<span class="sourceLineNo">183</span>   public void severe(Throwable t) {<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>      if (isLoggable(SEVERE))<a 
name="line.184"></a>
-<span class="sourceLineNo">185</span>         log(SEVERE, 
t.getLocalizedMessage(), t);<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>    * Logs an exception as {@link 
Level#WARNING} level.<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    *<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    * @param t The Throwable object to 
log.<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    */<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   public void warning(Throwable t) {<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>      if (isLoggable(WARNING))<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>         log(WARNING, 
t.getLocalizedMessage(), t);<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>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#SEVERE} level.<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>    *<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    * @param t The Throwable object 
associated with the event that needs to be logged.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    * @param msg The message to log.<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    */<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   public void severe(Throwable t, String 
msg, Object...args) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      if (isLoggable(SEVERE))<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>         log(SEVERE, getMessage(msg, 
args), t);<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>   /**<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#WARNING} level.<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>    *<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    * @param t The Throwable object 
associated with the event that needs to be logged.<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    * @param msg The message to log.<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    */<a name="line.216"></a>
-<span class="sourceLineNo">217</span>   public void warning(Throwable t, 
String msg, Object...args) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      if (isLoggable(WARNING))<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>         log(WARNING, getMessage(msg, 
args), t);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>   /**<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#INFO} level.<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>    *<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    * @param t The Throwable object 
associated with the event that needs to be logged.<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    * @param msg The message to log.<a 
name="line.226"></a>
-<span class="sourceLineNo">227</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    */<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   public void info(Throwable t, String 
msg, Object...args) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      if (isLoggable(INFO))<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>         log(INFO, getMessage(msg, args), 
t);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span>   @Override /* Logger */<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>   public void log(LogRecord record) {<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>      innerLogger.log(record);<a 
name="line.236"></a>
-<span class="sourceLineNo">237</span>   }<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>   @Override /* Logger */<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>   public boolean isLoggable(Level level) 
{<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      return 
innerLogger.isLoggable(level);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>   /**<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    * Similar to {@link #log(Level, 
String, Object[])}, except arguments are converted to objects<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>    * that are serialized using the 
{@link JsonSerializer#toStringObject(Object)} method.<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    * This allows arbitrary POJOs to be 
serialized as message parameters.<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    *<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    * @param level The level of the given 
message.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    * @param msg The message to log.<a 
name="line.250"></a>
-<span class="sourceLineNo">251</span>    * @param args The POJO arguments.<a 
name="line.251"></a>
-<span class="sourceLineNo">252</span>    */<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   public void logObjects(Level level, 
String msg, Object...args) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      if (isLoggable(level)) {<a 
name="line.254"></a>
-<span class="sourceLineNo">255</span>         for (int i = 0; i &lt; 
args.length; i++)<a name="line.255"></a>
-<span class="sourceLineNo">256</span>            args[i] = 
serializer.toStringObject(args[i]);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>         log(level, msg, args);<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>   private String getMessage(String msg, 
Object...args) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      if (args.length == 0)<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>         return msg;<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span>      if (rb != null &amp;&amp; 
rb.containsKey(msg))<a name="line.264"></a>
-<span class="sourceLineNo">265</span>         msg = rb.getString(msg);<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>      return MessageFormat.format(msg, 
args);<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>   private static String 
resolveResourceBundleName(Class&lt;?&gt; forClass, String path) {<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>      if (StringUtils.isEmpty(path))<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>         return null;<a 
name="line.271"></a>
-<span class="sourceLineNo">272</span>      String rb = rbMap.get(forClass);<a 
name="line.272"></a>
-<span class="sourceLineNo">273</span>      if (rb == null) {<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>         path = path.replace('/', '.');<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>         if (path.startsWith("."))<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>            path = path.substring(1);<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>         ClassLoader cl = 
forClass.getClassLoader();<a name="line.277"></a>
-<span class="sourceLineNo">278</span>         try {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            
ResourceBundle.getBundle(path, Locale.getDefault(), cl);<a name="line.279"></a>
-<span class="sourceLineNo">280</span>            rbMap.putIfAbsent(forClass, 
path);<a name="line.280"></a>
-<span class="sourceLineNo">281</span>         } catch 
(MissingResourceException e) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            try {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>               path = 
forClass.getPackage().getName() + '.' + path;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>               
ResourceBundle.getBundle(path, Locale.getDefault(), cl);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>               
rbMap.putIfAbsent(forClass, path);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>            } catch 
(MissingResourceException e2) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>               
rbMap.putIfAbsent(forClass, "");<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>         rb = rbMap.get(forClass);<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span>      }<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      return ("".equals(rb) ? null : 
rb);<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>}<a name="line.295"></a>
+<span class="sourceLineNo">016</span>import static 
org.apache.juneau.internal.StringUtils.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span><a name="line.17"></a>
+<span class="sourceLineNo">018</span>import java.text.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span>import java.util.*;<a name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.util.concurrent.*;<a 
name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.logging.*;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.juneau.json.*;<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.transforms.*;<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 and extends the {@link 
java.util.logging.Logger} class to provide some additional convenience 
methods.<a name="line.28"></a>
+<span class="sourceLineNo">029</span> */<a name="line.29"></a>
+<span class="sourceLineNo">030</span>public class JuneauLogger extends 
java.util.logging.Logger {<a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span>   private static final WriterSerializer 
serializer = new JsonSerializerBuilder()<a name="line.32"></a>
+<span class="sourceLineNo">033</span>      .pojoSwaps(<a name="line.33"></a>
+<span class="sourceLineNo">034</span>         CalendarSwap.ISO8601DTZ.class,<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>         DateSwap.ISO8601DTZ.class,<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>         EnumerationSwap.class,<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>         IteratorSwap.class<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>      )<a name="line.38"></a>
+<span class="sourceLineNo">039</span>      .simple()<a name="line.39"></a>
+<span class="sourceLineNo">040</span>      .build();<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>   private static final 
ConcurrentHashMap&lt;Class&lt;?&gt;,String&gt; rbMap = new 
ConcurrentHashMap&lt;Class&lt;?&gt;,String&gt;();<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>   private final ResourceBundle rb;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>   private final java.util.logging.Logger 
innerLogger;<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>    * Get logger for specified class.<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>    *<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    * @param forClass The class to create 
a logger for.<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    * @return A new 
&lt;l&gt;Logger&lt;/l&gt;.<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   public static JuneauLogger 
getLogger(Class&lt;?&gt; forClass) {<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      return new 
JuneauLogger(java.util.logging.Logger.getLogger(forClass.getName()));<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>    * Get logger for specified class 
using the specified resource bundle name.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    *<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * @param forClass The class to create 
a logger for.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    * @param resourceBundleName The name 
of the resource bundle.<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * Can be any of the following 
formats:<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    * &lt;ol&gt;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    *    &lt;li&gt;An absolute path.  
E.g. &lt;js&gt;"com/foo/nls/Messages"&lt;/js&gt;.<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    *    &lt;li&gt;A path relative to the 
package of the class.  E.g. &lt;js&gt;"nls/Messages"&lt;/js&gt;.<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>    * &lt;/ol&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    * Both &lt;js&gt;'.'&lt;/js&gt; and 
&lt;js&gt;'/'&lt;/js&gt; can be used as path delimiters.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    * @return A new 
&lt;l&gt;Logger&lt;/l&gt;.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    */<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   public static JuneauLogger 
getLogger(Class&lt;?&gt; forClass, String resourceBundleName) {<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>      return new 
JuneauLogger(java.util.logging.Logger.getLogger(forClass.getName(), 
resolveResourceBundleName(forClass, resourceBundleName)));<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   }<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>   /**<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    * Get logger with specified name 
using the specified resource bundle name.<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    *<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    * @param name The name of the logger 
to use.<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    * @param resourceBundleName The name 
of the resource bundle.<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    *    Can be any of the following 
formats:<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    *    &lt;ol&gt;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    *       &lt;li&gt;An absolute path.  
E.g. &lt;js&gt;"com/foo/nls/Messages"&lt;/js&gt;.<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    *       &lt;li&gt;A path relative to 
the package of the class.  E.g. &lt;js&gt;"nls/Messages"&lt;/js&gt;.<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>    *    &lt;/ol&gt;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    *    Both &lt;js&gt;'.'&lt;/js&gt; 
and &lt;js&gt;'/'&lt;/js&gt; can be used as path delimiters.<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>    * @return A new 
&lt;l&gt;Logger&lt;/l&gt;.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   public static synchronized 
JuneauLogger getLogger(String name, String resourceBundleName) {<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>      return new 
JuneauLogger(java.util.logging.Logger.getLogger(name, resourceBundleName));<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>    * Constructor.<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    *<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    * @param innerLogger The wrapped 
logger.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    */<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   protected 
JuneauLogger(java.util.logging.Logger innerLogger) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      super(innerLogger.getName(), 
innerLogger.getResourceBundleName());<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      this.innerLogger = innerLogger;<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>      this.rb = getResourceBundle();<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>   }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>   /**<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#SEVERE} level.<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>    *<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    * @param msg The message to log.<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   public void severe(String msg, 
Object...args) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      if (isLoggable(SEVERE))<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>         log(SEVERE, msg, args);<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>   }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>   /**<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#WARNING} level.<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>    *<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    * @param msg The message to log.<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   public void warning(String msg, 
Object...args) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      if (isLoggable(WARNING))<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>         log(WARNING, msg, args);<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>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#INFO} level.<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>    *<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    * @param msg The message to log.<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    */<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   public void info(String msg, 
Object...args) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      if (isLoggable(INFO))<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>         log(INFO, msg, args);<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>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#CONFIG} level.<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>    *<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    * @param msg The message to log.<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>   public void config(String msg, 
Object...args) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      if (isLoggable(CONFIG))<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>         log(CONFIG, msg, args);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>   }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>   /**<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#FINE} level.<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>    *<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    * @param msg The message to log.<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    */<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   public void fine(String msg, 
Object...args) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      if (isLoggable(FINE))<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>         log(FINE, msg, args);<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>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#FINER} level.<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    *<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    * @param msg The message to log.<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    */<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   public void finer(String msg, 
Object...args) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      if (isLoggable(FINER))<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>         log(FINER, msg, args);<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>   }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>   /**<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#FINEST} level.<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>    *<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    * @param msg The message to log.<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    */<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   public void finest(String msg, 
Object...args) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      if (isLoggable(FINEST))<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>         log(FINEST, msg, args);<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>   }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span>   /**<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    * Logs an exception as {@link 
Level#SEVERE} level.<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    *<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    * @param t The Throwable object to 
log.<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    */<a name="line.183"></a>
+<span class="sourceLineNo">184</span>   public void severe(Throwable t) {<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>      if (isLoggable(SEVERE))<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>         log(SEVERE, 
t.getLocalizedMessage(), t);<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>    * Logs an exception as {@link 
Level#WARNING} level.<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    *<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    * @param t The Throwable object to 
log.<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    */<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   public void warning(Throwable t) {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>      if (isLoggable(WARNING))<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>         log(WARNING, 
t.getLocalizedMessage(), t);<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>   /**<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#SEVERE} level.<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>    *<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    * @param t The Throwable object 
associated with the event that needs to be logged.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    * @param msg The message to log.<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    */<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   public void severe(Throwable t, String 
msg, Object...args) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      if (isLoggable(SEVERE))<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>         log(SEVERE, getMessage(msg, 
args), t);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span>   /**<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#WARNING} level.<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>    *<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    * @param t The Throwable object 
associated with the event that needs to be logged.<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    * @param msg The message to log.<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    */<a name="line.217"></a>
+<span class="sourceLineNo">218</span>   public void warning(Throwable t, 
String msg, Object...args) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      if (isLoggable(WARNING))<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>         log(WARNING, getMessage(msg, 
args), t);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>   }<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>   /**<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    * Logs a message with the specified 
{@link MessageFormat}-style arguments at {@link Level#INFO} level.<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span>    *<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    * @param t The Throwable object 
associated with the event that needs to be logged.<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    * @param msg The message to log.<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    */<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   public void info(Throwable t, String 
msg, Object...args) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      if (isLoggable(INFO))<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>         log(INFO, getMessage(msg, args), 
t);<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>   @Override /* Logger */<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>   public void log(LogRecord record) {<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>      innerLogger.log(record);<a 
name="line.237"></a>
+<span class="sourceLineNo">238</span>   }<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>   @Override /* Logger */<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>   public boolean isLoggable(Level level) 
{<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      return 
innerLogger.isLoggable(level);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>   }<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>   /**<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    * Similar to {@link #log(Level, 
String, Object[])}, except arguments are converted to objects<a 
name="line.246"></a>
+<span class="sourceLineNo">247</span>    * that are serialized using the 
{@link JsonSerializer#toStringObject(Object)} method.<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    * This allows arbitrary POJOs to be 
serialized as message parameters.<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    *<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    * @param level The level of the given 
message.<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    * @param msg The message to log.<a 
name="line.251"></a>
+<span class="sourceLineNo">252</span>    * @param args The POJO arguments.<a 
name="line.252"></a>
+<span class="sourceLineNo">253</span>    */<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   public void logObjects(Level level, 
String msg, Object...args) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      if (isLoggable(level)) {<a 
name="line.255"></a>
+<span class="sourceLineNo">256</span>         for (int i = 0; i &lt; 
args.length; i++)<a name="line.256"></a>
+<span class="sourceLineNo">257</span>            args[i] = 
serializer.toStringObject(args[i]);<a name="line.257"></a>
+<span class="sourceLineNo">258</span>         log(level, msg, args);<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><a name="line.261"></a>
+<span class="sourceLineNo">262</span>   private String getMessage(String msg, 
Object...args) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      if (args.length == 0)<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>         return msg;<a 
name="line.264"></a>
+<span class="sourceLineNo">265</span>      if (rb != null &amp;&amp; 
rb.containsKey(msg))<a name="line.265"></a>
+<span class="sourceLineNo">266</span>         msg = rb.getString(msg);<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>      return format(msg, args);<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>   private static String 
resolveResourceBundleName(Class&lt;?&gt; forClass, String path) {<a 
name="line.270"></a>
+<span class="sourceLineNo">271</span>      if (StringUtils.isEmpty(path))<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span>         return null;<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>      String rb = rbMap.get(forClass);<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span>      if (rb == null) {<a 
name="line.274"></a>
+<span class="sourceLineNo">275</span>         path = path.replace('/', '.');<a 
name="line.275"></a>
+<span class="sourceLineNo">276</span>         if (path.startsWith("."))<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>            path = path.substring(1);<a 
name="line.277"></a>
+<span class="sourceLineNo">278</span>         ClassLoader cl = 
forClass.getClassLoader();<a name="line.278"></a>
+<span class="sourceLineNo">279</span>         try {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>            
ResourceBundle.getBundle(path, Locale.getDefault(), cl);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>            rbMap.putIfAbsent(forClass, 
path);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>         } catch 
(MissingResourceException e) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            try {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>               path = 
forClass.getPackage().getName() + '.' + path;<a name="line.284"></a>
+<span class="sourceLineNo">285</span>               
ResourceBundle.getBundle(path, Locale.getDefault(), cl);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>               
rbMap.putIfAbsent(forClass, path);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>            } catch 
(MissingResourceException e2) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span>               
rbMap.putIfAbsent(forClass, "");<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>         rb = rbMap.get(forClass);<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      return ("".equals(rb) ? null : 
rb);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>   }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>}<a name="line.296"></a>
 
 
 

Reply via email to