http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5c69dfed/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
----------------------------------------------------------------------
diff --git
a/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
b/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
index 3c6efad..bc03f91 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestUtils.html
@@ -20,177 +20,218 @@
<span class="sourceLineNo">012</span>//
***************************************************************************************************************************<a
name="line.12"></a>
<span class="sourceLineNo">013</span>package org.apache.juneau.rest;<a
name="line.13"></a>
<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import java.util.*;<a name="line.15"></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 javax.servlet.http.*;<a
name="line.17"></a>
-<span class="sourceLineNo">018</span><a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.*;<a
name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.utils.*;<a
name="line.20"></a>
+<span class="sourceLineNo">017</span>import java.util.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import java.util.regex.*;<a
name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import javax.servlet.http.*;<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> * Various reusable utility methods.<a
name="line.23"></a>
-<span class="sourceLineNo">024</span> */<a name="line.24"></a>
-<span class="sourceLineNo">025</span>public final class RestUtils {<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> * Returns readable text for an HTTP
response code.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * @param rc The HTTP response code.<a
name="line.30"></a>
-<span class="sourceLineNo">031</span> * @return Readable text for an HTTP
response code, or <jk>null</jk> if it's an invalid code.<a
name="line.31"></a>
-<span class="sourceLineNo">032</span> */<a name="line.32"></a>
-<span class="sourceLineNo">033</span> public static String
getHttpResponseText(int rc) {<a name="line.33"></a>
-<span class="sourceLineNo">034</span> return httpMsgs.get(rc);<a
name="line.34"></a>
-<span class="sourceLineNo">035</span> }<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span> private static
Map<Integer,String> httpMsgs = new AMap<Integer,String>()<a
name="line.37"></a>
-<span class="sourceLineNo">038</span> .append(200, "OK")<a
name="line.38"></a>
-<span class="sourceLineNo">039</span> .append(201, "Created")<a
name="line.39"></a>
-<span class="sourceLineNo">040</span> .append(202, "Accepted")<a
name="line.40"></a>
-<span class="sourceLineNo">041</span> .append(203, "Non-Authoritative
Information")<a name="line.41"></a>
-<span class="sourceLineNo">042</span> .append(204, "No Content")<a
name="line.42"></a>
-<span class="sourceLineNo">043</span> .append(205, "Reset Content")<a
name="line.43"></a>
-<span class="sourceLineNo">044</span> .append(206, "Partial Content")<a
name="line.44"></a>
-<span class="sourceLineNo">045</span> .append(300, "Multiple Choices")<a
name="line.45"></a>
-<span class="sourceLineNo">046</span> .append(301, "Moved Permanently")<a
name="line.46"></a>
-<span class="sourceLineNo">047</span> .append(302, "Temporary
Redirect")<a name="line.47"></a>
-<span class="sourceLineNo">048</span> .append(303, "See Other")<a
name="line.48"></a>
-<span class="sourceLineNo">049</span> .append(304, "Not Modified")<a
name="line.49"></a>
-<span class="sourceLineNo">050</span> .append(305, "Use Proxy")<a
name="line.50"></a>
-<span class="sourceLineNo">051</span> .append(307, "Temporary
Redirect")<a name="line.51"></a>
-<span class="sourceLineNo">052</span> .append(400, "Bad Request")<a
name="line.52"></a>
-<span class="sourceLineNo">053</span> .append(401, "Unauthorized")<a
name="line.53"></a>
-<span class="sourceLineNo">054</span> .append(402, "Payment Required")<a
name="line.54"></a>
-<span class="sourceLineNo">055</span> .append(403, "Forbidden")<a
name="line.55"></a>
-<span class="sourceLineNo">056</span> .append(404, "Not Found")<a
name="line.56"></a>
-<span class="sourceLineNo">057</span> .append(405, "Method Not
Allowed")<a name="line.57"></a>
-<span class="sourceLineNo">058</span> .append(406, "Not Acceptable")<a
name="line.58"></a>
-<span class="sourceLineNo">059</span> .append(407, "Proxy Authentication
Required")<a name="line.59"></a>
-<span class="sourceLineNo">060</span> .append(408, "Request Time-Out")<a
name="line.60"></a>
-<span class="sourceLineNo">061</span> .append(409, "Conflict")<a
name="line.61"></a>
-<span class="sourceLineNo">062</span> .append(410, "Gone")<a
name="line.62"></a>
-<span class="sourceLineNo">063</span> .append(411, "Length Required")<a
name="line.63"></a>
-<span class="sourceLineNo">064</span> .append(412, "Precondition
Failed")<a name="line.64"></a>
-<span class="sourceLineNo">065</span> .append(413, "Request Entity Too
Large")<a name="line.65"></a>
-<span class="sourceLineNo">066</span> .append(414, "Request-URI Too
Large")<a name="line.66"></a>
-<span class="sourceLineNo">067</span> .append(415, "Unsupported Media
Type")<a name="line.67"></a>
-<span class="sourceLineNo">068</span> .append(500, "Internal Server
Error")<a name="line.68"></a>
-<span class="sourceLineNo">069</span> .append(501, "Not Implemented")<a
name="line.69"></a>
-<span class="sourceLineNo">070</span> .append(502, "Bad Gateway")<a
name="line.70"></a>
-<span class="sourceLineNo">071</span> .append(503, "Service
Unavailable")<a name="line.71"></a>
-<span class="sourceLineNo">072</span> .append(504, "Gateway Timeout")<a
name="line.72"></a>
-<span class="sourceLineNo">073</span> .append(505, "HTTP Version Not
Supported")<a name="line.73"></a>
-<span class="sourceLineNo">074</span> ;<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> /**<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * Identical to {@link
HttpServletRequest#getPathInfo()} but doesn't decode encoded characters.<a
name="line.77"></a>
-<span class="sourceLineNo">078</span> *<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * @param req The HTTP request<a
name="line.79"></a>
-<span class="sourceLineNo">080</span> * @return The un-decoded path info.<a
name="line.80"></a>
-<span class="sourceLineNo">081</span> */<a name="line.81"></a>
-<span class="sourceLineNo">082</span> public static String
getPathInfoUndecoded(HttpServletRequest req) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> String requestURI =
req.getRequestURI();<a name="line.83"></a>
-<span class="sourceLineNo">084</span> String contextPath =
req.getContextPath();<a name="line.84"></a>
-<span class="sourceLineNo">085</span> String servletPath =
req.getServletPath();<a name="line.85"></a>
-<span class="sourceLineNo">086</span> int l = contextPath.length() +
servletPath.length();<a name="line.86"></a>
-<span class="sourceLineNo">087</span> if (requestURI.length() == l)<a
name="line.87"></a>
-<span class="sourceLineNo">088</span> return null;<a
name="line.88"></a>
-<span class="sourceLineNo">089</span> return requestURI.substring(l);<a
name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * Efficiently trims the path info
part from a request URI.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> *<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * <p><a name="line.95"></a>
-<span class="sourceLineNo">096</span> * The result is the URI of the
servlet itself.<a name="line.96"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.*;<a
name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.juneau.utils.*;<a
name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>/**<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * Various reusable utility methods.<a
name="line.26"></a>
+<span class="sourceLineNo">027</span> */<a name="line.27"></a>
+<span class="sourceLineNo">028</span>public final class RestUtils {<a
name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span> /**<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * Returns readable text for an HTTP
response code.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> *<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * @param rc The HTTP response code.<a
name="line.33"></a>
+<span class="sourceLineNo">034</span> * @return Readable text for an HTTP
response code, or <jk>null</jk> if it's an invalid code.<a
name="line.34"></a>
+<span class="sourceLineNo">035</span> */<a name="line.35"></a>
+<span class="sourceLineNo">036</span> public static String
getHttpResponseText(int rc) {<a name="line.36"></a>
+<span class="sourceLineNo">037</span> return httpMsgs.get(rc);<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
Map<Integer,String> httpMsgs = new AMap<Integer,String>()<a
name="line.40"></a>
+<span class="sourceLineNo">041</span> .append(200, "OK")<a
name="line.41"></a>
+<span class="sourceLineNo">042</span> .append(201, "Created")<a
name="line.42"></a>
+<span class="sourceLineNo">043</span> .append(202, "Accepted")<a
name="line.43"></a>
+<span class="sourceLineNo">044</span> .append(203, "Non-Authoritative
Information")<a name="line.44"></a>
+<span class="sourceLineNo">045</span> .append(204, "No Content")<a
name="line.45"></a>
+<span class="sourceLineNo">046</span> .append(205, "Reset Content")<a
name="line.46"></a>
+<span class="sourceLineNo">047</span> .append(206, "Partial Content")<a
name="line.47"></a>
+<span class="sourceLineNo">048</span> .append(300, "Multiple Choices")<a
name="line.48"></a>
+<span class="sourceLineNo">049</span> .append(301, "Moved Permanently")<a
name="line.49"></a>
+<span class="sourceLineNo">050</span> .append(302, "Temporary
Redirect")<a name="line.50"></a>
+<span class="sourceLineNo">051</span> .append(303, "See Other")<a
name="line.51"></a>
+<span class="sourceLineNo">052</span> .append(304, "Not Modified")<a
name="line.52"></a>
+<span class="sourceLineNo">053</span> .append(305, "Use Proxy")<a
name="line.53"></a>
+<span class="sourceLineNo">054</span> .append(307, "Temporary
Redirect")<a name="line.54"></a>
+<span class="sourceLineNo">055</span> .append(400, "Bad Request")<a
name="line.55"></a>
+<span class="sourceLineNo">056</span> .append(401, "Unauthorized")<a
name="line.56"></a>
+<span class="sourceLineNo">057</span> .append(402, "Payment Required")<a
name="line.57"></a>
+<span class="sourceLineNo">058</span> .append(403, "Forbidden")<a
name="line.58"></a>
+<span class="sourceLineNo">059</span> .append(404, "Not Found")<a
name="line.59"></a>
+<span class="sourceLineNo">060</span> .append(405, "Method Not
Allowed")<a name="line.60"></a>
+<span class="sourceLineNo">061</span> .append(406, "Not Acceptable")<a
name="line.61"></a>
+<span class="sourceLineNo">062</span> .append(407, "Proxy Authentication
Required")<a name="line.62"></a>
+<span class="sourceLineNo">063</span> .append(408, "Request Time-Out")<a
name="line.63"></a>
+<span class="sourceLineNo">064</span> .append(409, "Conflict")<a
name="line.64"></a>
+<span class="sourceLineNo">065</span> .append(410, "Gone")<a
name="line.65"></a>
+<span class="sourceLineNo">066</span> .append(411, "Length Required")<a
name="line.66"></a>
+<span class="sourceLineNo">067</span> .append(412, "Precondition
Failed")<a name="line.67"></a>
+<span class="sourceLineNo">068</span> .append(413, "Request Entity Too
Large")<a name="line.68"></a>
+<span class="sourceLineNo">069</span> .append(414, "Request-URI Too
Large")<a name="line.69"></a>
+<span class="sourceLineNo">070</span> .append(415, "Unsupported Media
Type")<a name="line.70"></a>
+<span class="sourceLineNo">071</span> .append(500, "Internal Server
Error")<a name="line.71"></a>
+<span class="sourceLineNo">072</span> .append(501, "Not Implemented")<a
name="line.72"></a>
+<span class="sourceLineNo">073</span> .append(502, "Bad Gateway")<a
name="line.73"></a>
+<span class="sourceLineNo">074</span> .append(503, "Service
Unavailable")<a name="line.74"></a>
+<span class="sourceLineNo">075</span> .append(504, "Gateway Timeout")<a
name="line.75"></a>
+<span class="sourceLineNo">076</span> .append(505, "HTTP Version Not
Supported")<a name="line.76"></a>
+<span class="sourceLineNo">077</span> ;<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> /**<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * Identical to {@link
HttpServletRequest#getPathInfo()} but doesn't decode encoded characters.<a
name="line.80"></a>
+<span class="sourceLineNo">081</span> *<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * @param req The HTTP request<a
name="line.82"></a>
+<span class="sourceLineNo">083</span> * @return The un-decoded path info.<a
name="line.83"></a>
+<span class="sourceLineNo">084</span> */<a name="line.84"></a>
+<span class="sourceLineNo">085</span> public static String
getPathInfoUndecoded(HttpServletRequest req) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> String requestURI =
req.getRequestURI();<a name="line.86"></a>
+<span class="sourceLineNo">087</span> String contextPath =
req.getContextPath();<a name="line.87"></a>
+<span class="sourceLineNo">088</span> String servletPath =
req.getServletPath();<a name="line.88"></a>
+<span class="sourceLineNo">089</span> int l = contextPath.length() +
servletPath.length();<a name="line.89"></a>
+<span class="sourceLineNo">090</span> if (requestURI.length() == l)<a
name="line.90"></a>
+<span class="sourceLineNo">091</span> return null;<a
name="line.91"></a>
+<span class="sourceLineNo">092</span> return requestURI.substring(l);<a
name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span> /**<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * Efficiently trims the path info
part from a request URI.<a name="line.96"></a>
<span class="sourceLineNo">097</span> *<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * @param requestURI The value
returned by {@link HttpServletRequest#getRequestURL()}<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * @param contextPath The value
returned by {@link HttpServletRequest#getContextPath()}<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @param servletPath The value
returned by {@link HttpServletRequest#getServletPath()}<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * @return The same StringBuilder with
remainder trimmed.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> */<a name="line.102"></a>
-<span class="sourceLineNo">103</span> public static StringBuffer
trimPathInfo(StringBuffer requestURI, String contextPath, String servletPath)
{<a name="line.103"></a>
-<span class="sourceLineNo">104</span> if (servletPath.equals("/"))<a
name="line.104"></a>
-<span class="sourceLineNo">105</span> servletPath = "";<a
name="line.105"></a>
-<span class="sourceLineNo">106</span> if (contextPath.equals("/"))<a
name="line.106"></a>
-<span class="sourceLineNo">107</span> contextPath = "";<a
name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> try {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> // Given URL:
http://hostname:port/servletPath/extra<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // We want:
http://hostname:port/servletPath<a name="line.111"></a>
-<span class="sourceLineNo">112</span> int sc = 0;<a
name="line.112"></a>
-<span class="sourceLineNo">113</span> for (int i = 0; i <
requestURI.length(); i++) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> char c =
requestURI.charAt(i);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> if (c == '/') {<a
name="line.115"></a>
-<span class="sourceLineNo">116</span> sc++;<a
name="line.116"></a>
-<span class="sourceLineNo">117</span> if (sc == 3) {<a
name="line.117"></a>
-<span class="sourceLineNo">118</span> if
(servletPath.isEmpty()) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>
requestURI.setLength(i);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return requestURI;<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> // Make sure context
path follows the authority.<a name="line.123"></a>
-<span class="sourceLineNo">124</span> for (int j = 0; j <
contextPath.length(); i++, j++)<a name="line.124"></a>
-<span class="sourceLineNo">125</span> if
(requestURI.charAt(i) != contextPath.charAt(j))<a name="line.125"></a>
-<span class="sourceLineNo">126</span> throw new
Exception("case=1");<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> // Make sure servlet
path follows the authority.<a name="line.128"></a>
-<span class="sourceLineNo">129</span> for (int j = 0; j <
servletPath.length(); i++, j++)<a name="line.129"></a>
-<span class="sourceLineNo">130</span> if
(requestURI.charAt(i) != servletPath.charAt(j))<a name="line.130"></a>
-<span class="sourceLineNo">131</span> throw new
Exception("case=2");<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> // Make sure servlet
path isn't a false match (e.g. /foo2 should not match /foo)<a
name="line.133"></a>
-<span class="sourceLineNo">134</span> c =
(requestURI.length() == i ? '/' : requestURI.charAt(i));<a name="line.134"></a>
-<span class="sourceLineNo">135</span> if (c == '/' || c ==
'?') {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>
requestURI.setLength(i);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return requestURI;<a
name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> throw new
Exception("case=3");<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span> } else if (c == '?') {<a
name="line.142"></a>
-<span class="sourceLineNo">143</span> if (sc != 2)<a
name="line.143"></a>
-<span class="sourceLineNo">144</span> throw new
Exception("case=4");<a name="line.144"></a>
-<span class="sourceLineNo">145</span> if (servletPath.isEmpty())
{<a name="line.145"></a>
-<span class="sourceLineNo">146</span>
requestURI.setLength(i);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> return requestURI;<a
name="line.147"></a>
-<span class="sourceLineNo">148</span> }<a name="line.148"></a>
-<span class="sourceLineNo">149</span> throw new
Exception("case=5");<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> if (servletPath.isEmpty())<a
name="line.152"></a>
-<span class="sourceLineNo">153</span> return requestURI;<a
name="line.153"></a>
-<span class="sourceLineNo">154</span> throw new Exception("case=6");<a
name="line.154"></a>
-<span class="sourceLineNo">155</span> } catch (Exception e) {<a
name="line.155"></a>
-<span class="sourceLineNo">156</span> throw new
FormattedRuntimeException(e, "Could not find servlet path in request URI.
URI=''{0}'', servletPath=''{1}''", requestURI, servletPath);<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> static String[] parseHeader(String s)
{<a name="line.160"></a>
-<span class="sourceLineNo">161</span> int i = s.indexOf(':');<a
name="line.161"></a>
-<span class="sourceLineNo">162</span> if (i == -1)<a name="line.162"></a>
-<span class="sourceLineNo">163</span> return null;<a
name="line.163"></a>
-<span class="sourceLineNo">164</span> String name = s.substring(0,
i).trim().toLowerCase(Locale.ENGLISH);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> String val =
s.substring(i+1).trim();<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return new String[]{name,val};<a
name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> /**<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * Parses key/value pairs separated by
either : or =<a name="line.170"></a>
-<span class="sourceLineNo">171</span> */<a name="line.171"></a>
-<span class="sourceLineNo">172</span> static String[]
parseKeyValuePair(String s) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> int i = -1;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> for (int j = 0; j < s.length()
&& i < 0; j++) { s.indexOf(':');<a name="line.174"></a>
-<span class="sourceLineNo">175</span> char c = s.charAt(j);<a
name="line.175"></a>
-<span class="sourceLineNo">176</span> if (c == '=' || c == ':')<a
name="line.176"></a>
-<span class="sourceLineNo">177</span> i = j;<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span> if (i == -1)<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return null;<a
name="line.180"></a>
-<span class="sourceLineNo">181</span> String name = s.substring(0,
i).trim();<a name="line.181"></a>
-<span class="sourceLineNo">182</span> String val =
s.substring(i+1).trim();<a name="line.182"></a>
-<span class="sourceLineNo">183</span> return new String[]{name,val};<a
name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>}<a name="line.185"></a>
+<span class="sourceLineNo">098</span> * <p><a name="line.98"></a>
+<span class="sourceLineNo">099</span> * The result is the URI of the
servlet itself.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> *<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * @param requestURI The value
returned by {@link HttpServletRequest#getRequestURL()}<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * @param contextPath The value
returned by {@link HttpServletRequest#getContextPath()}<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * @param servletPath The value
returned by {@link HttpServletRequest#getServletPath()}<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * @return The same StringBuilder with
remainder trimmed.<a name="line.104"></a>
+<span class="sourceLineNo">105</span> */<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public static StringBuffer
trimPathInfo(StringBuffer requestURI, String contextPath, String servletPath)
{<a name="line.106"></a>
+<span class="sourceLineNo">107</span> if (servletPath.equals("/"))<a
name="line.107"></a>
+<span class="sourceLineNo">108</span> servletPath = "";<a
name="line.108"></a>
+<span class="sourceLineNo">109</span> if (contextPath.equals("/"))<a
name="line.109"></a>
+<span class="sourceLineNo">110</span> contextPath = "";<a
name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> try {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> // Given URL:
http://hostname:port/servletPath/extra<a name="line.113"></a>
+<span class="sourceLineNo">114</span> // We want:
http://hostname:port/servletPath<a name="line.114"></a>
+<span class="sourceLineNo">115</span> int sc = 0;<a
name="line.115"></a>
+<span class="sourceLineNo">116</span> for (int i = 0; i <
requestURI.length(); i++) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> char c =
requestURI.charAt(i);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> if (c == '/') {<a
name="line.118"></a>
+<span class="sourceLineNo">119</span> sc++;<a
name="line.119"></a>
+<span class="sourceLineNo">120</span> if (sc == 3) {<a
name="line.120"></a>
+<span class="sourceLineNo">121</span> if
(servletPath.isEmpty()) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>
requestURI.setLength(i);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> return requestURI;<a
name="line.123"></a>
+<span class="sourceLineNo">124</span> }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> // Make sure context
path follows the authority.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> for (int j = 0; j <
contextPath.length(); i++, j++)<a name="line.127"></a>
+<span class="sourceLineNo">128</span> if
(requestURI.charAt(i) != contextPath.charAt(j))<a name="line.128"></a>
+<span class="sourceLineNo">129</span> throw new
Exception("case=1");<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> // Make sure servlet
path follows the authority.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> for (int j = 0; j <
servletPath.length(); i++, j++)<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if
(requestURI.charAt(i) != servletPath.charAt(j))<a name="line.133"></a>
+<span class="sourceLineNo">134</span> throw new
Exception("case=2");<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> // Make sure servlet
path isn't a false match (e.g. /foo2 should not match /foo)<a
name="line.136"></a>
+<span class="sourceLineNo">137</span> c =
(requestURI.length() == i ? '/' : requestURI.charAt(i));<a name="line.137"></a>
+<span class="sourceLineNo">138</span> if (c == '/' || c ==
'?') {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>
requestURI.setLength(i);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> return requestURI;<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> throw new
Exception("case=3");<a name="line.143"></a>
+<span class="sourceLineNo">144</span> }<a name="line.144"></a>
+<span class="sourceLineNo">145</span> } else if (c == '?') {<a
name="line.145"></a>
+<span class="sourceLineNo">146</span> if (sc != 2)<a
name="line.146"></a>
+<span class="sourceLineNo">147</span> throw new
Exception("case=4");<a name="line.147"></a>
+<span class="sourceLineNo">148</span> if (servletPath.isEmpty())
{<a name="line.148"></a>
+<span class="sourceLineNo">149</span>
requestURI.setLength(i);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> return requestURI;<a
name="line.150"></a>
+<span class="sourceLineNo">151</span> }<a name="line.151"></a>
+<span class="sourceLineNo">152</span> throw new
Exception("case=5");<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> if (servletPath.isEmpty())<a
name="line.155"></a>
+<span class="sourceLineNo">156</span> return requestURI;<a
name="line.156"></a>
+<span class="sourceLineNo">157</span> throw new Exception("case=6");<a
name="line.157"></a>
+<span class="sourceLineNo">158</span> } catch (Exception e) {<a
name="line.158"></a>
+<span class="sourceLineNo">159</span> throw new
FormattedRuntimeException(e, "Could not find servlet path in request URI.
URI=''{0}'', servletPath=''{1}''", requestURI, servletPath);<a
name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> static String[] parseHeader(String s)
{<a name="line.163"></a>
+<span class="sourceLineNo">164</span> int i = s.indexOf(':');<a
name="line.164"></a>
+<span class="sourceLineNo">165</span> if (i == -1)<a name="line.165"></a>
+<span class="sourceLineNo">166</span> return null;<a
name="line.166"></a>
+<span class="sourceLineNo">167</span> String name = s.substring(0,
i).trim().toLowerCase(Locale.ENGLISH);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> String val =
s.substring(i+1).trim();<a name="line.168"></a>
+<span class="sourceLineNo">169</span> return new String[]{name,val};<a
name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span> /**<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * Parses key/value pairs separated by
either : or =<a name="line.173"></a>
+<span class="sourceLineNo">174</span> */<a name="line.174"></a>
+<span class="sourceLineNo">175</span> static String[]
parseKeyValuePair(String s) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> int i = -1;<a name="line.176"></a>
+<span class="sourceLineNo">177</span> for (int j = 0; j < s.length()
&& i < 0; j++) { s.indexOf(':');<a name="line.177"></a>
+<span class="sourceLineNo">178</span> char c = s.charAt(j);<a
name="line.178"></a>
+<span class="sourceLineNo">179</span> if (c == '=' || c == ':')<a
name="line.179"></a>
+<span class="sourceLineNo">180</span> i = j;<a name="line.180"></a>
+<span class="sourceLineNo">181</span> }<a name="line.181"></a>
+<span class="sourceLineNo">182</span> if (i == -1)<a name="line.182"></a>
+<span class="sourceLineNo">183</span> return null;<a
name="line.183"></a>
+<span class="sourceLineNo">184</span> String name = s.substring(0,
i).trim();<a name="line.184"></a>
+<span class="sourceLineNo">185</span> String val =
s.substring(i+1).trim();<a name="line.185"></a>
+<span class="sourceLineNo">186</span> return new String[]{name,val};<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> static String
resolveNewlineSeparatedAnnotation(String[] value, String fromParent) {<a
name="line.189"></a>
+<span class="sourceLineNo">190</span> if (value.length == 0)<a
name="line.190"></a>
+<span class="sourceLineNo">191</span> return fromParent;<a
name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span> List<String> l = new
ArrayList<String>();<a name="line.193"></a>
+<span class="sourceLineNo">194</span> for (String v : value) {<a
name="line.194"></a>
+<span class="sourceLineNo">195</span> if (! "INHERIT".equals(v))<a
name="line.195"></a>
+<span class="sourceLineNo">196</span> l.add(v);<a
name="line.196"></a>
+<span class="sourceLineNo">197</span> else if (fromParent != null)<a
name="line.197"></a>
+<span class="sourceLineNo">198</span>
l.addAll(Arrays.asList(fromParent));<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
+<span class="sourceLineNo">200</span> return join(l, '\n');<a
name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> private static final Pattern
INDEXED_LINK_PATTERN = Pattern.compile("(?s)(\\S*)\\[(\\d+)\\]\\:(.*)");<a
name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span> static String[] resolveLinks(String[]
links, String[] parentLinks) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> if (links.length == 0)<a
name="line.206"></a>
+<span class="sourceLineNo">207</span> return parentLinks;<a
name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> List<String> list = new
ArrayList<String>();<a name="line.209"></a>
+<span class="sourceLineNo">210</span> for (String l : links) {<a
name="line.210"></a>
+<span class="sourceLineNo">211</span> if ("INHERIT".equals(l))<a
name="line.211"></a>
+<span class="sourceLineNo">212</span>
list.addAll(Arrays.asList(parentLinks));<a name="line.212"></a>
+<span class="sourceLineNo">213</span> else if (l.indexOf('[') != -1
&& INDEXED_LINK_PATTERN.matcher(l).matches()) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> Matcher lm =
INDEXED_LINK_PATTERN.matcher(l);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> lm.matches();<a
name="line.215"></a>
+<span class="sourceLineNo">216</span> String key =
lm.group(1);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> int index =
Math.min(list.size(), Integer.parseInt(lm.group(2)));<a name="line.217"></a>
+<span class="sourceLineNo">218</span> String remainder =
lm.group(3);<a name="line.218"></a>
+<span class="sourceLineNo">219</span> list.add(index,
key.isEmpty() ? remainder : key + ":" + remainder);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> } else {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> list.add(l);<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> return list.toArray(new
String[list.size()]);<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>
