http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/utils/SearchArgs.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/utils/SearchArgs.html 
b/content/site/apidocs/src-html/org/apache/juneau/utils/SearchArgs.html
index 2ea3ee8..3047164 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/utils/SearchArgs.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/utils/SearchArgs.html
@@ -25,328 +25,329 @@
 <span class="sourceLineNo">017</span><a name="line.17"></a>
 <span class="sourceLineNo">018</span>import java.util.*;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.internal.*;<a 
name="line.20"></a>
-<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>/**<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * Encapsulates arguments for basic 
search/view/sort/position/limit functionality.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> */<a name="line.24"></a>
-<span class="sourceLineNo">025</span>public class SearchArgs {<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span>   private final Map&lt;String,String&gt; 
search;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>   private final List&lt;String&gt; 
view;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>   private final 
Map&lt;String,Boolean&gt; sort;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>   private final int position, limit;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>   private final boolean ignoreCase;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>   private SearchArgs(Builder b) {<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>      this.search = unmodifiableMap(new 
LinkedHashMap&lt;String,String&gt;(b.search));<a name="line.33"></a>
-<span class="sourceLineNo">034</span>      this.view = unmodifiableList(new 
ArrayList&lt;String&gt;(b.view));<a name="line.34"></a>
-<span class="sourceLineNo">035</span>      this.sort = unmodifiableMap(new 
LinkedHashMap&lt;String,Boolean&gt;(b.sort));<a name="line.35"></a>
-<span class="sourceLineNo">036</span>      this.position = b.position;<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>      this.limit = b.limit;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span>      this.ignoreCase = b.ignoreCase;<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>   }<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>   /**<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    * Creates a new builder for {@link 
SearchArgs}<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    *<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    * @return A new builder for {@link 
SearchArgs}<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   public static Builder builder() {<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>      return new Builder();<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>   }<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>   /**<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    * Builder for {@link SearchArgs} 
class.<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    */<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   @SuppressWarnings("hiding")<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>   public static class Builder {<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>      Map&lt;String,String&gt; search = 
new LinkedHashMap&lt;String,String&gt;();<a name="line.55"></a>
-<span class="sourceLineNo">056</span>      List&lt;String&gt; view = new 
ArrayList&lt;String&gt;();<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      Map&lt;String,Boolean&gt; sort = 
new LinkedHashMap&lt;String,Boolean&gt;();<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      int position, limit;<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>      boolean ignoreCase;<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>      /**<a name="line.61"></a>
-<span class="sourceLineNo">062</span>       * Adds search terms to this 
builder.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>       *<a name="line.63"></a>
-<span class="sourceLineNo">064</span>       * &lt;p&gt;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>       * The search terms are a 
comma-delimited list of key/value pairs of column-names and search tokens.<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>       *<a name="line.66"></a>
-<span class="sourceLineNo">067</span>       * &lt;p&gt;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>       * For example:<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>       * &lt;p class='bcode'&gt;<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>       *    
builder.search(&lt;js&gt;"column1=foo*, column2=bar baz"&lt;/js&gt;);<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>       * &lt;/p&gt;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>       *<a name="line.72"></a>
-<span class="sourceLineNo">073</span>       * &lt;p&gt;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>       * It's up to implementers to 
decide the syntax and meaning of the search terms.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>       *<a name="line.75"></a>
-<span class="sourceLineNo">076</span>       * &lt;p&gt;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>       * Whitespace is trimmed from 
column names and search tokens.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>       *<a name="line.78"></a>
-<span class="sourceLineNo">079</span>       * @param searchTerms<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>       *    The search terms string.<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>       *    Can be 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.81"></a>
-<span class="sourceLineNo">082</span>       * @return This object (for method 
chaining).<a name="line.82"></a>
-<span class="sourceLineNo">083</span>       */<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      public Builder search(String 
searchTerms) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>         if (searchTerms != null) {<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>            for (String s : 
StringUtils.split(searchTerms)) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>               int i = 
StringUtils.indexOf(s, '=', '&gt;', '&lt;');<a name="line.87"></a>
-<span class="sourceLineNo">088</span>               if (i == -1)<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>                  throw new 
RuntimeException("Invalid search terms: '"+searchTerms+"'");<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>               char c = s.charAt(i);<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>               search(s.substring(0, 
i).trim(), s.substring(c == '=' ? i+1 : i).trim());<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>         return this;<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>      }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>      /**<a name="line.97"></a>
-<span class="sourceLineNo">098</span>       * Adds a search term to this 
builder.<a name="line.98"></a>
-<span class="sourceLineNo">099</span>       *<a name="line.99"></a>
-<span class="sourceLineNo">100</span>       * &lt;p&gt;<a name="line.100"></a>
-<span class="sourceLineNo">101</span>       * It's up to implementers to 
decide the syntax and meaning of the search term.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>       *<a name="line.102"></a>
-<span class="sourceLineNo">103</span>       * @param column The column being 
searched.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>       * @param searchTerm The search 
term.<a name="line.104"></a>
-<span class="sourceLineNo">105</span>       * @return This object (for method 
chaining).<a name="line.105"></a>
-<span class="sourceLineNo">106</span>       */<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      public Builder search(String 
column, String searchTerm) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>         this.search.put(column, 
searchTerm);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>         return this;<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>      }<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>      /**<a name="line.112"></a>
-<span class="sourceLineNo">113</span>       * Specifies the list of columns to 
view.<a name="line.113"></a>
-<span class="sourceLineNo">114</span>       *<a name="line.114"></a>
-<span class="sourceLineNo">115</span>       * &lt;p&gt;<a name="line.115"></a>
-<span class="sourceLineNo">116</span>       * The columns argument is a simple 
comma-delimited list of column names.<a name="line.116"></a>
-<span class="sourceLineNo">117</span>       *<a name="line.117"></a>
-<span class="sourceLineNo">118</span>       * &lt;p&gt;<a name="line.118"></a>
-<span class="sourceLineNo">119</span>       * For example:<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>       * &lt;p class='bcode'&gt;<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>       *    
builder.view(&lt;js&gt;"column1, column2"&lt;/js&gt;);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>       * &lt;/p&gt;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>       *<a name="line.123"></a>
-<span class="sourceLineNo">124</span>       * &lt;p&gt;<a name="line.124"></a>
-<span class="sourceLineNo">125</span>       * Whitespace is trimmed from 
column names.<a name="line.125"></a>
-<span class="sourceLineNo">126</span>       *<a name="line.126"></a>
-<span class="sourceLineNo">127</span>       * &lt;p&gt;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>       * Empty view columns imply view 
all columns.<a name="line.128"></a>
-<span class="sourceLineNo">129</span>       *<a name="line.129"></a>
-<span class="sourceLineNo">130</span>       * @param columns<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>       *    The columns being viewed.<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>       *    Can be 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.132"></a>
-<span class="sourceLineNo">133</span>       * @return This object (for method 
chaining).<a name="line.133"></a>
-<span class="sourceLineNo">134</span>       */<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      public Builder view(String columns) 
{<a name="line.135"></a>
-<span class="sourceLineNo">136</span>         if (columns != null)<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>            return 
view(Arrays.asList(StringUtils.split(columns)));<a name="line.137"></a>
-<span class="sourceLineNo">138</span>         return this;<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>      }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>      /**<a name="line.141"></a>
-<span class="sourceLineNo">142</span>       * Specifies the list of columns to 
view.<a name="line.142"></a>
-<span class="sourceLineNo">143</span>       *<a name="line.143"></a>
-<span class="sourceLineNo">144</span>       * &lt;p&gt;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>       * Empty view columns imply view 
all columns.<a name="line.145"></a>
-<span class="sourceLineNo">146</span>       *<a name="line.146"></a>
-<span class="sourceLineNo">147</span>       * @param columns The columns being 
viewed.<a name="line.147"></a>
-<span class="sourceLineNo">148</span>       * @return This object (for method 
chaining).<a name="line.148"></a>
-<span class="sourceLineNo">149</span>       */<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      public Builder 
view(Collection&lt;String&gt; columns) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>         this.view.addAll(columns);<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>         return this;<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>       * Specifies the sort arguments.<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>       *<a name="line.157"></a>
-<span class="sourceLineNo">158</span>       * &lt;p&gt;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>       * The sort argument is a simple 
comma-delimited list of column names.<a name="line.159"></a>
-<span class="sourceLineNo">160</span>       * &lt;br&gt;Column names can be 
suffixed with &lt;js&gt;'+'&lt;/js&gt; or &lt;js&gt;'-'&lt;/js&gt; to indicate 
ascending or descending order.<a name="line.160"></a>
-<span class="sourceLineNo">161</span>       * &lt;br&gt;No suffix implies 
ascending order.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>       *<a name="line.162"></a>
-<span class="sourceLineNo">163</span>       * &lt;p&gt;<a name="line.163"></a>
-<span class="sourceLineNo">164</span>       * For example:<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>       * &lt;p class='bcode'&gt;<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>       *    &lt;jc&gt;// Order by column1 
ascending, then column2 descending.&lt;/jc&gt;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>       *    
builder.sort(&lt;js&gt;"column1, column2-"&lt;/js&gt;);<a name="line.167"></a>
-<span class="sourceLineNo">168</span>       * &lt;/p&gt;<a name="line.168"></a>
-<span class="sourceLineNo">169</span>       *<a name="line.169"></a>
-<span class="sourceLineNo">170</span>       * &lt;p&gt;<a name="line.170"></a>
-<span class="sourceLineNo">171</span>       * Note that the order of the order 
arguments is important.<a name="line.171"></a>
-<span class="sourceLineNo">172</span>       *<a name="line.172"></a>
-<span class="sourceLineNo">173</span>       * &lt;p&gt;<a name="line.173"></a>
-<span class="sourceLineNo">174</span>       * Whitespace is trimmed from 
column names.<a name="line.174"></a>
-<span class="sourceLineNo">175</span>       *<a name="line.175"></a>
-<span class="sourceLineNo">176</span>       * @param sortArgs<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>       *    The columns to sort by.<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>       *    Can be 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.178"></a>
-<span class="sourceLineNo">179</span>       * @return This object (for method 
chaining).<a name="line.179"></a>
-<span class="sourceLineNo">180</span>       */<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      public Builder sort(String 
sortArgs) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>         if (sortArgs != null)<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>            
sort(Arrays.asList(StringUtils.split(sortArgs)));<a name="line.183"></a>
-<span class="sourceLineNo">184</span>         return this;<a 
name="line.184"></a>
-<span class="sourceLineNo">185</span>      }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>      /**<a name="line.187"></a>
-<span class="sourceLineNo">188</span>       * Specifies the sort arguments.<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>       *<a name="line.189"></a>
-<span class="sourceLineNo">190</span>       * &lt;p&gt;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>       * Column names can be suffixed 
with &lt;js&gt;'+'&lt;/js&gt; or &lt;js&gt;'-'&lt;/js&gt; to indicate ascending 
or descending order.<a name="line.191"></a>
-<span class="sourceLineNo">192</span>       * &lt;br&gt;No suffix implies 
ascending order.<a name="line.192"></a>
-<span class="sourceLineNo">193</span>       *<a name="line.193"></a>
-<span class="sourceLineNo">194</span>       * &lt;p&gt;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>       * Note that the order of the sort 
is important.<a name="line.195"></a>
-<span class="sourceLineNo">196</span>       *<a name="line.196"></a>
-<span class="sourceLineNo">197</span>       * @param sortArgs<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>       *    The columns to sort by.<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>       *    Can be 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>       * @return This object (for method 
chaining).<a name="line.200"></a>
-<span class="sourceLineNo">201</span>       */<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      public Builder 
sort(Collection&lt;String&gt; sortArgs) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>         for (String s : sortArgs) {<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>            boolean isDesc = false;<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>            if (endsWith(s, '-', '+')) 
{<a name="line.205"></a>
-<span class="sourceLineNo">206</span>               isDesc = endsWith(s, 
'-');<a name="line.206"></a>
-<span class="sourceLineNo">207</span>               s = s.substring(0, 
s.length()-1);<a name="line.207"></a>
-<span class="sourceLineNo">208</span>            }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>            this.sort.put(s, isDesc);<a 
name="line.209"></a>
-<span class="sourceLineNo">210</span>         }<a name="line.210"></a>
-<span class="sourceLineNo">211</span>         return this;<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>      }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>      /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span>       * Specifies the starting line 
number.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>       *<a name="line.216"></a>
-<span class="sourceLineNo">217</span>       * @param position The zero-indexed 
position.<a name="line.217"></a>
-<span class="sourceLineNo">218</span>       * @return This object (for method 
chaining).<a name="line.218"></a>
-<span class="sourceLineNo">219</span>       */<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      public Builder position(int 
position) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span>         this.position = position;<a 
name="line.221"></a>
-<span class="sourceLineNo">222</span>         return this;<a 
name="line.222"></a>
-<span class="sourceLineNo">223</span>      }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span>      /**<a name="line.225"></a>
-<span class="sourceLineNo">226</span>       * Specifies the number of rows to 
return.<a name="line.226"></a>
-<span class="sourceLineNo">227</span>       *<a name="line.227"></a>
-<span class="sourceLineNo">228</span>       * @param limit<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>       *    The number of rows to 
return.<a name="line.229"></a>
-<span class="sourceLineNo">230</span>       *    If 
&lt;code&gt;&amp;lt;=0&lt;/code&gt;, all rows should be returned.<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>       * @return This object (for method 
chaining).<a name="line.231"></a>
-<span class="sourceLineNo">232</span>       */<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      public Builder limit(int limit) {<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>         this.limit = limit;<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>         return this;<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>      }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span>      /**<a name="line.238"></a>
-<span class="sourceLineNo">239</span>       * Specifies whether 
case-insensitive search should be used.<a name="line.239"></a>
-<span class="sourceLineNo">240</span>       *<a name="line.240"></a>
-<span class="sourceLineNo">241</span>       * &lt;p&gt;<a name="line.241"></a>
-<span class="sourceLineNo">242</span>       * The default is 
&lt;jk&gt;false&lt;/jk&gt;.<a name="line.242"></a>
-<span class="sourceLineNo">243</span>       *<a name="line.243"></a>
-<span class="sourceLineNo">244</span>       * @param value The ignore-case 
flag value.<a name="line.244"></a>
-<span class="sourceLineNo">245</span>       * @return This object (for method 
chaining).<a name="line.245"></a>
-<span class="sourceLineNo">246</span>       */<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      public Builder ignoreCase(boolean 
value) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>         this.ignoreCase = value;<a 
name="line.248"></a>
-<span class="sourceLineNo">249</span>         return this;<a 
name="line.249"></a>
-<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span>      /**<a name="line.252"></a>
-<span class="sourceLineNo">253</span>       * Construct the {@link SearchArgs} 
object.<a name="line.253"></a>
-<span class="sourceLineNo">254</span>       *<a name="line.254"></a>
-<span class="sourceLineNo">255</span>       * &lt;p&gt;<a name="line.255"></a>
-<span class="sourceLineNo">256</span>       * This method can be called 
multiple times to construct new objects.<a name="line.256"></a>
-<span class="sourceLineNo">257</span>       *<a name="line.257"></a>
-<span class="sourceLineNo">258</span>       * @return A new {@link SearchArgs} 
object initialized with values in this builder.<a name="line.258"></a>
-<span class="sourceLineNo">259</span>       */<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      public SearchArgs build() {<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>         return new SearchArgs(this);<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span>      }<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>   /**<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    * The query search terms.<a 
name="line.266"></a>
-<span class="sourceLineNo">267</span>    *<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    * &lt;p&gt;<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    * The search terms are key/value 
pairs consisting of column-names and search tokens.<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    *<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    * &lt;p&gt;<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    * It's up to implementers to decide 
the syntax and meaning of the search term.<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    *<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    * @return An unmodifiable map of 
query search terms.<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    */<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   public Map&lt;String,String&gt; 
getSearch() {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      return search;<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>   }<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>    * The view columns.<a 
name="line.281"></a>
-<span class="sourceLineNo">282</span>    *<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    * &lt;p&gt;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    * The view columns are the list of 
columns that should be displayed.<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    * An empty list implies all columns 
should be displayed.<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    *<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    * @return An unmodifiable list of 
columns to view.<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    */<a name="line.288"></a>
-<span class="sourceLineNo">289</span>   public List&lt;String&gt; getView() 
{<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      return view;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>   /**<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    * The sort columns.<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>    *<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    * &lt;p&gt;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    * The sort columns are key/value 
pairs consisting of column-names and direction flags<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    * (&lt;jk&gt;false&lt;/jk&gt; = 
ascending, &lt;jk&gt;true&lt;/jk&gt; = descending).<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    *<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    * @return An unmodifiable ordered map 
of sort columns and directions.<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    */<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   public Map&lt;String,Boolean&gt; 
getSort() {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      return sort;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>   }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>   /**<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    * The first-row position.<a 
name="line.307"></a>
-<span class="sourceLineNo">308</span>    *<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    * @return<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    *    The zero-indexed row number of 
the first row to display.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    *    Default is 
&lt;code&gt;0&lt;/code&gt;<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    */<a name="line.312"></a>
-<span class="sourceLineNo">313</span>   public int getPosition() {<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>      return position;<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>   }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span>   /**<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    * The number of rows to return.<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span>    *<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    * @return<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    *    The number of rows to return in 
the result.<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    *    Default is 
&lt;code&gt;0&lt;/code&gt; which means return all rows.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    */<a name="line.323"></a>
-<span class="sourceLineNo">324</span>   public int getLimit() {<a 
name="line.324"></a>
-<span class="sourceLineNo">325</span>      return limit;<a name="line.325"></a>
-<span class="sourceLineNo">326</span>   }<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>   /**<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    * The ignore-case flag.<a 
name="line.329"></a>
-<span class="sourceLineNo">330</span>    *<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    * &lt;p&gt;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    * Used in conjunction with {@link 
#getSearch()} to specify whether case-insensitive searches should be 
performed.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    *<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    * @return<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    *    The number of rows to return in 
the result.<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    *    Default is 
&lt;jk&gt;false&lt;/jk&gt;.<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    */<a name="line.337"></a>
-<span class="sourceLineNo">338</span>   public boolean isIgnoreCase() {<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>      return ignoreCase;<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>   }<a name="line.340"></a>
-<span class="sourceLineNo">341</span>}<a name="line.341"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.*;<a 
name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.internal.*;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Encapsulates arguments for basic 
search/view/sort/position/limit functionality.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> */<a name="line.25"></a>
+<span class="sourceLineNo">026</span>public class SearchArgs {<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>   private final Map&lt;String,String&gt; 
search;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>   private final List&lt;String&gt; 
view;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>   private final 
Map&lt;String,Boolean&gt; sort;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>   private final int position, limit;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>   private final boolean ignoreCase;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>   private SearchArgs(Builder b) {<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>      this.search = unmodifiableMap(new 
LinkedHashMap&lt;String,String&gt;(b.search));<a name="line.34"></a>
+<span class="sourceLineNo">035</span>      this.view = unmodifiableList(new 
ArrayList&lt;String&gt;(b.view));<a name="line.35"></a>
+<span class="sourceLineNo">036</span>      this.sort = unmodifiableMap(new 
LinkedHashMap&lt;String,Boolean&gt;(b.sort));<a name="line.36"></a>
+<span class="sourceLineNo">037</span>      this.position = b.position;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>      this.limit = b.limit;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>      this.ignoreCase = b.ignoreCase;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>   }<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>   /**<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    * Creates a new builder for {@link 
SearchArgs}<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    *<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    * @return A new builder for {@link 
SearchArgs}<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>   public static Builder builder() {<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>      return new Builder();<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>   }<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>   /**<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    * Builder for {@link SearchArgs} 
class.<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    */<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   @SuppressWarnings("hiding")<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>   public static class Builder {<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>      Map&lt;String,String&gt; search = 
new LinkedHashMap&lt;String,String&gt;();<a name="line.56"></a>
+<span class="sourceLineNo">057</span>      List&lt;String&gt; view = new 
ArrayList&lt;String&gt;();<a name="line.57"></a>
+<span class="sourceLineNo">058</span>      Map&lt;String,Boolean&gt; sort = 
new LinkedHashMap&lt;String,Boolean&gt;();<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      int position, limit;<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>      boolean ignoreCase;<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>      /**<a name="line.62"></a>
+<span class="sourceLineNo">063</span>       * Adds search terms to this 
builder.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>       *<a name="line.64"></a>
+<span class="sourceLineNo">065</span>       * &lt;p&gt;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>       * The search terms are a 
comma-delimited list of key/value pairs of column-names and search tokens.<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>       *<a name="line.67"></a>
+<span class="sourceLineNo">068</span>       * &lt;p&gt;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>       * For example:<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>       * &lt;p class='bcode'&gt;<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>       *    
builder.search(&lt;js&gt;"column1=foo*, column2=bar baz"&lt;/js&gt;);<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>       * &lt;/p&gt;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>       *<a name="line.73"></a>
+<span class="sourceLineNo">074</span>       * &lt;p&gt;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>       * It's up to implementers to 
decide the syntax and meaning of the search terms.<a name="line.75"></a>
+<span class="sourceLineNo">076</span>       *<a name="line.76"></a>
+<span class="sourceLineNo">077</span>       * &lt;p&gt;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>       * Whitespace is trimmed from 
column names and search tokens.<a name="line.78"></a>
+<span class="sourceLineNo">079</span>       *<a name="line.79"></a>
+<span class="sourceLineNo">080</span>       * @param searchTerms<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>       *    The search terms string.<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>       *    Can be 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>       * @return This object (for method 
chaining).<a name="line.83"></a>
+<span class="sourceLineNo">084</span>       */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      public Builder search(String 
searchTerms) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>         if (searchTerms != null) {<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>            for (String s : 
StringUtils.split(searchTerms)) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>               int i = 
StringUtils.indexOf(s, '=', '&gt;', '&lt;');<a name="line.88"></a>
+<span class="sourceLineNo">089</span>               if (i == -1)<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>                  throw new 
FormattedRuntimeException("Invalid search terms: ''{0}''", searchTerms);<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>               char c = s.charAt(i);<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>               search(s.substring(0, 
i).trim(), s.substring(c == '=' ? i+1 : i).trim());<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>         return this;<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>      }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span>      /**<a name="line.98"></a>
+<span class="sourceLineNo">099</span>       * Adds a search term to this 
builder.<a name="line.99"></a>
+<span class="sourceLineNo">100</span>       *<a name="line.100"></a>
+<span class="sourceLineNo">101</span>       * &lt;p&gt;<a name="line.101"></a>
+<span class="sourceLineNo">102</span>       * It's up to implementers to 
decide the syntax and meaning of the search term.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>       *<a name="line.103"></a>
+<span class="sourceLineNo">104</span>       * @param column The column being 
searched.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>       * @param searchTerm The search 
term.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>       * @return This object (for method 
chaining).<a name="line.106"></a>
+<span class="sourceLineNo">107</span>       */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      public Builder search(String 
column, String searchTerm) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>         this.search.put(column, 
searchTerm);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>         return this;<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>      }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>      /**<a name="line.113"></a>
+<span class="sourceLineNo">114</span>       * Specifies the list of columns to 
view.<a name="line.114"></a>
+<span class="sourceLineNo">115</span>       *<a name="line.115"></a>
+<span class="sourceLineNo">116</span>       * &lt;p&gt;<a name="line.116"></a>
+<span class="sourceLineNo">117</span>       * The columns argument is a simple 
comma-delimited list of column names.<a name="line.117"></a>
+<span class="sourceLineNo">118</span>       *<a name="line.118"></a>
+<span class="sourceLineNo">119</span>       * &lt;p&gt;<a name="line.119"></a>
+<span class="sourceLineNo">120</span>       * For example:<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>       * &lt;p class='bcode'&gt;<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>       *    
builder.view(&lt;js&gt;"column1, column2"&lt;/js&gt;);<a name="line.122"></a>
+<span class="sourceLineNo">123</span>       * &lt;/p&gt;<a name="line.123"></a>
+<span class="sourceLineNo">124</span>       *<a name="line.124"></a>
+<span class="sourceLineNo">125</span>       * &lt;p&gt;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>       * Whitespace is trimmed from 
column names.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>       *<a name="line.127"></a>
+<span class="sourceLineNo">128</span>       * &lt;p&gt;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>       * Empty view columns imply view 
all columns.<a name="line.129"></a>
+<span class="sourceLineNo">130</span>       *<a name="line.130"></a>
+<span class="sourceLineNo">131</span>       * @param columns<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>       *    The columns being viewed.<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>       *    Can be 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.133"></a>
+<span class="sourceLineNo">134</span>       * @return This object (for method 
chaining).<a name="line.134"></a>
+<span class="sourceLineNo">135</span>       */<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      public Builder view(String columns) 
{<a name="line.136"></a>
+<span class="sourceLineNo">137</span>         if (columns != null)<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>            return 
view(Arrays.asList(StringUtils.split(columns)));<a name="line.138"></a>
+<span class="sourceLineNo">139</span>         return this;<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>      }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>      /**<a name="line.142"></a>
+<span class="sourceLineNo">143</span>       * Specifies the list of columns to 
view.<a name="line.143"></a>
+<span class="sourceLineNo">144</span>       *<a name="line.144"></a>
+<span class="sourceLineNo">145</span>       * &lt;p&gt;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>       * Empty view columns imply view 
all columns.<a name="line.146"></a>
+<span class="sourceLineNo">147</span>       *<a name="line.147"></a>
+<span class="sourceLineNo">148</span>       * @param columns The columns being 
viewed.<a name="line.148"></a>
+<span class="sourceLineNo">149</span>       * @return This object (for method 
chaining).<a name="line.149"></a>
+<span class="sourceLineNo">150</span>       */<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      public Builder 
view(Collection&lt;String&gt; columns) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>         this.view.addAll(columns);<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>         return this;<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>       * Specifies the sort arguments.<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>       *<a name="line.158"></a>
+<span class="sourceLineNo">159</span>       * &lt;p&gt;<a name="line.159"></a>
+<span class="sourceLineNo">160</span>       * The sort argument is a simple 
comma-delimited list of column names.<a name="line.160"></a>
+<span class="sourceLineNo">161</span>       * &lt;br&gt;Column names can be 
suffixed with &lt;js&gt;'+'&lt;/js&gt; or &lt;js&gt;'-'&lt;/js&gt; to indicate 
ascending or descending order.<a name="line.161"></a>
+<span class="sourceLineNo">162</span>       * &lt;br&gt;No suffix implies 
ascending order.<a name="line.162"></a>
+<span class="sourceLineNo">163</span>       *<a name="line.163"></a>
+<span class="sourceLineNo">164</span>       * &lt;p&gt;<a name="line.164"></a>
+<span class="sourceLineNo">165</span>       * For example:<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>       * &lt;p class='bcode'&gt;<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>       *    &lt;jc&gt;// Order by column1 
ascending, then column2 descending.&lt;/jc&gt;<a name="line.167"></a>
+<span class="sourceLineNo">168</span>       *    
builder.sort(&lt;js&gt;"column1, column2-"&lt;/js&gt;);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>       * &lt;/p&gt;<a name="line.169"></a>
+<span class="sourceLineNo">170</span>       *<a name="line.170"></a>
+<span class="sourceLineNo">171</span>       * &lt;p&gt;<a name="line.171"></a>
+<span class="sourceLineNo">172</span>       * Note that the order of the order 
arguments is important.<a name="line.172"></a>
+<span class="sourceLineNo">173</span>       *<a name="line.173"></a>
+<span class="sourceLineNo">174</span>       * &lt;p&gt;<a name="line.174"></a>
+<span class="sourceLineNo">175</span>       * Whitespace is trimmed from 
column names.<a name="line.175"></a>
+<span class="sourceLineNo">176</span>       *<a name="line.176"></a>
+<span class="sourceLineNo">177</span>       * @param sortArgs<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>       *    The columns to sort by.<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>       *    Can be 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>       * @return This object (for method 
chaining).<a name="line.180"></a>
+<span class="sourceLineNo">181</span>       */<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      public Builder sort(String 
sortArgs) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>         if (sortArgs != null)<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>            
sort(Arrays.asList(StringUtils.split(sortArgs)));<a name="line.184"></a>
+<span class="sourceLineNo">185</span>         return this;<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>       * Specifies the sort arguments.<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>       *<a name="line.190"></a>
+<span class="sourceLineNo">191</span>       * &lt;p&gt;<a name="line.191"></a>
+<span class="sourceLineNo">192</span>       * Column names can be suffixed 
with &lt;js&gt;'+'&lt;/js&gt; or &lt;js&gt;'-'&lt;/js&gt; to indicate ascending 
or descending order.<a name="line.192"></a>
+<span class="sourceLineNo">193</span>       * &lt;br&gt;No suffix implies 
ascending order.<a name="line.193"></a>
+<span class="sourceLineNo">194</span>       *<a name="line.194"></a>
+<span class="sourceLineNo">195</span>       * &lt;p&gt;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>       * Note that the order of the sort 
is important.<a name="line.196"></a>
+<span class="sourceLineNo">197</span>       *<a name="line.197"></a>
+<span class="sourceLineNo">198</span>       * @param sortArgs<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>       *    The columns to sort by.<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>       *    Can be 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.200"></a>
+<span class="sourceLineNo">201</span>       * @return This object (for method 
chaining).<a name="line.201"></a>
+<span class="sourceLineNo">202</span>       */<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      public Builder 
sort(Collection&lt;String&gt; sortArgs) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>         for (String s : sortArgs) {<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>            boolean isDesc = false;<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>            if (endsWith(s, '-', '+')) 
{<a name="line.206"></a>
+<span class="sourceLineNo">207</span>               isDesc = endsWith(s, 
'-');<a name="line.207"></a>
+<span class="sourceLineNo">208</span>               s = s.substring(0, 
s.length()-1);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>            }<a name="line.209"></a>
+<span class="sourceLineNo">210</span>            this.sort.put(s, isDesc);<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>         }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>         return this;<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>       * Specifies the starting line 
number.<a name="line.216"></a>
+<span class="sourceLineNo">217</span>       *<a name="line.217"></a>
+<span class="sourceLineNo">218</span>       * @param position The zero-indexed 
position.<a name="line.218"></a>
+<span class="sourceLineNo">219</span>       * @return This object (for method 
chaining).<a name="line.219"></a>
+<span class="sourceLineNo">220</span>       */<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      public Builder position(int 
position) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span>         this.position = position;<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>         return this;<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>      }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span>      /**<a name="line.226"></a>
+<span class="sourceLineNo">227</span>       * Specifies the number of rows to 
return.<a name="line.227"></a>
+<span class="sourceLineNo">228</span>       *<a name="line.228"></a>
+<span class="sourceLineNo">229</span>       * @param limit<a 
name="line.229"></a>
+<span class="sourceLineNo">230</span>       *    The number of rows to 
return.<a name="line.230"></a>
+<span class="sourceLineNo">231</span>       *    If 
&lt;code&gt;&amp;lt;=0&lt;/code&gt;, all rows should be returned.<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>       * @return This object (for method 
chaining).<a name="line.232"></a>
+<span class="sourceLineNo">233</span>       */<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      public Builder limit(int limit) {<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>         this.limit = limit;<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>         return this;<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>      /**<a name="line.239"></a>
+<span class="sourceLineNo">240</span>       * Specifies whether 
case-insensitive search should be used.<a name="line.240"></a>
+<span class="sourceLineNo">241</span>       *<a name="line.241"></a>
+<span class="sourceLineNo">242</span>       * &lt;p&gt;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>       * The default is 
&lt;jk&gt;false&lt;/jk&gt;.<a name="line.243"></a>
+<span class="sourceLineNo">244</span>       *<a name="line.244"></a>
+<span class="sourceLineNo">245</span>       * @param value The ignore-case 
flag value.<a name="line.245"></a>
+<span class="sourceLineNo">246</span>       * @return This object (for method 
chaining).<a name="line.246"></a>
+<span class="sourceLineNo">247</span>       */<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      public Builder ignoreCase(boolean 
value) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span>         this.ignoreCase = value;<a 
name="line.249"></a>
+<span class="sourceLineNo">250</span>         return this;<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>      }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>      /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span>       * Construct the {@link SearchArgs} 
object.<a name="line.254"></a>
+<span class="sourceLineNo">255</span>       *<a name="line.255"></a>
+<span class="sourceLineNo">256</span>       * &lt;p&gt;<a name="line.256"></a>
+<span class="sourceLineNo">257</span>       * This method can be called 
multiple times to construct new objects.<a name="line.257"></a>
+<span class="sourceLineNo">258</span>       *<a name="line.258"></a>
+<span class="sourceLineNo">259</span>       * @return A new {@link SearchArgs} 
object initialized with values in this builder.<a name="line.259"></a>
+<span class="sourceLineNo">260</span>       */<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      public SearchArgs build() {<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>         return new SearchArgs(this);<a 
name="line.262"></a>
+<span class="sourceLineNo">263</span>      }<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>   /**<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    * The query search terms.<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>    *<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    * &lt;p&gt;<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    * The search terms are key/value 
pairs consisting of column-names and search tokens.<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    *<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    * &lt;p&gt;<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    * It's up to implementers to decide 
the syntax and meaning of the search term.<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    *<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    * @return An unmodifiable map of 
query search terms.<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    */<a name="line.276"></a>
+<span class="sourceLineNo">277</span>   public Map&lt;String,String&gt; 
getSearch() {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      return search;<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>    * The view columns.<a 
name="line.282"></a>
+<span class="sourceLineNo">283</span>    *<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    * &lt;p&gt;<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    * The view columns are the list of 
columns that should be displayed.<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    * An empty list implies all columns 
should be displayed.<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    *<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    * @return An unmodifiable list of 
columns to view.<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    */<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   public List&lt;String&gt; getView() 
{<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      return view;<a name="line.291"></a>
+<span class="sourceLineNo">292</span>   }<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span>   /**<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    * The sort columns.<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>    *<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    * &lt;p&gt;<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    * The sort columns are key/value 
pairs consisting of column-names and direction flags<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    * (&lt;jk&gt;false&lt;/jk&gt; = 
ascending, &lt;jk&gt;true&lt;/jk&gt; = descending).<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    *<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    * @return An unmodifiable ordered map 
of sort columns and directions.<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    */<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   public Map&lt;String,Boolean&gt; 
getSort() {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      return sort;<a name="line.304"></a>
+<span class="sourceLineNo">305</span>   }<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span>   /**<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    * The first-row position.<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>    *<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    * @return<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    *    The zero-indexed row number of 
the first row to display.<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    *    Default is 
&lt;code&gt;0&lt;/code&gt;<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    */<a name="line.313"></a>
+<span class="sourceLineNo">314</span>   public int getPosition() {<a 
name="line.314"></a>
+<span class="sourceLineNo">315</span>      return position;<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>   }<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span>   /**<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    * The number of rows to return.<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>    *<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    * @return<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    *    The number of rows to return in 
the result.<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    *    Default is 
&lt;code&gt;0&lt;/code&gt; which means return all rows.<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    */<a name="line.324"></a>
+<span class="sourceLineNo">325</span>   public int getLimit() {<a 
name="line.325"></a>
+<span class="sourceLineNo">326</span>      return limit;<a name="line.326"></a>
+<span class="sourceLineNo">327</span>   }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>   /**<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    * The ignore-case flag.<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>    *<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    * &lt;p&gt;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    * Used in conjunction with {@link 
#getSearch()} to specify whether case-insensitive searches should be 
performed.<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    *<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    * @return<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    *    The number of rows to return in 
the result.<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    *    Default is 
&lt;jk&gt;false&lt;/jk&gt;.<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    */<a name="line.338"></a>
+<span class="sourceLineNo">339</span>   public boolean isIgnoreCase() {<a 
name="line.339"></a>
+<span class="sourceLineNo">340</span>      return ignoreCase;<a 
name="line.340"></a>
+<span class="sourceLineNo">341</span>   }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>}<a name="line.342"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/xml/NamespaceFactory.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/xml/NamespaceFactory.html 
b/content/site/apidocs/src-html/org/apache/juneau/xml/NamespaceFactory.html
index 7b78c68..8853c93 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/NamespaceFactory.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/NamespaceFactory.html
@@ -84,7 +84,7 @@
 <span class="sourceLineNo">076</span>         if (m.size() == 0)<a 
name="line.76"></a>
 <span class="sourceLineNo">077</span>            return null;<a 
name="line.77"></a>
 <span class="sourceLineNo">078</span>         if (m.size() &gt; 1)<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>            throw new 
RuntimeException("Too many namespaces specified.  Only one allowed. 
'"+o+"'");<a name="line.79"></a>
+<span class="sourceLineNo">079</span>            throw new 
FormattedRuntimeException("Too many namespaces specified.  Only one allowed. 
''{0}''", o);<a name="line.79"></a>
 <span class="sourceLineNo">080</span>         Map.Entry&lt;?,?&gt; e = 
m.entrySet().iterator().next();<a name="line.80"></a>
 <span class="sourceLineNo">081</span>         return 
get(e.getKey().toString(), e.getValue().toString());<a name="line.81"></a>
 <span class="sourceLineNo">082</span>      } catch (ParseException e) {<a 
name="line.82"></a>
@@ -129,7 +129,7 @@
 <span class="sourceLineNo">121</span>            for (Map.Entry e : 
m.entrySet())<a name="line.121"></a>
 <span class="sourceLineNo">122</span>               n[i++] = 
get(e.getKey().toString(), e.getValue().toString());<a name="line.122"></a>
 <span class="sourceLineNo">123</span>         } else {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>            throw new 
RuntimeException("Invalid type passed to NamespaceFactory.listFromObject: 
'"+o+"'");<a name="line.124"></a>
+<span class="sourceLineNo">124</span>            throw new 
FormattedRuntimeException("Invalid type passed to 
NamespaceFactory.listFromObject: ''{0}''", o);<a name="line.124"></a>
 <span class="sourceLineNo">125</span>         }<a name="line.125"></a>
 <span class="sourceLineNo">126</span>         return n;<a name="line.126"></a>
 <span class="sourceLineNo">127</span>      } catch (ParseException e) {<a 
name="line.127"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParseException.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParseException.html 
b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParseException.html
new file mode 100644
index 0000000..df613b5
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParseException.html
@@ -0,0 +1,119 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" 
title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>// 
***************************************************************************************************************************<a
 name="line.1"></a>
+<span class="sourceLineNo">002</span>// * Licensed to the Apache Software 
Foundation (ASF) under one or more contributor license agreements.  See the 
NOTICE file *<a name="line.2"></a>
+<span class="sourceLineNo">003</span>// * distributed with this work for 
additional information regarding copyright ownership.  The ASF licenses this 
file        *<a name="line.3"></a>
+<span class="sourceLineNo">004</span>// * to you under the Apache License, 
Version 2.0 (the "License"); you may not use this file except in compliance     
       *<a name="line.4"></a>
+<span class="sourceLineNo">005</span>// * with the License.  You may obtain a 
copy of the License at                                                          
    *<a name="line.5"></a>
+<span class="sourceLineNo">006</span>// *                                      
                                                                                
   *<a name="line.6"></a>
+<span class="sourceLineNo">007</span>// *  
http://www.apache.org/licenses/LICENSE-2.0                                      
                                       *<a name="line.7"></a>
+<span class="sourceLineNo">008</span>// *                                      
                                                                                
   *<a name="line.8"></a>
+<span class="sourceLineNo">009</span>// * Unless required by applicable law or 
agreed to in writing, software distributed under the License is distributed on 
an  *<a name="line.9"></a>
+<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR 
CONDITIONS OF ANY KIND, either express or implied.  See the License for the     
   *<a name="line.10"></a>
+<span class="sourceLineNo">011</span>// * specific language governing 
permissions and limitations under the License.                                  
            *<a name="line.11"></a>
+<span class="sourceLineNo">012</span>// 
***************************************************************************************************************************<a
 name="line.12"></a>
+<span class="sourceLineNo">013</span>package org.apache.juneau.xml;<a 
name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import static 
org.apache.juneau.internal.StringUtils.*;<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><a name="line.18"></a>
+<span class="sourceLineNo">019</span>import javax.xml.stream.*;<a 
name="line.19"></a>
+<span class="sourceLineNo">020</span><a name="line.20"></a>
+<span class="sourceLineNo">021</span>import 
org.apache.juneau.parser.ParseException;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Exception that indicates invalid 
syntax encountered during XML parsing.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> */<a name="line.25"></a>
+<span class="sourceLineNo">026</span>@SuppressWarnings("serial")<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>public class XmlParseException extends 
ParseException {<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>   /**<a name="line.29"></a>
+<span class="sourceLineNo">030</span>    * Constructor.<a name="line.30"></a>
+<span class="sourceLineNo">031</span>    *<a name="line.31"></a>
+<span class="sourceLineNo">032</span>    * @param location The location of the 
exception.<a name="line.32"></a>
+<span class="sourceLineNo">033</span>    * @param message The exception 
message containing {@link MessageFormat}-style arguments.<a name="line.33"></a>
+<span class="sourceLineNo">034</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.34"></a>
+<span class="sourceLineNo">035</span>    */<a name="line.35"></a>
+<span class="sourceLineNo">036</span>   public XmlParseException(Location 
location, String message, Object...args) {<a name="line.36"></a>
+<span class="sourceLineNo">037</span>      super(getMessage(location, message, 
args));<a name="line.37"></a>
+<span class="sourceLineNo">038</span>   }<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>   private static String 
getMessage(Location location, String msg, Object... args) {<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>      if (args.length != 0)<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>         msg = format(msg, args);<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>      if (location != null)<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>         msg = "Parse exception occurred 
at " + location + ".  " + msg;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>      return msg;<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>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParser.html 
b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParser.html
index 8eab583..234cc9c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParser.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParser.html
@@ -435,7 +435,7 @@
 <span class="sourceLineNo">427</span><a name="line.427"></a>
 <span class="sourceLineNo">428</span>   private Object 
getUnknown(XmlParserSession session, XMLStreamReader r) throws Exception {<a 
name="line.428"></a>
 <span class="sourceLineNo">429</span>      if (r.getEventType() != 
XMLStreamConstants.START_ELEMENT) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>         throw new 
XMLStreamException("parser must be on START_ELEMENT to read next text", 
r.getLocation());<a name="line.430"></a>
+<span class="sourceLineNo">430</span>         throw new 
XmlParseException(r.getLocation(), "Parser must be on START_ELEMENT to read 
next text.");<a name="line.430"></a>
 <span class="sourceLineNo">431</span>      }<a name="line.431"></a>
 <span class="sourceLineNo">432</span>      ObjectMap m = null;<a 
name="line.432"></a>
 <span class="sourceLineNo">433</span><a name="line.433"></a>
@@ -457,7 +457,7 @@
 <span class="sourceLineNo">449</span>         } else if (eventType == 
XMLStreamConstants.PROCESSING_INSTRUCTION || eventType == 
XMLStreamConstants.COMMENT) {<a name="line.449"></a>
 <span class="sourceLineNo">450</span>            // skipping<a 
name="line.450"></a>
 <span class="sourceLineNo">451</span>         } else if (eventType == 
XMLStreamConstants.END_DOCUMENT) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>            throw new 
XMLStreamException("Unexpected end of document when reading element text 
content", r.getLocation());<a name="line.452"></a>
+<span class="sourceLineNo">452</span>            throw new 
XmlParseException(r.getLocation(), "Unexpected end of document when reading 
element text content");<a name="line.452"></a>
 <span class="sourceLineNo">453</span>         } else if (eventType == 
XMLStreamConstants.START_ELEMENT) {<a name="line.453"></a>
 <span class="sourceLineNo">454</span>            // Oops...this has an element 
in it.<a name="line.454"></a>
 <span class="sourceLineNo">455</span>            // Parse it as a map.<a 
name="line.455"></a>
@@ -490,7 +490,7 @@
 <span class="sourceLineNo">482</span>            } while (depth &gt; 0);<a 
name="line.482"></a>
 <span class="sourceLineNo">483</span>            break;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>         } else {<a name="line.484"></a>
-<span class="sourceLineNo">485</span>            throw new 
XMLStreamException("Unexpected event type " + eventType, r.getLocation());<a 
name="line.485"></a>
+<span class="sourceLineNo">485</span>            throw new 
XmlParseException(r.getLocation(), "Unexpected event type ''{0}''", 
eventType);<a name="line.485"></a>
 <span class="sourceLineNo">486</span>         }<a name="line.486"></a>
 <span class="sourceLineNo">487</span>         eventType = r.next();<a 
name="line.487"></a>
 <span class="sourceLineNo">488</span>      }<a name="line.488"></a>

Reply via email to