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:17 UTC
[15/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/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index a066fc6..127161f 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -809,8 +809,8 @@
<p class='bcode'>
<jc>// Construct a new serializer group with configuration parameters that get applied to all serializers.</jc>
SerializerGroup sg = <jk>new</jk> SerializerGroupBuilder()
- .append(JsonSerializer.<jk>class</jk>, UrlEncodingSerializer.<jk>class</jk>)
- .ws() <jc>// or .useWhitespace(true)</jc>
+ .append(JsonSerializer.<jk>class</jk>, UrlEncodingSerializer.<jk>class</jk>);
+ .ws <jc>// or .useWhitespace(true)</jc>
.pojoSwaps(CalendarSwap.ISO8601DT.<jk>class</jk>)
.build();
@@ -820,7 +820,7 @@
<jc>// Construct a new parser group with configuration parameters that get applied to all parsers.</jc>
ParserGroup pg = <jk>new</jk> ParserGroupBuilder()
- .append(JsonParser.<jk>class</jk>, UrlEncodingParser.<jk>class</jk>)
+ .append(JsonSerializer.<jk>class</jk>, UrlEncodingSerializer.<jk>class</jk>);
.pojoSwaps(CalendarSwap.ISO8601DT.<jk>class</jk>)
.build();
@@ -949,6 +949,9 @@
.builder()
.quoteChar(<js>'"'</js>)
.build();
+
+ <jc>// Lock it so that the configuration cannot be changed.</jc>
+ s.lock();
</p>
<h6 class='topic'>Additional Information</h6>
@@ -1266,7 +1269,7 @@
<jc>// Must provide a no-arg constructor!</jc>
<jk>public</jk> MyAddressBeanFilter() {
<jk>super</jk>(Address.<jk>class</jk>); <jc>// The bean class that this filter applies to.</jc>
- properties(<js>"street,city,state"</js>); <jc>// The properties we want exposed.</jc>
+ setIncludeProperties(<js>"street,city,state"</js>); <jc>// The properties we want exposed.</jc>
}
}
</p>
@@ -1339,7 +1342,7 @@
<ja>@Bean</ja>(typeName=<js>"foo"</js>)
<jk>public class</jk> Foo {
<jc>// A bean property where the object types cannot be inferred since it's an Object[].</jc>
- <ja>@BeanProperty</ja>(beanDictionary={Bar.<jk>class</jk>,Baz.<jk>class</jk>})
+ <ja>@BeanProperty</ja>(typeDictionary={Bar.<jk>class</jk>,Baz.<jk>class</jk>})
<jk>public</jk> Object[] x = <jk>new</jk> Object[]{<jk>new</jk> Bar(), <jk>new</jk> Baz()};
}
@@ -1812,14 +1815,14 @@
<jc>// Read values from default section</jc>
key1 = f.getInt(<js>"key1"</js>);
key2 = f.getBoolean(<js>"key2"</js>);
- key3 = f.getObject(<js>"key3"</js>, <jk>int</jk>[].<jk>class</jk>);
- key4 = f.getObject(<js>"key4"</js>, URL.<jk>class</jk>);
+ key3 = f.getObject(<jk>int</jk>[].<jk>class</jk>, <js>"key3"</js>);
+ key4 = f.getObject(URL.<jk>class</jk>, <js>"key4"</js>);
<jc>// Read values from section #1</jc>
key1 = f.getInt(<js>"Section1/key1"</js>);
key2 = f.getBoolean(<js>"Section1/key2"</js>);
- key3 = f.getObject(<js>"Section1/key3"</js>, <jk>int</jk>[].<jk>class</jk>);
- key4 = f.getObject(<js>"Section1/key4"</js>, URL.<jk>class</jk>);
+ key3 = f.getObject(<jk>int</jk>[].<jk>class</jk>, <js>"Section1/key3"</js>);
+ key4 = f.getObject(URL.<jk>class</jk>, <js>"Section1/key4"</js>);
</p>
<p>
The interface also allows a config file to be easily constructed programmatically:
@@ -1851,7 +1854,7 @@
ConfigFile cf = <jk>new</jk> ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>)
.addLines(<jk>null</jk>,
<js>"# Default section"</js>)
- .addHeaderComments(<js>"Section1"</js>,
+ .addHeaderComments(<js>"section1"</js>,
<js>"# Section 1"</js>);
cf.put(<js>"key1"</js>, 1);
cf.put(<js>"key2"</js>, <jk>true</jk>);
@@ -2279,7 +2282,7 @@
.entries(
<jsm>entry</jsm>(<js>"tag:juneau.sample.com,2013:1.2345"</js>, <js>"Juneau ATOM specification snapshot"</js>, <js>"2016-01-02T03:04:05Z"</js>)
.links(
- <jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org/juneau.atom"</js>),
+ <jsm>link</jsm><js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org/juneau.atom"</js>),
<jsm>link</jsm>(<js>"enclosure"</js>, <js>"audio/mpeg"</js>, <js>"http://juneau.apache.org/audio/juneau_podcast.mp3"</js>).length(1337)
)
.published(<js>"2016-01-02T03:04:05Z"</js>)
@@ -2536,14 +2539,30 @@
<p class='bcode'>
<ja>@RestResource</ja>(
path=<js>"/systemProperties"</js>,
+
+ <jc>// Title and description that show up on HTML rendition page.
+ // Also used in Swagger doc.</jc>
title=<js>"System properties resource"</js>,
description=<js>"REST interface for performing CRUD operations on system properties."</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>,
+
+ <jc>// Links on the HTML rendition page.
+ // "request:/..." URIs are relative to the request URI.
+ // "servlet:/..." URIs are relative to the servlet URI.</jc>
+ pageLinks=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>,
+
+ <jc>// Properties that get applied to all serializers and parsers.</jc>
properties={
+ <jc>// Use single quotes.</jc>
<ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>)
},
+
+ <jc>// Our stylesheet for the HTML rendition.</jc>
stylesheet=<js>"styles/devops.css"</js>,
+
+ <jc>// Support GZIP encoding on Accept-Encoding header.</jc>
encoders=GzipEncoder.<jk>class</jk>,
+
+ <jc>// Swagger info.</jc>
contact=<js>"{name:'John Smith',email:'john@smith.com'}"</js>,
license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>,
version=<js>"2.0"</js>,
@@ -3425,7 +3444,7 @@
<ja>@RestResource</ja>(
messages=<js>"nls/HelloWorldResource"</js>,
path=<js>"/helloWorld"</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
+ pageLinks=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>
)
<jk>public class</jk> HelloWorldResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -3500,7 +3519,7 @@
<ja>@RestResource</ja>(
path=<js>"/methodExample"</js>,
messages=<js>"nls/MethodExampleResource"</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
+ pageLinks=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>
)
<jk>public class</jk> MethodExampleResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -3969,7 +3988,7 @@
<ja>@RestResource</ja>(
path=<js>"/echo"</js>,
messages=<js>"nls/RequestEchoResource"</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>,
+ pageLinks=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>,
properties={
<ja>@Property</ja>(name=<jsf>SERIALIZER_maxDepth</jsf>, value=<js>"10"</js>),
<ja>@Property</ja>(name=<jsf>SERIALIZER_detectRecursions</jsf>, value=<js>"true"</js>)
@@ -4424,18 +4443,42 @@
<ja>@RestResource</ja>(
path=<js>"/addressBook"</js>,
messages=<js>"nls/AddressBookResource"</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>,
- properties={
- <ja>@Property</ja>(name=<jsf>REST_allowMethodParam</jsf>, value=<js>"*"</js>),
- <ja>@Property</ja>(name=<jsf>HTML_uriAnchorText</jsf>, value=<jsf>TO_STRING</jsf>),
- <ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
- <ja>@Property</ja>(name=<jsf>RDF_rdfxml_tab</jsf>, value=<js>"5"</js>),
- <ja>@Property</ja>(name=<jsf>RDF_addRootProperty</jsf>, value=<js>"true"</js>),
- <jc>// Resolve all relative URIs so that they're relative to this servlet!</jc>
- <ja>@Property</ja>(name=<jsf>SERIALIZER_relativeUriBase</jsf>, value=<js>"$R{servletURI}"</js>),
- },
+
+ <jc>// Links on the HTML rendition page.
+ // "request:/..." URIs are relative to the request URI.
+ // "servlet:/..." URIs are relative to the servlet URI.
+ // "$C{...}" variables are pulled from the config file.</jc>
+ pageLinks=<js>"{up:'request:/..', options:'servlet:/?method=OPTIONS', source:'$C{Source/gitHub}/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java'}"</js>,
+
+ <jc>// Properties that get applied to all serializers and parsers.</jc>
+ properties={
+
+ <jc>// Allow INIT as a method parameter.</jc>
+ <ja>@Property</ja>(name=<jsf>REST_allowMethodParam</jsf>, value=<js>"*"</js>),
+
+ <jc>// Use single quotes.</jc>
+ <ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
+
+ <jc>// Make RDF/XML readable.</jc>
+ <ja>@Property</ja>(name=<jsf>RDF_rdfxml_tab</jsf>, value=<js>"5"</js>),
+
+ <jc>// Make RDF parsable by adding a root node.</jc>
+ <ja>@Property</ja>(name=<jsf>RDF_addRootProperty</jsf>, value=<js>"true"</js>),
+
+ <jc>// Make URIs absolute so that we can easily reference them on the client side.</jc>
+ <ja>@Property</ja>(name=<jsf>SERIALIZER_uriResolution</jsf>, value=<js>"ABSOLUTE"</js>)
+
+ <jc>// Make the anchor text on URLs be just the path relative to the servlet.</jc>
+ <ja>@Property</ja>(name=<jsf>HTML_uriAnchorText</jsf>, value=<js>"SERVLET_RELATIVE"</js>)
+ },
+
+ <jc>// Our stylesheet for the HTML rendition.</jc>
stylesheet=<js>"styles/devops.css"</js>,
+
+ <jc>// Support GZIP encoding on Accept-Encoding header.</jc>
encoders=GzipEncoder.<jk>class</jk>,
+
+ <jc>// Swagger info.</jc>
contact=<js>"{name:'John Smith',email:'john@smith.com'}"</js>,
license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>,
version=<js>"2.0"</js>,
@@ -4454,7 +4497,7 @@
<jk>try</jk> {
<jc>// Create the address book</jc>
- <jf>addressBook</jf> = <jk>new</jk> AddressBook(java.net.URI.create(<js>""</js>));
+ <jf>addressBook</jf> = <jk>new</jk> AddressBook(java.net.URI.create(<js>"servlet:/"</js>));
<jc>// Add some people to our address book by default</jc>
<jf>addressBook</jf>.createPerson(
@@ -5073,7 +5116,7 @@
messages=<js>"nls/SampleRemoteableServlet"</js>,
title=<js>"Remoteable Service Proxy API"</js>,
description=<js>"Sample class showing how to use remoteable proxies. The list below are exposed services that can be retrieved using RestClient.getProxyInterface(Class)."</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>,
+ pageLinks=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>,
properties={
<jc>// Allow us to use method=POST from a browser.</jc>
<ja>@Property</ja>(name=<jsf>REST_allowMethodParam</jsf>, value=<js>"*"</js>)
@@ -5176,7 +5219,7 @@
<ja>@RestResource</ja>(
path=<js>"/tempDir"</js>,
messages=<js>"nls/TempDirResource"</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS',upload:'upload'}"</js>,
+ pageLinks=<js>"{up:'request:/..', options:'servlet:/?method=OPTIONS', upload:'servlet:/upload'}"</js>,
properties={
<ja>@Property</ja>(name=<js>"DirectoryResource.rootDir"</js>, value=<js>"$S{java.io.tmpdir}"</js>),
<ja>@Property</ja>(name=<js>"DirectoryResource.allowViews"</js>, value=<js>"true"</js>),
@@ -5294,7 +5337,7 @@
<ja>@RestResource</ja>(
path=<js>"/atom"</js>,
messages=<js>"nls/AtomFeedResource"</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>,
+ pageLinks=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>,
properties={
<ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
<ja>@Property</ja>(name=<jsf>RDF_rdfxml_tab</jsf>, value=<js>"5"</js>),
@@ -5402,7 +5445,7 @@
<ja>@RestResource</ja>(
path=<js>"/docker"</js>,
title=<js>"Sample Docker resource"</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
+ pageLinks=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>
)
<jk>public class</jk> DockerRegistryResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -5483,7 +5526,7 @@
messages=<js>"nls/TumblrParserResource"</js>,
title=<js>"Tumblr parser service"</js>,
description=<js>"Specify a URL to a Tumblr blog and parse the results."</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
+ pageLinks=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>
)
<jk>public class</jk> TumblrParserResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -5704,7 +5747,7 @@
path=<js>"/jsonSchema"</js>,
messages=<js>"nls/JsonSchemaResource"</js>,
title=<js>"Sample JSON-Schema document"</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
+ pageLinks=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>
)
<jk>public class</jk> JsonSchemaResource <jk>extends</jk> ResourceJena {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -5785,7 +5828,7 @@
messages=<js>"nls/SqlQueryResource"</js>,
title=<js>"SQL query service"</js>,
description=<js>"Executes queries against the local derby '$C{SqlQueryResource/connectionUrl}' database"</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
+ pageLinks=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>
)
<jk>public class</jk> SqlQueryResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -5972,7 +6015,7 @@
path=<js>"/config"</js>,
title=<js>"Configuration"</js>,
description=<js>"Contents of configuration file."</js>,
- pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS',edit:'edit'}"</js>
+ pageLinks=<js>"{up:'request:/..', options:'servlet:/?method=OPTIONS', edit:'servlet:/edit'}"</js>
)
<jk>public class</jk> ConfigResource <jk>extends</jk> Resource {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L;
@@ -6499,6 +6542,39 @@
<li><a href="org/apache/juneau/remoteable/Header.html#serializer--"><code>Header.serializer()</code></a>
<li><a href="org/apache/juneau/remoteable/HeaderIfNE.html#serializer--"><code>HeaderIfNE.serializer()</code></a>
</ul>
+ <li>Across-the-board improvements to the URI-resolution support (i.e. how URIs get serialized).
+ <ul>
+ <li>New support for resolving URIs with the following newly-recognized protocols:
+ <ul>
+ <li><js>"context:/..."</js> - Relative to context-root of the application.
+ <li><js>"servlet:/..."</js> - Relative to the servlet URI.
+ <li><js>"request:/..."</js> - Relative to the request URI.
+ </ul>
+ For example, currently we define HTML page links using variables and servlet-relative URIs...
+ <p class='bcode'>
+ pageLinks=<js>"{up:'$R{requestParentURI}', options:'?method=OPTIONS', upload:'upload'}"</js>
+ </p>
+ With these new protocols, we can define them like so:
+ <p class='bcode'>
+ pageLinks=<js>"{top:'context:/', up:'request:/..' ,options:'servlet:/?method=OPTIONS', upload:'servlet:/upload'}"</js>
+ </p>
+ The old method of using variables and servlet-relative URIs will still be supported, but using
+ these new protocols should (hopefully) be easier to understand.
+ <br>
+ These protocols work on all serialized URL and URI objects, as well as classes and properties
+ annotated with <a href="org/apache/juneau/annotation/URI.html" title="annotation in org.apache.juneau.annotation"><code>@URI</code></a>.
+ <li>New classes:
+ <ul>
+ <li><a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau"><code>UriContext</code></a>
+ <li><a href="org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau"><code>UriRelativity</code></a>
+ <li><a href="org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau"><code>UriResolution</code></a>
+ <li><a href="org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a>
+ </ul>
+ <li>New configuration properties:
+ <li><a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_uriContext"><code>SerializerContext.SERIALIZER_uriContext</code></a>
+ <li><a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_uriRelativity"><code>SerializerContext.SERIALIZER_uriRelativity</code></a>
+ <li><a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_uriResolution"><code>SerializerContext.SERIALIZER_uriResolution</code></a>
+ </ul>
</ul>
<h6 class='topic'>org.apache.juneau.rest</h6>
@@ -8188,8 +8264,8 @@
<ul class='spaced-list'>
<li>New properties in <a href="org/apache/juneau/serializer/SerializerContext.html" title="class in org.apache.juneau.serializer"><code>SerializerContext</code></a>:
<ol>
- <li><a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_relativeUriBase"><code>SerializerContext.SERIALIZER_relativeUriBase</code></a>
- <li><a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_absolutePathUriBase"><code>SerializerContext.SERIALIZER_absolutePathUriBase</code></a>
+ <li><code><del>SerializerContext.SERIALIZER_relativeUriBase</del></code>
+ <li><code><del>SerializerContext.SERIALIZER_absolutePathUriBase</del></code>
</ol>
These replace the <code>SERIALIZER_uriAuthority</code> and <code>SERIALIZER_uriContext</code> properties.
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/57ce76c3/content/site/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index a0094e2..683d20a 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -233,6 +233,7 @@
</li>
<li type="circle">org.apache.juneau.http.<a href="org/apache/juneau/http/Accept.html" title="class in org.apache.juneau.http"><span class="typeNameLink">Accept</span></a></li>
<li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">ArrayUtils</span></a></li>
+<li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">AsciiMap</span></a></li>
<li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">AsciiSet</span></a></li>
<li type="circle">org.apache.juneau.dto.atom.<a href="org/apache/juneau/dto/atom/AtomBuilder.html" title="class in org.apache.juneau.dto.atom"><span class="typeNameLink">AtomBuilder</span></a></li>
<li type="circle">org.apache.juneau.rest.jaxrs.<a href="org/apache/juneau/rest/jaxrs/BaseProvider.html" title="class in org.apache.juneau.rest.jaxrs"><span class="typeNameLink">BaseProvider</span></a> (implements javax.ws.rs.ext.MessageBodyReader<T>, javax.ws.rs.ext.MessageBodyWriter<T>)
@@ -1224,6 +1225,7 @@
<li type="circle">org.apache.juneau.rest.converters.<a href="org/apache/juneau/rest/converters/Traversable.html" title="class in org.apache.juneau.rest.converters"><span class="typeNameLink">Traversable</span></a> (implements org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>)</li>
<li type="circle">org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonUtils.html" title="class in org.apache.juneau.uon"><span class="typeNameLink">UonUtils</span></a></li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau"><span class="typeNameLink">UriContext</span></a></li>
+<li type="circle">org.apache.juneau.<a href="org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><span class="typeNameLink">UriResolver</span></a></li>
<li type="circle">org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingContext.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingContext</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>)</li>
<li type="circle">org.apache.juneau.rest.<a href="org/apache/juneau/rest/UrlPathPattern.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">UrlPathPattern</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>)</li>
<li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/Utils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Utils</span></a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/57ce76c3/content/site/apidocs/src-html/org/apache/juneau/UriContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/UriContext.html b/content/site/apidocs/src-html/org/apache/juneau/UriContext.html
index 1a31027..dff0e0d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/UriContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/UriContext.html
@@ -21,378 +21,248 @@
<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.internal.StringUtils.*;<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.UriRelativity.*;<a name="line.17"></a>
+<span class="sourceLineNo">016</span><a name="line.16"></a>
+<span class="sourceLineNo">017</span>import org.apache.juneau.annotation.*;<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><a name="line.20"></a>
-<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * Represents a URL broken into authority/context-root/servlet-path/path-info parts.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * <p><a name="line.23"></a>
-<span class="sourceLineNo">024</span> * A typical request against a URL takes the following form:<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * <p class='bcode'><a name="line.25"></a>
-<span class="sourceLineNo">026</span> * http://host:port/context-root/servlet-path/path-info<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * | authority | context | resource | path |<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * +--------------------------------------------------+<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * </p><a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <p><a name="line.30"></a>
-<span class="sourceLineNo">031</span> * This class allows you to convert URL strings to absolute (e.g. <js>"http://host:port/foo/bar"</js>) or root-relative<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * (e.g. <js>"/foo/bar"</js>) URLs.<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * <p><a name="line.33"></a>
-<span class="sourceLineNo">034</span> * Two special protocols are used to represent context-root-relative and servlet-relative URIs:<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <js>"context:/"</js> and <js>"servlet:/"</js>.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * The following list shows the types of URLs that can be resolved with this class:<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <ul><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <li><js>"foo://foo"</js> - Absolute URI.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <li><js>"/foo"</js> - Root-relative URI.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <li><js>"/"</js> - Root URI.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <li><js>"context:/foo"</js> - Context-root-relative URI.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <li><js>"context:/"</js> - Context-root URI.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <li><js>"servlet:/foo"</js> - Servlet-path-relative URI.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <li><js>"servlet:/"</js> - Servlet-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> * The following class shows how<a name="line.50"></a>
-<span class="sourceLineNo">051</span> */<a name="line.51"></a>
-<span class="sourceLineNo">052</span>public class UriContext {<a name="line.52"></a>
-<span class="sourceLineNo">053</span><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> private final UriResolution resolution;<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private final UriRelativity relativity;<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> // Lazy-initialized fields.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> private String aContextRoot, rContextRoot, aServletPath, rResource, aPathInfo, rPath;<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> /**<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * Constructor.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * <p><a name="line.65"></a>
-<span class="sourceLineNo">066</span> * Leading and trailing slashes are trimmed of all parameters.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * <p><a name="line.67"></a>
-<span class="sourceLineNo">068</span> * Any parameter can be <jk>null</jk>. Blanks and nulls are equivalent.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> *<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * @param resolution<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * @param relativity<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * @param authority - The authority portion of URL (e.g. <js>"http://hostname:port"</js>)<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * @param contextRoot - The context root of the application (e.g. <js>"/context-root"</js>, or <js>"context-root"</js>)<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * @param servletPath - The servlet path (e.g. <js>"/servlet-path"</js>, or <js>"servlet-path"</js>)<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * @param pathInfo - The path info (e.g. <js>"/path-info"</js>, or <js>"path-info"</js>)<a name="line.75"></a>
-<span class="sourceLineNo">076</span> */<a name="line.76"></a>
-<span class="sourceLineNo">077</span> public UriContext(UriResolution resolution, UriRelativity relativity, String authority, String contextRoot, String servletPath, String pathInfo) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> this.resolution = resolution;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> this.relativity = relativity;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> this.authority = nullIfEmpty(trimSlashes(authority));<a name="line.80"></a>
-<span class="sourceLineNo">081</span> this.contextRoot = nullIfEmpty(trimSlashes(contextRoot));<a name="line.81"></a>
-<span class="sourceLineNo">082</span> this.servletPath = nullIfEmpty(trimSlashes(servletPath));<a name="line.82"></a>
-<span class="sourceLineNo">083</span> this.pathInfo = nullIfEmpty(trimSlashes(pathInfo));<a name="line.83"></a>
-<span class="sourceLineNo">084</span> this.parentPath = this.pathInfo == null || this.pathInfo.indexOf('/') == -1 ? null : this.pathInfo.substring(0, this.pathInfo.lastIndexOf('/'));<a name="line.84"></a>
-<span class="sourceLineNo">085</span> }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span> /**<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * Default constructor.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> */<a name="line.89"></a>
-<span class="sourceLineNo">090</span> public UriContext() {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> this(ROOT_RELATIVE, RESOURCE, null, null, null, null);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> }<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span> /**<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * Returns the absolute URI of just the authority portion of this URI context.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * <p><a name="line.96"></a>
-<span class="sourceLineNo">097</span> * Example: <js>"http://hostname:port"</js><a name="line.97"></a>
-<span class="sourceLineNo">098</span> * <p><a name="line.98"></a>
-<span class="sourceLineNo">099</span> * If the authority is null/empty, returns <js>"/"</js>.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> *<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * @return The absolute URI of just the authority portion of this URI context.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * Never <jk>null</jk>.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> */<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public String getAbsoluteAuthority() {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> return authority == null ? "/" : authority;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> /**<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * Returns the absolute URI of the context-root portion of this URI context.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * <p><a name="line.110"></a>
-<span class="sourceLineNo">111</span> * Example: <js>"http://hostname:port/context-root"</js><a name="line.111"></a>
-<span class="sourceLineNo">112</span> *<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * @return The absolute URI of the context-root portion of this URI context.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * Never <jk>null</jk>.<a name="line.114"></a>
-<span class="sourceLineNo">115</span> */<a name="line.115"></a>
-<span class="sourceLineNo">116</span> public String getAbsoluteContextRoot() {<a name="line.116"></a>
-<span class="sourceLineNo">117</span> if (aContextRoot == null) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> if (authority == null)<a name="line.118"></a>
-<span class="sourceLineNo">119</span> aContextRoot = getRootRelativeContextRoot();<a name="line.119"></a>
-<span class="sourceLineNo">120</span> else<a name="line.120"></a>
-<span class="sourceLineNo">121</span> aContextRoot = (contextRoot == null ? authority : (authority + '/' + contextRoot));<a name="line.121"></a>
-<span class="sourceLineNo">122</span> }<a name="line.122"></a>
-<span class="sourceLineNo">123</span> return aContextRoot;<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> /**<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * Returns the root-relative URI of the context portion of this URI context.<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * <p><a name="line.128"></a>
-<span class="sourceLineNo">129</span> * Example: <js>"/context-root"</js><a name="line.129"></a>
-<span class="sourceLineNo">130</span> *<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * @return The root-relative URI of the context portion of this URI context.<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * Never <jk>null</jk>.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> */<a name="line.133"></a>
-<span class="sourceLineNo">134</span> public String getRootRelativeContextRoot() {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> if (rContextRoot == null)<a name="line.135"></a>
-<span class="sourceLineNo">136</span> rContextRoot = contextRoot == null ? "/" : ('/' + contextRoot);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return rContextRoot;<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> /**<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * Returns the absolute URI of the resource portion of this URI context.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * <p><a name="line.142"></a>
-<span class="sourceLineNo">143</span> * Example: <js>"http://hostname:port/context-root/servlet-path"</js><a name="line.143"></a>
-<span class="sourceLineNo">144</span> *<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * @return The absolute URI of the resource portion of this URI context.<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * Never <jk>null</jk>.<a name="line.146"></a>
-<span class="sourceLineNo">147</span> */<a name="line.147"></a>
-<span class="sourceLineNo">148</span> public String getAbsoluteServletPath() {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> if (aServletPath == null) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> if (authority == null)<a name="line.150"></a>
-<span class="sourceLineNo">151</span> aServletPath = getRootRelativeServletPath();<a name="line.151"></a>
-<span class="sourceLineNo">152</span> else {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> if (contextRoot == null)<a name="line.153"></a>
-<span class="sourceLineNo">154</span> aServletPath = (servletPath == null ? authority : authority + '/' + servletPath);<a name="line.154"></a>
-<span class="sourceLineNo">155</span> else<a name="line.155"></a>
-<span class="sourceLineNo">156</span> aServletPath = (servletPath == null ? (authority + '/' + contextRoot) : (authority + '/' + contextRoot + '/' + 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> return aServletPath;<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> * Returns the root-relative URI of the resource portion of this URI context.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * <p><a name="line.164"></a>
-<span class="sourceLineNo">165</span> * Example: <js>"/context-root/servlet-path"</js><a name="line.165"></a>
-<span class="sourceLineNo">166</span> *<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * @return The root-relative URI of the resource portion of this URI context.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * Never <jk>null</jk>.<a name="line.168"></a>
-<span class="sourceLineNo">169</span> */<a name="line.169"></a>
-<span class="sourceLineNo">170</span> public String getRootRelativeServletPath() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> if (rResource == null) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if (contextRoot == null)<a name="line.172"></a>
-<span class="sourceLineNo">173</span> rResource = (servletPath == null ? "/" : ('/' + servletPath));<a name="line.173"></a>
-<span class="sourceLineNo">174</span> else<a name="line.174"></a>
-<span class="sourceLineNo">175</span> rResource = (servletPath == null ? ('/' + contextRoot) : ('/' + contextRoot + '/' + servletPath));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> }<a name="line.176"></a>
-<span class="sourceLineNo">177</span> return rResource;<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> /**<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * Returns the parent of the URL returned by {@link #getAbsoluteServletPath()}.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> *<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * @return The parent of the URL returned by {@link #getAbsoluteServletPath()}.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> */<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public String getAbsoluteServletPathParent() {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> return getParent(getAbsoluteServletPath());<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span> /**<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * Returns the parent of the URL returned by {@link #getRootRelativeServletPath()}.<a name="line.190"></a>
-<span class="sourceLineNo">191</span> *<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * @return The parent of the URL returned by {@link #getRootRelativeServletPath()}.<a name="line.192"></a>
-<span class="sourceLineNo">193</span> */<a name="line.193"></a>
-<span class="sourceLineNo">194</span> public String getRootRelativeServletPathParent() {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return getParent(getRootRelativeServletPath());<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> /**<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * Returns the absolute URI of the path portion of this URI context.<a name="line.199"></a>
-<span class="sourceLineNo">200</span> * <p><a name="line.200"></a>
-<span class="sourceLineNo">201</span> * Example: <js>"http://hostname:port/context-root/servlet-path/path-info"</js><a name="line.201"></a>
-<span class="sourceLineNo">202</span> *<a name="line.202"></a>
-<span class="sourceLineNo">203</span> * @return The absolute URI of the path portion of this URI context.<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * Never <jk>null</jk>.<a name="line.204"></a>
-<span class="sourceLineNo">205</span> */<a name="line.205"></a>
-<span class="sourceLineNo">206</span> public String getAbsolutePathInfo() {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> if (aPathInfo == null) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> if (authority == null)<a name="line.208"></a>
-<span class="sourceLineNo">209</span> aPathInfo = getRootRelativePathInfo();<a name="line.209"></a>
-<span class="sourceLineNo">210</span> else {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> if (contextRoot == null) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> if (servletPath == null)<a name="line.212"></a>
-<span class="sourceLineNo">213</span> aPathInfo = (pathInfo == null ? authority : (authority + '/' + pathInfo));<a name="line.213"></a>
-<span class="sourceLineNo">214</span> else<a name="line.214"></a>
-<span class="sourceLineNo">215</span> aPathInfo = (pathInfo == null ? (authority + '/' + servletPath) : (authority + '/' + servletPath + '/' + pathInfo));<a name="line.215"></a>
-<span class="sourceLineNo">216</span> } else {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> if (servletPath == null)<a name="line.217"></a>
-<span class="sourceLineNo">218</span> aPathInfo = (pathInfo == null ? authority + '/' + contextRoot : (authority + '/' + contextRoot + '/' + pathInfo));<a name="line.218"></a>
-<span class="sourceLineNo">219</span> else<a name="line.219"></a>
-<span class="sourceLineNo">220</span> aPathInfo = (pathInfo == null ? (authority + '/' + contextRoot + '/' + servletPath) : (authority + '/' + contextRoot + '/' + servletPath + '/' + pathInfo));<a name="line.220"></a>
-<span class="sourceLineNo">221</span> }<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> return aPathInfo;<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> /**<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * Returns the root-relative URI of the path portion of this URI context.<a name="line.228"></a>
-<span class="sourceLineNo">229</span> * <p><a name="line.229"></a>
-<span class="sourceLineNo">230</span> * Example: <js>"/context-root/servlet-path/path-info"</js><a name="line.230"></a>
-<span class="sourceLineNo">231</span> *<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * @return The root-relative URI of the path portion of this URI context.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * Never <jk>null</jk>.<a name="line.233"></a>
-<span class="sourceLineNo">234</span> */<a name="line.234"></a>
-<span class="sourceLineNo">235</span> public String getRootRelativePathInfo() {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> if (rPath == null) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> if (contextRoot == null) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (servletPath == null)<a name="line.238"></a>
-<span class="sourceLineNo">239</span> rPath = (pathInfo == null ? "/" : ('/' + pathInfo));<a name="line.239"></a>
-<span class="sourceLineNo">240</span> else<a name="line.240"></a>
-<span class="sourceLineNo">241</span> rPath = (pathInfo == null ? ('/' + servletPath) : ('/' + servletPath + '/' + pathInfo));<a name="line.241"></a>
-<span class="sourceLineNo">242</span> } else {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> if (servletPath == null)<a name="line.243"></a>
-<span class="sourceLineNo">244</span> rPath = (pathInfo == null ? ('/' + contextRoot) : ('/' + contextRoot + '/' + pathInfo));<a name="line.244"></a>
-<span class="sourceLineNo">245</span> else<a name="line.245"></a>
-<span class="sourceLineNo">246</span> rPath = (pathInfo == null ? ('/' + contextRoot + '/' + servletPath) : ('/' + contextRoot + '/' + servletPath + '/' + pathInfo));<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span> return rPath;<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> * Returns the parent of the URL returned by {@link #getAbsolutePathInfo()}.<a name="line.253"></a>
-<span class="sourceLineNo">254</span> *<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * @return The parent of the URL returned by {@link #getAbsolutePathInfo()}.<a name="line.255"></a>
-<span class="sourceLineNo">256</span> */<a name="line.256"></a>
-<span class="sourceLineNo">257</span> public String getAbsolutePathInfoParent() {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> return getParent(getAbsolutePathInfo());<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> /**<a name="line.261"></a>
-<span class="sourceLineNo">262</span> * Returns the parent of the URL returned by {@link #getRootRelativePathInfo()}.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> *<a name="line.263"></a>
-<span class="sourceLineNo">264</span> * @return The parent of the URL returned by {@link #getRootRelativePathInfo()}.<a name="line.264"></a>
-<span class="sourceLineNo">265</span> */<a name="line.265"></a>
-<span class="sourceLineNo">266</span> public String getRootRelativePathInfoParent() {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> return getParent(getRootRelativePathInfo());<a name="line.267"></a>
-<span class="sourceLineNo">268</span> }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span> /**<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * Converts the specified URI to absolute form based on values in this context.<a name="line.271"></a>
-<span class="sourceLineNo">272</span> *<a name="line.272"></a>
-<span class="sourceLineNo">273</span> * @param uri The URI to convert to absolute form.<a name="line.273"></a>
-<span class="sourceLineNo">274</span> * @return The converted URI.<a name="line.274"></a>
-<span class="sourceLineNo">275</span> */<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public String resolve(String uri) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> if (isAbsoluteUri(uri))<a name="line.277"></a>
-<span class="sourceLineNo">278</span> return uri;<a name="line.278"></a>
-<span class="sourceLineNo">279</span> if (resolution == ROOT_RELATIVE && startsWith(uri, '/'))<a name="line.279"></a>
-<span class="sourceLineNo">280</span> return uri;<a name="line.280"></a>
-<span class="sourceLineNo">281</span> if (resolution == NONE && ! isSpecialUri(uri))<a name="line.281"></a>
-<span class="sourceLineNo">282</span> return uri;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> return append(new StringBuilder(), uri).toString();<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> /**<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * Same as {@link #resolve(String)} except appends result to the specified appendable.<a name="line.287"></a>
-<span class="sourceLineNo">288</span> *<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * @param a The appendable to append the URL to.<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * @param uri The URI to convert to absolute form.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * @return The same appendable passed in.<a name="line.291"></a>
-<span class="sourceLineNo">292</span> */<a name="line.292"></a>
-<span class="sourceLineNo">293</span> public Appendable append(Appendable a, String uri) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> try {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> uri = nullIfEmpty(uri);<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> // Absolute paths are not changed.<a name="line.298"></a>
-<span class="sourceLineNo">299</span> if (isAbsoluteUri(uri))<a name="line.299"></a>
-<span class="sourceLineNo">300</span> return a.append(uri);<a name="line.300"></a>
-<span class="sourceLineNo">301</span> if (resolution == NONE && ! isSpecialUri(uri))<a name="line.301"></a>
-<span class="sourceLineNo">302</span> return a.append(emptyIfNull(uri));<a name="line.302"></a>
-<span class="sourceLineNo">303</span> if (resolution == ROOT_RELATIVE && startsWith(uri, '/'))<a name="line.303"></a>
-<span class="sourceLineNo">304</span> return a.append(uri);<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span> // Root-relative path<a name="line.306"></a>
-<span class="sourceLineNo">307</span> if (startsWith(uri, '/')) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> if (authority != null){<a name="line.308"></a>
-<span class="sourceLineNo">309</span> a.append(authority);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> if (uri.length() == 1)<a name="line.310"></a>
-<span class="sourceLineNo">311</span> return a;<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span> return a.append(uri);<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> // Context-relative path<a name="line.316"></a>
-<span class="sourceLineNo">317</span> if (uri != null && uri.startsWith("context:/")) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> if (resolution == ABSOLUTE && authority != null)<a name="line.318"></a>
-<span class="sourceLineNo">319</span> a.append(authority);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> if (contextRoot != null)<a name="line.320"></a>
-<span class="sourceLineNo">321</span> a.append('/').append(contextRoot);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> if (uri.length() > 9)<a name="line.322"></a>
-<span class="sourceLineNo">323</span> a.append('/').append(uri.substring(9));<a name="line.323"></a>
-<span class="sourceLineNo">324</span> else if (contextRoot == null && (authority == null || resolution != ABSOLUTE))<a name="line.324"></a>
-<span class="sourceLineNo">325</span> a.append('/');<a name="line.325"></a>
-<span class="sourceLineNo">326</span> return a;<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> // Resource-relative path<a name="line.329"></a>
-<span class="sourceLineNo">330</span> if (uri != null && uri.startsWith("servlet:/")) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> if (resolution == ABSOLUTE && authority != null)<a name="line.331"></a>
-<span class="sourceLineNo">332</span> a.append(authority);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> if (contextRoot != null)<a name="line.333"></a>
-<span class="sourceLineNo">334</span> a.append('/').append(contextRoot);<a name="line.334"></a>
-<span class="sourceLineNo">335</span> if (servletPath != null)<a name="line.335"></a>
-<span class="sourceLineNo">336</span> a.append('/').append(servletPath);<a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (uri.length() > 9)<a name="line.337"></a>
-<span class="sourceLineNo">338</span> a.append('/').append(uri.substring(9));<a name="line.338"></a>
-<span class="sourceLineNo">339</span> else if (servletPath == null && contextRoot == null && (authority == null || resolution != ABSOLUTE))<a name="line.339"></a>
-<span class="sourceLineNo">340</span> a.append('/');<a name="line.340"></a>
-<span class="sourceLineNo">341</span> return a;<a name="line.341"></a>
-<span class="sourceLineNo">342</span> }<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span> // Relative path<a name="line.344"></a>
-<span class="sourceLineNo">345</span> if (resolution == ABSOLUTE && authority != null)<a name="line.345"></a>
-<span class="sourceLineNo">346</span> a.append(authority);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> if (contextRoot != null)<a name="line.347"></a>
-<span class="sourceLineNo">348</span> a.append('/').append(contextRoot);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> if (servletPath != null)<a name="line.349"></a>
-<span class="sourceLineNo">350</span> a.append('/').append(servletPath);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> if (relativity == RESOURCE && uri != null)<a name="line.351"></a>
-<span class="sourceLineNo">352</span> a.append('/').append(uri);<a name="line.352"></a>
-<span class="sourceLineNo">353</span> else if (relativity == PATH_INFO) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> if (uri == null) {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> if (pathInfo != null)<a name="line.355"></a>
-<span class="sourceLineNo">356</span> a.append('/').append(pathInfo);<a name="line.356"></a>
-<span class="sourceLineNo">357</span> } else {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> if (parentPath != null)<a name="line.358"></a>
-<span class="sourceLineNo">359</span> a.append('/').append(parentPath);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> a.append('/').append(uri);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> }<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span> else if (uri == null && contextRoot == null && servletPath == null && (authority == null || resolution != ABSOLUTE))<a name="line.363"></a>
-<span class="sourceLineNo">364</span> a.append('/');<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span> return a;<a name="line.366"></a>
-<span class="sourceLineNo">367</span> } catch (IOException e) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> throw new RuntimeException(e);<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> private static String getParent(String uri) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> int i = uri.lastIndexOf('/');<a name="line.373"></a>
-<span class="sourceLineNo">374</span> if (i <= 1)<a name="line.374"></a>
-<span class="sourceLineNo">375</span> return "/";<a name="line.375"></a>
-<span class="sourceLineNo">376</span> return uri.substring(0, i);<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span> private static boolean isSpecialUri(String s) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> if (s == null || s.length() == 0)<a name="line.380"></a>
-<span class="sourceLineNo">381</span> return false;<a name="line.381"></a>
-<span class="sourceLineNo">382</span> char c = s.charAt(0);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> if (c != 's' && c != 'c')<a name="line.383"></a>
-<span class="sourceLineNo">384</span> return false;<a name="line.384"></a>
-<span class="sourceLineNo">385</span> return s.startsWith("servlet:/") || s.startsWith("context:/");<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span>}<a name="line.387"></a>
+<span class="sourceLineNo">019</span>/**<a name="line.19"></a>
+<span class="sourceLineNo">020</span> * Represents a URL broken into authority/context-root/servlet-path/path-info parts.<a name="line.20"></a>
+<span class="sourceLineNo">021</span> * <p><a name="line.21"></a>
+<span class="sourceLineNo">022</span> * A typical request against a URL takes the following form:<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * <p class='bcode'><a name="line.23"></a>
+<span class="sourceLineNo">024</span> * http://host:port/context-root/servlet-path/path-info<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * | authority | context | resource | path |<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * +--------------------------------------------------+<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * </p><a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <p><a name="line.28"></a>
+<span class="sourceLineNo">029</span> * This class allows you to convert URL strings to absolute (e.g. <js>"http://host:port/foo/bar"</js>) or root-relative<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * (e.g. <js>"/foo/bar"</js>) URLs.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> */<a name="line.31"></a>
+<span class="sourceLineNo">032</span>@Bean<a name="line.32"></a>
+<span class="sourceLineNo">033</span>public class UriContext {<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span> /**<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * Default URI context.<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * No information about authority, servlet-root, context-root, or path-info is known.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> */<a name="line.38"></a>
+<span class="sourceLineNo">039</span> public static final UriContext DEFAULT = new UriContext();<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span> final String authority, contextRoot, servletPath, pathInfo, parentPath;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span> // Lazy-initialized fields.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> private String aContextRoot, rContextRoot, aServletPath, rResource, aPathInfo, rPath;<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span> /**<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * Constructor.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <p><a name="line.48"></a>
+<span class="sourceLineNo">049</span> * Leading and trailing slashes are trimmed of all parameters.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * <p><a name="line.50"></a>
+<span class="sourceLineNo">051</span> * Any parameter can be <jk>null</jk>. Blanks and nulls are equivalent.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> *<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * @param authority - The authority portion of URL (e.g. <js>"http://hostname:port"</js>)<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * @param contextRoot - The context root of the application (e.g. <js>"/context-root"</js>, or <js>"context-root"</js>)<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * @param servletPath - The servlet path (e.g. <js>"/servlet-path"</js>, or <js>"servlet-path"</js>)<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * @param pathInfo - The path info (e.g. <js>"/path-info"</js>, or <js>"path-info"</js>)<a name="line.56"></a>
+<span class="sourceLineNo">057</span> */<a name="line.57"></a>
+<span class="sourceLineNo">058</span> @BeanConstructor(properties="authority,contextRoot,servletPath,pathInfo")<a name="line.58"></a>
+<span class="sourceLineNo">059</span> public UriContext(String authority, String contextRoot, String servletPath, String pathInfo) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> this.authority = nullIfEmpty(trimSlashes(authority));<a name="line.60"></a>
+<span class="sourceLineNo">061</span> this.contextRoot = nullIfEmpty(trimSlashes(contextRoot));<a name="line.61"></a>
+<span class="sourceLineNo">062</span> this.servletPath = nullIfEmpty(trimSlashes(servletPath));<a name="line.62"></a>
+<span class="sourceLineNo">063</span> this.pathInfo = nullIfEmpty(trimSlashes(pathInfo));<a name="line.63"></a>
+<span class="sourceLineNo">064</span> this.parentPath = this.pathInfo == null || this.pathInfo.indexOf('/') == -1 ? null : this.pathInfo.substring(0, this.pathInfo.lastIndexOf('/'));<a name="line.64"></a>
+<span class="sourceLineNo">065</span> }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> /**<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * Default constructor.<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * All <jk>null</jk> values.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> */<a name="line.70"></a>
+<span class="sourceLineNo">071</span> public UriContext() {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> this(null, null, null, null);<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> <a name="line.74"></a>
+<span class="sourceLineNo">075</span> /**<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * Returns the absolute URI of just the authority portion of this URI context.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * <p><a name="line.77"></a>
+<span class="sourceLineNo">078</span> * Example: <js>"http://hostname:port"</js><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <p><a name="line.79"></a>
+<span class="sourceLineNo">080</span> * If the authority is null/empty, returns <js>"/"</js>.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> *<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * @return The absolute URI of just the authority portion of this URI context.<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * Never <jk>null</jk>.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> */<a name="line.84"></a>
+<span class="sourceLineNo">085</span> public String getAbsoluteAuthority() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> return authority == null ? "/" : authority;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> /**<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * Returns the absolute URI of the context-root portion of this URI context.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * <p><a name="line.91"></a>
+<span class="sourceLineNo">092</span> * Example: <js>"http://hostname:port/context-root"</js><a name="line.92"></a>
+<span class="sourceLineNo">093</span> *<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * @return The absolute URI of the context-root portion of this URI context.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * Never <jk>null</jk>.<a name="line.95"></a>
+<span class="sourceLineNo">096</span> */<a name="line.96"></a>
+<span class="sourceLineNo">097</span> public String getAbsoluteContextRoot() {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> if (aContextRoot == null) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> if (authority == null)<a name="line.99"></a>
+<span class="sourceLineNo">100</span> aContextRoot = getRootRelativeContextRoot();<a name="line.100"></a>
+<span class="sourceLineNo">101</span> else<a name="line.101"></a>
+<span class="sourceLineNo">102</span> aContextRoot = (contextRoot == null ? authority : (authority + '/' + contextRoot));<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span> return aContextRoot;<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * Returns the root-relative URI of the context portion of this URI context.<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <p><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * Example: <js>"/context-root"</js><a name="line.110"></a>
+<span class="sourceLineNo">111</span> *<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * @return The root-relative URI of the context portion of this URI context.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * Never <jk>null</jk>.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> */<a name="line.114"></a>
+<span class="sourceLineNo">115</span> public String getRootRelativeContextRoot() {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> if (rContextRoot == null)<a name="line.116"></a>
+<span class="sourceLineNo">117</span> rContextRoot = contextRoot == null ? "/" : ('/' + contextRoot);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> return rContextRoot;<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> /**<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * Returns the absolute URI of the resource portion of this URI context.<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * <p><a name="line.123"></a>
+<span class="sourceLineNo">124</span> * Example: <js>"http://hostname:port/context-root/servlet-path"</js><a name="line.124"></a>
+<span class="sourceLineNo">125</span> *<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * @return The absolute URI of the resource portion of this URI context.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * Never <jk>null</jk>.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public String getAbsoluteServletPath() {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> if (aServletPath == null) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> if (authority == null)<a name="line.131"></a>
+<span class="sourceLineNo">132</span> aServletPath = getRootRelativeServletPath();<a name="line.132"></a>
+<span class="sourceLineNo">133</span> else {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> if (contextRoot == null)<a name="line.134"></a>
+<span class="sourceLineNo">135</span> aServletPath = (servletPath == null ? authority : authority + '/' + servletPath);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> else<a name="line.136"></a>
+<span class="sourceLineNo">137</span> aServletPath = (servletPath == null ? (authority + '/' + contextRoot) : (authority + '/' + contextRoot + '/' + servletPath));<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> return aServletPath;<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> /**<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * Returns the root-relative URI of the resource portion of this URI context.<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * <p><a name="line.145"></a>
+<span class="sourceLineNo">146</span> * Example: <js>"/context-root/servlet-path"</js><a name="line.146"></a>
+<span class="sourceLineNo">147</span> *<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * @return The root-relative URI of the resource portion of this URI context.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * Never <jk>null</jk>.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> */<a name="line.150"></a>
+<span class="sourceLineNo">151</span> public String getRootRelativeServletPath() {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> if (rResource == null) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> if (contextRoot == null)<a name="line.153"></a>
+<span class="sourceLineNo">154</span> rResource = (servletPath == null ? "/" : ('/' + servletPath));<a name="line.154"></a>
+<span class="sourceLineNo">155</span> else<a name="line.155"></a>
+<span class="sourceLineNo">156</span> rResource = (servletPath == null ? ('/' + contextRoot) : ('/' + contextRoot + '/' + servletPath));<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> return rResource;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> /**<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * Returns the parent of the URL returned by {@link #getAbsoluteServletPath()}.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> *<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @return The parent of the URL returned by {@link #getAbsoluteServletPath()}.<a name="line.164"></a>
+<span class="sourceLineNo">165</span> */<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public String getAbsoluteServletPathParent() {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> return getParent(getAbsoluteServletPath());<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> /**<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * Returns the parent of the URL returned by {@link #getRootRelativeServletPath()}.<a name="line.171"></a>
+<span class="sourceLineNo">172</span> *<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * @return The parent of the URL returned by {@link #getRootRelativeServletPath()}.<a name="line.173"></a>
+<span class="sourceLineNo">174</span> */<a name="line.174"></a>
+<span class="sourceLineNo">175</span> public String getRootRelativeServletPathParent() {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> return getParent(getRootRelativeServletPath());<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span> /**<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * Returns the absolute URI of the path portion of this URI context.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * <p><a name="line.181"></a>
+<span class="sourceLineNo">182</span> * Example: <js>"http://hostname:port/context-root/servlet-path/path-info"</js><a name="line.182"></a>
+<span class="sourceLineNo">183</span> *<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * @return The absolute URI of the path portion of this URI context.<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * Never <jk>null</jk>.<a name="line.185"></a>
+<span class="sourceLineNo">186</span> */<a name="line.186"></a>
+<span class="sourceLineNo">187</span> public String getAbsolutePathInfo() {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (aPathInfo == null) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> if (authority == null)<a name="line.189"></a>
+<span class="sourceLineNo">190</span> aPathInfo = getRootRelativePathInfo();<a name="line.190"></a>
+<span class="sourceLineNo">191</span> else {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> if (contextRoot == null) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> if (servletPath == null)<a name="line.193"></a>
+<span class="sourceLineNo">194</span> aPathInfo = (pathInfo == null ? authority : (authority + '/' + pathInfo));<a name="line.194"></a>
+<span class="sourceLineNo">195</span> else<a name="line.195"></a>
+<span class="sourceLineNo">196</span> aPathInfo = (pathInfo == null ? (authority + '/' + servletPath) : (authority + '/' + servletPath + '/' + pathInfo));<a name="line.196"></a>
+<span class="sourceLineNo">197</span> } else {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> if (servletPath == null)<a name="line.198"></a>
+<span class="sourceLineNo">199</span> aPathInfo = (pathInfo == null ? authority + '/' + contextRoot : (authority + '/' + contextRoot + '/' + pathInfo));<a name="line.199"></a>
+<span class="sourceLineNo">200</span> else<a name="line.200"></a>
+<span class="sourceLineNo">201</span> aPathInfo = (pathInfo == null ? (authority + '/' + contextRoot + '/' + servletPath) : (authority + '/' + contextRoot + '/' + servletPath + '/' + pathInfo));<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span> return aPathInfo;<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> /**<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * Returns the root-relative URI of the path portion of this URI context.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * <p><a name="line.210"></a>
+<span class="sourceLineNo">211</span> * Example: <js>"/context-root/servlet-path/path-info"</js><a name="line.211"></a>
+<span class="sourceLineNo">212</span> *<a name="line.212"></a>
+<span class="sourceLineNo">213</span> * @return The root-relative URI of the path portion of this URI context.<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * Never <jk>null</jk>.<a name="line.214"></a>
+<span class="sourceLineNo">215</span> */<a name="line.215"></a>
+<span class="sourceLineNo">216</span> public String getRootRelativePathInfo() {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> if (rPath == null) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (contextRoot == null) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> if (servletPath == null)<a name="line.219"></a>
+<span class="sourceLineNo">220</span> rPath = (pathInfo == null ? "/" : ('/' + pathInfo));<a name="line.220"></a>
+<span class="sourceLineNo">221</span> else<a name="line.221"></a>
+<span class="sourceLineNo">222</span> rPath = (pathInfo == null ? ('/' + servletPath) : ('/' + servletPath + '/' + pathInfo));<a name="line.222"></a>
+<span class="sourceLineNo">223</span> } else {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> if (servletPath == null)<a name="line.224"></a>
+<span class="sourceLineNo">225</span> rPath = (pathInfo == null ? ('/' + contextRoot) : ('/' + contextRoot + '/' + pathInfo));<a name="line.225"></a>
+<span class="sourceLineNo">226</span> else<a name="line.226"></a>
+<span class="sourceLineNo">227</span> rPath = (pathInfo == null ? ('/' + contextRoot + '/' + servletPath) : ('/' + contextRoot + '/' + servletPath + '/' + pathInfo));<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span> return rPath;<a name="line.230"></a>
+<span class="sourceLineNo">231</span> }<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span> /**<a name="line.233"></a>
+<span class="sourceLineNo">234</span> * Returns the parent of the URL returned by {@link #getAbsolutePathInfo()}.<a name="line.234"></a>
+<span class="sourceLineNo">235</span> *<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * @return The parent of the URL returned by {@link #getAbsolutePathInfo()}.<a name="line.236"></a>
+<span class="sourceLineNo">237</span> */<a name="line.237"></a>
+<span class="sourceLineNo">238</span> public String getAbsolutePathInfoParent() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> return getParent(getAbsolutePathInfo());<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> /**<a name="line.242"></a>
+<span class="sourceLineNo">243</span> * Returns the parent of the URL returned by {@link #getRootRelativePathInfo()}.<a name="line.243"></a>
+<span class="sourceLineNo">244</span> *<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * @return The parent of the URL returned by {@link #getRootRelativePathInfo()}.<a name="line.245"></a>
+<span class="sourceLineNo">246</span> */<a name="line.246"></a>
+<span class="sourceLineNo">247</span> public String getRootRelativePathInfoParent() {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> return getParent(getRootRelativePathInfo());<a name="line.248"></a>
+<span class="sourceLineNo">249</span> }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span> private static String getParent(String uri) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> int i = uri.lastIndexOf('/');<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (i <= 1)<a name="line.253"></a>
+<span class="sourceLineNo">254</span> return "/";<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return uri.substring(0, i);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span>}<a name="line.257"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/57ce76c3/content/site/apidocs/src-html/org/apache/juneau/UriRelativity.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/UriRelativity.html b/content/site/apidocs/src-html/org/apache/juneau/UriRelativity.html
index 1716866..927b0ef 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/UriRelativity.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/UriRelativity.html
@@ -21,7 +21,7 @@
<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>/**<a name="line.15"></a>
-<span class="sourceLineNo">016</span> * Identifies how relative URIs should resolve against.<a name="line.16"></a>
+<span class="sourceLineNo">016</span> * Identifies what relative URIs are relative to.<a name="line.16"></a>
<span class="sourceLineNo">017</span> */<a name="line.17"></a>
<span class="sourceLineNo">018</span>public enum UriRelativity {<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
@@ -33,7 +33,7 @@
<span class="sourceLineNo">025</span> /**<a name="line.25"></a>
<span class="sourceLineNo">026</span> * Relative URIs should be considered relative to the request URI.<a name="line.26"></a>
<span class="sourceLineNo">027</span> */<a name="line.27"></a>
-<span class="sourceLineNo">028</span> PATH_INFO;<a name="line.28"></a>
+<span class="sourceLineNo">028</span> PATH_INFO<a name="line.28"></a>
<span class="sourceLineNo">029</span>}<a name="line.29"></a>