You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/05/29 22:24:16 UTC
[14/51] [partial] incubator-juneau-website git commit: Improved URI
resolution support.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/57ce76c3/content/site/apidocs/src-html/org/apache/juneau/UriResolver.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/UriResolver.html b/content/site/apidocs/src-html/org/apache/juneau/UriResolver.html
new file mode 100644
index 0000000..5cffc6d
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/UriResolver.html
@@ -0,0 +1,345 @@
+<!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;<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.UriRelativity.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import static org.apache.juneau.UriResolution.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span>import static org.apache.juneau.internal.StringUtils.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span><a name="line.18"></a>
+<span class="sourceLineNo">019</span>import java.io.*;<a name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.net.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.internal.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Class used to create absolute and root-relative URIs based on your current URI 'location' and rules about how to<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * make such resolutions.<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * <p><a name="line.27"></a>
+<span class="sourceLineNo">028</span> * Combines a {@link UriContext} instance with rules for resolution ({@link UriResolution} and relativity<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * ({@link UriRelativity}) to define simple {@link #resolve(Object)} and {@link #append(Appendable, Object)}<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * methods.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <p><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * Three special protocols are used to represent context-root-relative, servlet-relative, and request-path-relative URIs:<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <js>"context:/"</js>, <js>"servlet:/"</js>, and <js>"request:/"</js>.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> *<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * The following list shows the protocols of URLs that can be resolved with this class:<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * <ul><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <li><js>"foo://foo"</js> - Absolute URI.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <li><js>"/foo"</js> - Root-relative URI.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * <li><js>"/"</js> - Root URI.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <li><js>"context:/foo"</js> - Context-root-relative URI.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <li><js>"context:/"</js> - Context-root URI.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <li><js>"servlet:/foo"</js> - Servlet-path-relative URI.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <li><js>"servlet:/"</js> - Servlet-path URI.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <li><js>"request:/foo"</js> - Request-path-relative URI.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <li><js>"request:/"</js> - Request-path URI.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <li><js>"foo"</js> - Path-info-relative URI.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <li><js>""</js> - Path-info URI.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * </ul><a name="line.48"></a>
+<span class="sourceLineNo">049</span>*/<a name="line.49"></a>
+<span class="sourceLineNo">050</span>public class UriResolver {<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> private final UriResolution resolution;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> private final UriRelativity relativity;<a name="line.53"></a>
+<span class="sourceLineNo">054</span> private final String authority, contextRoot, servletPath, pathInfo, parentPath;<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span> /**<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * Constructor.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> *<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * @param resolution Rule on how URIs should be resolved.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * @param relativity Rule on what relative URIs are relative to.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * @param uriContext Current URI context (i.e. the current URI 'location').<a name="line.61"></a>
+<span class="sourceLineNo">062</span> */<a name="line.62"></a>
+<span class="sourceLineNo">063</span> public UriResolver(UriResolution resolution, UriRelativity relativity, UriContext uriContext) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> this.resolution = resolution;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> this.relativity = relativity;<a name="line.65"></a>
+<span class="sourceLineNo">066</span> this.authority = uriContext.authority;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> this.contextRoot = uriContext.contextRoot;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> this.servletPath = uriContext.servletPath;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> this.pathInfo = uriContext.pathInfo;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> this.parentPath = uriContext.parentPath;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> /**<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * Converts the specified URI to absolute form based on values in this context.<a name="line.74"></a>
+<span class="sourceLineNo">075</span> *<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * @param uri The URI to convert to absolute form.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * Can be any of the following:<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <ul><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <li>{@link java.net.URI}<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * <li>{@link java.net.URL}<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * <li>{@link CharSequence}<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * </ul><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * URI can be any of the following forms:<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * <ul><a name="line.84"></a>
+<span class="sourceLineNo">085</span> * <li><js>"foo://foo"</js> - Absolute URI.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * <li><js>"/foo"</js> - Root-relative URI.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * <li><js>"/"</js> - Root URI.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <li><js>"context:/foo"</js> - Context-root-relative URI.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * <li><js>"context:/"</js> - Context-root URI.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * <li><js>"servlet:/foo"</js> - Servlet-path-relative URI.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * <li><js>"servlet:/"</js> - Servlet-path URI.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <li><js>"request:/foo"</js> - Request-path-relative URI.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <li><js>"request:/"</js> - Request-path URI.<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <li><js>"foo"</js> - Path-info-relative URI.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * <li><js>""</js> - Path-info URI.<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * </ul><a name="line.96"></a>
+<span class="sourceLineNo">097</span> * @return The converted URI.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> */<a name="line.98"></a>
+<span class="sourceLineNo">099</span> public String resolve(Object uri) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> return resolve(uri, resolution);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> }<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> private String resolve(Object uri, UriResolution res) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> String s = StringUtils.toString(uri);<a name="line.104"></a>
+<span class="sourceLineNo">105</span> if (isAbsoluteUri(s))<a name="line.105"></a>
+<span class="sourceLineNo">106</span> return hasDotSegments(s) && res != NONE ? normalize(s) : s;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> if (res == ROOT_RELATIVE && startsWith(s, '/'))<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return hasDotSegments(s) ? normalize(s) : s;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> if (res == NONE && ! isSpecialUri(s))<a name="line.109"></a>
+<span class="sourceLineNo">110</span> return s;<a name="line.110"></a>
+<span class="sourceLineNo">111</span> return append(new StringBuilder(), s).toString();<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> /**<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * Relativizes a URI.<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * <p><a name="line.116"></a>
+<span class="sourceLineNo">117</span> * Similar to {@link URI#relativize(URI)}, except supports special protocols (e.g. <js>"servlet:/"</js>) for<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * both the <code>relativeTo</code> and <code>uri</code> parameters.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * <p><a name="line.119"></a>
+<span class="sourceLineNo">120</span> * For example, to relativize a URI to its servlet-relative form:<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * <p class='bcode'><a name="line.121"></a>
+<span class="sourceLineNo">122</span> * <jc>// relativeUri == "path/foo"</jc><a name="line.122"></a>
+<span class="sourceLineNo">123</span> * String relativeUri = resolver.relativize(<js>"servlet:/"</js>, <js>"/context/servlet/path/foo"</js>);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * </p><a name="line.124"></a>
+<span class="sourceLineNo">125</span> *<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * @param relativeTo The URI to relativize against.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @param uri The URI to relativize.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @return The relativized URI.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public String relativize(Object relativeTo, Object uri) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> String r = resolve(relativeTo, ABSOLUTE);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> String s = resolve(uri, ABSOLUTE);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> return URI.create(r).relativize(URI.create(s)).toString();<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * Same as {@link #resolve(Object)} except appends result to the specified appendable.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> *<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * @param a The appendable to append the URL to.<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * @param o The URI to convert to absolute form.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * @return The same appendable passed in.<a name="line.141"></a>
+<span class="sourceLineNo">142</span> */<a name="line.142"></a>
+<span class="sourceLineNo">143</span> public Appendable append(Appendable a, Object o) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> try {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> String uri = StringUtils.toString(o);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> uri = nullIfEmpty(uri);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> boolean needsNormalize = hasDotSegments(uri) && resolution != null;<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span> // Absolute paths are not changed.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> if (isAbsoluteUri(uri))<a name="line.151"></a>
+<span class="sourceLineNo">152</span> return a.append(needsNormalize ? normalize(uri) : uri);<a name="line.152"></a>
+<span class="sourceLineNo">153</span> if (resolution == NONE && ! isSpecialUri(uri))<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return a.append(emptyIfNull(uri));<a name="line.154"></a>
+<span class="sourceLineNo">155</span> if (resolution == ROOT_RELATIVE && startsWith(uri, '/'))<a name="line.155"></a>
+<span class="sourceLineNo">156</span> return a.append(needsNormalize ? normalize(uri) : uri);<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> Appendable a2 = needsNormalize ? new StringBuilder() : a;<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span> // Root-relative path<a name="line.160"></a>
+<span class="sourceLineNo">161</span> if (startsWith(uri, '/')) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> if (authority != null)<a name="line.162"></a>
+<span class="sourceLineNo">163</span> a2.append(authority);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> if (uri.length() != 1)<a name="line.164"></a>
+<span class="sourceLineNo">165</span> a2.append(uri);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> else if (authority == null)<a name="line.166"></a>
+<span class="sourceLineNo">167</span> a2.append('/');<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> // Context-relative path<a name="line.170"></a>
+<span class="sourceLineNo">171</span> else if (uri != null && uri.startsWith("context:/")) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> if (resolution == ABSOLUTE && authority != null)<a name="line.172"></a>
+<span class="sourceLineNo">173</span> a2.append(authority);<a name="line.173"></a>
+<span class="sourceLineNo">174</span> if (contextRoot != null)<a name="line.174"></a>
+<span class="sourceLineNo">175</span> a2.append('/').append(contextRoot);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> if (uri.length() > 9)<a name="line.176"></a>
+<span class="sourceLineNo">177</span> a2.append('/').append(uri.substring(9));<a name="line.177"></a>
+<span class="sourceLineNo">178</span> else if (contextRoot == null && (authority == null || resolution != ABSOLUTE))<a name="line.178"></a>
+<span class="sourceLineNo">179</span> a2.append('/');<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> // Resource-relative path<a name="line.182"></a>
+<span class="sourceLineNo">183</span> else if (uri != null && uri.startsWith("servlet:/")) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (resolution == ABSOLUTE && authority != null)<a name="line.184"></a>
+<span class="sourceLineNo">185</span> a2.append(authority);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (contextRoot != null)<a name="line.186"></a>
+<span class="sourceLineNo">187</span> a2.append('/').append(contextRoot);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (servletPath != null)<a name="line.188"></a>
+<span class="sourceLineNo">189</span> a2.append('/').append(servletPath);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> if (uri.length() > 9)<a name="line.190"></a>
+<span class="sourceLineNo">191</span> a2.append('/').append(uri.substring(9));<a name="line.191"></a>
+<span class="sourceLineNo">192</span> else if (servletPath == null && contextRoot == null && (authority == null || resolution != ABSOLUTE))<a name="line.192"></a>
+<span class="sourceLineNo">193</span> a2.append('/');<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span> // Request-relative path<a name="line.196"></a>
+<span class="sourceLineNo">197</span> else if (uri != null && uri.startsWith("request:/")) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> if (resolution == ABSOLUTE && authority != null)<a name="line.198"></a>
+<span class="sourceLineNo">199</span> a2.append(authority);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> if (contextRoot != null)<a name="line.200"></a>
+<span class="sourceLineNo">201</span> a2.append('/').append(contextRoot);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> if (servletPath != null)<a name="line.202"></a>
+<span class="sourceLineNo">203</span> a2.append('/').append(servletPath);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> if (pathInfo != null)<a name="line.204"></a>
+<span class="sourceLineNo">205</span> a2.append('/').append(pathInfo);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> if (uri.length() > 9)<a name="line.206"></a>
+<span class="sourceLineNo">207</span> a2.append('/').append(uri.substring(9));<a name="line.207"></a>
+<span class="sourceLineNo">208</span> else if (servletPath == null && contextRoot == null && pathInfo == null && (authority == null || resolution != ABSOLUTE))<a name="line.208"></a>
+<span class="sourceLineNo">209</span> a2.append('/');<a name="line.209"></a>
+<span class="sourceLineNo">210</span> }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span> // Relative path<a name="line.212"></a>
+<span class="sourceLineNo">213</span> else {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> if (resolution == ABSOLUTE && authority != null)<a name="line.214"></a>
+<span class="sourceLineNo">215</span> a2.append(authority);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> if (contextRoot != null)<a name="line.216"></a>
+<span class="sourceLineNo">217</span> a2.append('/').append(contextRoot);<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (servletPath != null)<a name="line.218"></a>
+<span class="sourceLineNo">219</span> a2.append('/').append(servletPath);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (relativity == RESOURCE && uri != null)<a name="line.220"></a>
+<span class="sourceLineNo">221</span> a2.append('/').append(uri);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> else if (relativity == PATH_INFO) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> if (uri == null) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> if (pathInfo != null)<a name="line.224"></a>
+<span class="sourceLineNo">225</span> a2.append('/').append(pathInfo);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> } else {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> if (parentPath != null)<a name="line.227"></a>
+<span class="sourceLineNo">228</span> a2.append('/').append(parentPath);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> a2.append('/').append(uri);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> }<a name="line.230"></a>
+<span class="sourceLineNo">231</span> }<a name="line.231"></a>
+<span class="sourceLineNo">232</span> else if (uri == null && contextRoot == null && servletPath == null && (authority == null || resolution != ABSOLUTE))<a name="line.232"></a>
+<span class="sourceLineNo">233</span> a2.append('/');<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span> if (needsNormalize)<a name="line.236"></a>
+<span class="sourceLineNo">237</span> a.append(normalize(a2.toString()));<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span> return a;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> } catch (IOException e) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> throw new RuntimeException(e);<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
+<span class="sourceLineNo">243</span> }<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> private static boolean isSpecialUri(String s) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> if (s == null || s.length() == 0)<a name="line.246"></a>
+<span class="sourceLineNo">247</span> return false;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> char c = s.charAt(0);<a name="line.248"></a>
+<span class="sourceLineNo">249</span> if (c != 's' && c != 'c' && c != 'r')<a name="line.249"></a>
+<span class="sourceLineNo">250</span> return false;<a name="line.250"></a>
+<span class="sourceLineNo">251</span> return s.startsWith("servlet:/") || s.startsWith("context:/") || s.startsWith("request:/");<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> private static String normalize(String s) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> s = URI.create(s).normalize().toString();<a name="line.255"></a>
+<span class="sourceLineNo">256</span> if (s.length() > 1 && s.charAt(s.length()-1) == '/')<a name="line.256"></a>
+<span class="sourceLineNo">257</span> s = s.substring(0, s.length()-1);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return s;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> private static boolean hasDotSegments(String s) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> if (s == null)<a name="line.262"></a>
+<span class="sourceLineNo">263</span> return false;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> for (int i = 0; i < s.length()-1; i++) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> char c = s.charAt(i);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> if (i == 0 && c == '/')<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return true;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> if (c == '/' && s.charAt(i+1) == '.')<a name="line.268"></a>
+<span class="sourceLineNo">269</span> return true;<a name="line.269"></a>
+<span class="sourceLineNo">270</span> }<a name="line.270"></a>
+<span class="sourceLineNo">271</span> return false;<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">273</span>}<a name="line.273"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/57ce76c3/content/site/apidocs/src-html/org/apache/juneau/annotation/Pojo.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/annotation/Pojo.html b/content/site/apidocs/src-html/org/apache/juneau/annotation/Pojo.html
index 926968d..80ff497 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/annotation/Pojo.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/annotation/Pojo.html
@@ -58,10 +58,10 @@
<span class="sourceLineNo">050</span> *<a name="line.50"></a>
<span class="sourceLineNo">051</span> * <jc>// Our POJO swap to force the bean to be serialized as a String</jc><a name="line.51"></a>
<span class="sourceLineNo">052</span> * <jk>public class</jk> BSwap <jk>extends</jk> PojoSwap&lt;B,String&gt; {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <jk>public</jk> String swap(B o) <jk>throws</jk> SerializeException {<a name="line.53"></a>
+<span class="sourceLineNo">053</span> * <jk>public</jk> String swap(BeanSession s, B o) <jk>throws</jk> SerializeException {<a name="line.53"></a>
<span class="sourceLineNo">054</span> * <jk>return</jk> o.f1;<a name="line.54"></a>
<span class="sourceLineNo">055</span> * }<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <jk>public</jk> B unswap(String f) <jk>throws</jk> ParseException {<a name="line.56"></a>
+<span class="sourceLineNo">056</span> * <jk>public</jk> B unswap(BeanSession s, String f) <jk>throws</jk> ParseException { {<a name="line.56"></a>
<span class="sourceLineNo">057</span> * B b1 = <jk>new</jk> B();<a name="line.57"></a>
<span class="sourceLineNo">058</span> * b1.<jf>f1</jf> = f;<a name="line.58"></a>
<span class="sourceLineNo">059</span> * <jk>return</jk> b1;<a name="line.59"></a>
@@ -73,11 +73,11 @@
<span class="sourceLineNo">065</span> * B b = <jk>new</jk> B();<a name="line.65"></a>
<span class="sourceLineNo">066</span> * b.<jf>f1</jf> = <js>"bar"</js>;<a name="line.66"></a>
<span class="sourceLineNo">067</span> * String json = s.serialize(b);<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * <jsm>assertEquals</jsm>(<js>"'bar'"</js>, json);<a name="line.68"></a>
+<span class="sourceLineNo">068</span> * <jsm>assertEquals</jsm>(<js>"\"bar\""</js>, json);<a name="line.68"></a>
<span class="sourceLineNo">069</span> *<a name="line.69"></a>
<span class="sourceLineNo">070</span> * ReaderParser p = JsonParser.<jsf>DEFAULT</jsf>;<a name="line.70"></a>
<span class="sourceLineNo">071</span> * b = p.parse(json, B.<jk>class</jk>);<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * <jsm>assertEquals</jsm>(<js>"bar"</js>, t.<jf>f1</jf>);<a name="line.72"></a>
+<span class="sourceLineNo">072</span> * <jsm>assertEquals</jsm>(<js>"bar"</js>, b.<jf>f1</jf>);<a name="line.72"></a>
<span class="sourceLineNo">073</span> * }<a name="line.73"></a>
<span class="sourceLineNo">074</span> * </p><a name="line.74"></a>
<span class="sourceLineNo">075</span> * <p><a name="line.75"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/57ce76c3/content/site/apidocs/src-html/org/apache/juneau/annotation/URI.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/annotation/URI.html b/content/site/apidocs/src-html/org/apache/juneau/annotation/URI.html
index 232a75f..7e6cac1 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/annotation/URI.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/annotation/URI.html
@@ -26,52 +26,58 @@
<span class="sourceLineNo">018</span>import java.lang.annotation.*;<a name="line.18"></a>
<span class="sourceLineNo">019</span>import java.net.*;<a name="line.19"></a>
<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.serializer.*;<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> * Used to identify a class or bean property as a URI.<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
-<span class="sourceLineNo">026</span> * By default, instances of {@link URL} and {@link URI} are considered URIs during serialization, and are<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * handled differently depending on the serializer (e.g. <code>HtmlSerializer</code> creates a hyperlink,<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * <code>RdfXmlSerializer</code> creates an <code>rdf:resource</code> object, etc...).<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <p><a name="line.29"></a>
-<span class="sourceLineNo">030</span> * This annotation allows you to identify other classes that return URIs via <code>toString()</code> as URI objects.<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * <p><a name="line.31"></a>
-<span class="sourceLineNo">032</span> * Relative URIs are automatically prepended with {@link SerializerContext#SERIALIZER_absolutePathUriBase} and {@link SerializerContext#SERIALIZER_relativeUriBase}<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * during serialization just like relative <code>URIs</code>.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <p><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * This annotation can be applied to classes, interfaces, or bean property methods for fields.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <h5 class='section'>Example:</h5><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <p class='bcode'><a name="line.38"></a>
-<span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <jc>// Applied to a class whose toString() method returns a URI.</jc><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <ja>@URI</ja><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <jk>public class</jk> MyURI {<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <ja>@Override</ja><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <jk>public</jk> String toString() {<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <jk>return</jk> <js>"http://localhost:9080/foo/bar"</js>;<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * }<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * }<a name="line.47"></a>
-<span class="sourceLineNo">048</span> *<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <jc>// Applied to bean properties</jc><a name="line.49"></a>
-<span class="sourceLineNo">050</span> * <jk>public class</jk> MyBean {<a name="line.50"></a>
-<span class="sourceLineNo">051</span> *<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <ja>@URI</ja><a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <jk>public</jk> String <jf>beanUri</jf>;<a name="line.53"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.serializer.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Used to identify a class or bean property as a URI.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * By default, instances of {@link URL} and {@link URI} are considered URIs during serialization, and are<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * handled differently depending on the serializer (e.g. <code>HtmlSerializer</code> creates a hyperlink,<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * <code>RdfXmlSerializer</code> creates an <code>rdf:resource</code> object, etc...).<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <p><a name="line.30"></a>
+<span class="sourceLineNo">031</span> * This annotation allows you to identify other classes that return URIs via <code>toString()</code> as URI objects.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <p><a name="line.32"></a>
+<span class="sourceLineNo">033</span> * URIs are automatically resolved to absolute or root-relative form based on the serializer<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * {@link SerializerContext#SERIALIZER_uriResolution} and {@link SerializerContext#SERIALIZER_uriRelativity}<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * configuration settings, and the URI context defined by the {@link UriContext} that's part of the serializer<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * session.<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <p><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * Refer to the {@link UriResolver} class for information about the types of URIs that can be resolved during<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * serialization.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <p><a name="line.40"></a>
+<span class="sourceLineNo">041</span> * This annotation can be applied to classes, interfaces, or bean property methods for fields.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> *<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <h5 class='section'>Example:</h5><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <p class='bcode'><a name="line.44"></a>
+<span class="sourceLineNo">045</span> *<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <jc>// Applied to a class whose toString() method returns a URI.</jc><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <ja>@URI</ja><a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <jk>public class</jk> MyURI {<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * <ja>@Override</ja><a name="line.49"></a>
+<span class="sourceLineNo">050</span> * <jk>public</jk> String toString() {<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * <jk>return</jk> <js>"http://localhost:9080/foo/bar"</js>;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * }<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * }<a name="line.53"></a>
<span class="sourceLineNo">054</span> *<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <ja>@URI</ja><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <jk>public</jk> String getParentUri() {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * ...<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * }<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * }<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * </p><a name="line.60"></a>
-<span class="sourceLineNo">061</span> */<a name="line.61"></a>
-<span class="sourceLineNo">062</span>@Documented<a name="line.62"></a>
-<span class="sourceLineNo">063</span>@Target({TYPE,FIELD,METHOD})<a name="line.63"></a>
-<span class="sourceLineNo">064</span>@Retention(RUNTIME)<a name="line.64"></a>
-<span class="sourceLineNo">065</span>@Inherited<a name="line.65"></a>
-<span class="sourceLineNo">066</span>public @interface URI {}<a name="line.66"></a>
+<span class="sourceLineNo">055</span> * <jc>// Applied to bean properties</jc><a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <jk>public class</jk> MyBean {<a name="line.56"></a>
+<span class="sourceLineNo">057</span> *<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * <ja>@URI</ja><a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <jk>public</jk> String <jf>beanUri</jf>;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> *<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <ja>@URI</ja><a name="line.61"></a>
+<span class="sourceLineNo">062</span> * <jk>public</jk> String getParentUri() {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * ...<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * }<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * }<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * </p><a name="line.66"></a>
+<span class="sourceLineNo">067</span> */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>@Documented<a name="line.68"></a>
+<span class="sourceLineNo">069</span>@Target({TYPE,FIELD,METHOD})<a name="line.69"></a>
+<span class="sourceLineNo">070</span>@Retention(RUNTIME)<a name="line.70"></a>
+<span class="sourceLineNo">071</span>@Inherited<a name="line.71"></a>
+<span class="sourceLineNo">072</span>public @interface URI {}<a name="line.72"></a>