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/06/13 14:35:28 UTC
[43/51] [partial] incubator-juneau-website git commit: Update
Javadocs.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84380388/content/site/apidocs/org/apache/juneau/dto/atom/Generator.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Generator.html b/content/site/apidocs/org/apache/juneau/dto/atom/Generator.html
index 8ad2d12..6c98da5 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Generator.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Generator.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre><a href="../../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation">@Bean</a>(<a href="../../../../../org/apache/juneau/annotation/Bean.html#typeName--">typeName</a>="generator")
-public class <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.47">Generator</a>
+public class <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.49">Generator</a>
extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></pre>
<div class="block">Represents an <code>atomGenerator</code> construct in the RFC4287 specification.
<p>
@@ -180,7 +180,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
</tr>
<tr id="i0" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Generator.html#base-java.net.URI-">base</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> base)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Generator.html#base-java.lang.Object-">base</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> base)</code>
<div class="block">Sets the URI base of this object.</div>
</td>
</tr>
@@ -216,18 +216,12 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
</tr>
<tr id="i6" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Generator.html#uri-java.lang.String-">uri</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Generator.html#uri-java.lang.Object-">uri</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)</code>
<div class="block">Sets the URI of this generator statement.</div>
</td>
</tr>
<tr id="i7" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Generator.html#uri-java.net.URI-">uri</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</code>
-<div class="block">Sets the URI of this generator statement.</div>
-</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Generator.html#version-java.lang.String-">version</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> version)</code>
<div class="block">Sets the version of this generator statement.</div>
</td>
@@ -238,7 +232,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.dto.atom.<a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></h3>
-<code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.String-">base</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getBase--">getBase</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getLang--">getLang</a></code></li>
+<code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#getBase--">getBase</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getLang--">getLang</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -267,7 +261,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>Generator</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.59">Generator</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.61">Generator</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)</pre>
<div class="block">Normal constructor.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -281,7 +275,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<ul class="blockListLast">
<li class="blockList">
<h4>Generator</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.64">Generator</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.66">Generator</a>()</pre>
<div class="block">Bean constructor.</div>
</li>
</ul>
@@ -300,7 +294,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<li class="blockList">
<h4>getUri</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ATTR">ATTR</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.77">getUri</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.79">getUri</a>()</pre>
<div class="block">Returns the URI of this generator statement.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -308,32 +302,20 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?
</dl>
</li>
</ul>
-<a name="uri-java.net.URI-">
+<a name="uri-java.lang.Object-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
-public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.88">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</pre>
-<div class="block">Sets the URI of this generator statement.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>uri</code> - The URI of this generator statement.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>This object (for method chaining).</dd>
-</dl>
-</li>
-</ul>
-<a name="uri-java.lang.String-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>uri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
-public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.100">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</pre>
-<div class="block">Sets the URI of this generator statement.</div>
+public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.95">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)</pre>
+<div class="block">Sets the URI of this generator statement.
+ <p>
+ The value can be of any of the following types: <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.
+ Strings must be valid URIs.
+ <p>
+ URIs defined by <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a> can be used for values.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>uri</code> - The URI of this generator statement.</dd>
@@ -349,7 +331,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" t
<li class="blockList">
<h4>getVersion</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ATTR">ATTR</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.111">getVersion</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.106">getVersion</a>()</pre>
<div class="block">Returns the version of this generator statement.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -364,7 +346,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<li class="blockList">
<h4>version</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="version")
-public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.122">version</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> version)</pre>
+public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.117">version</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> version)</pre>
<div class="block">Sets the version of this generator statement.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -381,7 +363,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" t
<li class="blockList">
<h4>getText</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#TEXT">TEXT</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.133">getText</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.128">getText</a>()</pre>
<div class="block">Returns the content of this generator statement.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -396,7 +378,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<li class="blockList">
<h4>text</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="text")
-public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.144">text</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)</pre>
+public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.139">text</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)</pre>
<div class="block">Sets the content of this generator statement.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -406,18 +388,23 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" t
</dl>
</li>
</ul>
-<a name="base-java.net.URI-">
+<a name="base-java.lang.Object-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>base</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.155">base</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> base)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.net.URI-">Common</a></code></span></div>
-<div class="block">Sets the URI base of this object.</div>
+<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.150">base</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> base)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.Object-">Common</a></code></span></div>
+<div class="block">Sets the URI base of this object.
+ <p>
+ The value can be of any of the following types: <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.
+ Strings must be valid URIs.
+ <p>
+ URIs defined by <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a> can be used for values.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.net.URI-">base</a></code> in class <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></code></dd>
+<dd><code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.Object-">base</a></code> in class <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>base</code> - The URI base of this object.</dd>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -431,7 +418,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" t
<ul class="blockListLast">
<li class="blockList">
<h4>lang</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.161">lang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> lang)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.156">lang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> lang)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#lang-java.lang.String-">Common</a></code></span></div>
<div class="block">Sets the language of this object.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84380388/content/site/apidocs/org/apache/juneau/dto/atom/Icon.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Icon.html b/content/site/apidocs/org/apache/juneau/dto/atom/Icon.html
index 53f8285..6d6c4e7 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Icon.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Icon.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre><a href="../../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation">@Bean</a>(<a href="../../../../../org/apache/juneau/annotation/Bean.html#typeName--">typeName</a>="icon")
-public class <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.45">Icon</a>
+public class <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.47">Icon</a>
extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></pre>
<div class="block">Represents an <code>atomIcon</code> construct in the RFC4287 specification.
<p>
@@ -157,12 +157,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
</td>
</tr>
<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Icon.html#Icon-java.lang.String-">Icon</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</code>
-<div class="block">Normal constructor.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Icon.html#Icon-java.net.URI-">Icon</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Icon.html#Icon-java.lang.Object-">Icon</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)</code>
<div class="block">Normal constructor.</div>
</td>
</tr>
@@ -183,7 +178,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
</tr>
<tr id="i0" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Icon.html#base-java.net.URI-">base</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> base)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Icon.html#base-java.lang.Object-">base</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> base)</code>
<div class="block">Sets the URI base of this object.</div>
</td>
</tr>
@@ -201,13 +196,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
</tr>
<tr id="i3" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Icon.html#uri-java.lang.String-">uri</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</code>
-<div class="block">Sets the URI of this icon.</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Icon.html#uri-java.net.URI-">uri</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Icon.html#uri-java.lang.Object-">uri</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)</code>
<div class="block">Sets the URI of this icon.</div>
</td>
</tr>
@@ -217,7 +206,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.dto.atom.<a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></h3>
-<code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.String-">base</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getBase--">getBase</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getLang--">getLang</a></code></li>
+<code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#getBase--">getBase</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getLang--">getLang</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -240,28 +229,19 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<!-- -->
</a>
<h3>Constructor Detail</h3>
-<a name="Icon-java.net.URI-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>Icon</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.55">Icon</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</pre>
-<div class="block">Normal constructor.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>uri</code> - The URI of the icon.</dd>
-</dl>
-</li>
-</ul>
-<a name="Icon-java.lang.String-">
+<a name="Icon-java.lang.Object-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>Icon</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.64">Icon</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</pre>
-<div class="block">Normal constructor.</div>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.62">Icon</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)</pre>
+<div class="block">Normal constructor.
+ <p>
+ The value can be of any of the following types: <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.
+ Strings must be valid URIs.
+ <p>
+ URIs defined by <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a> can be used for values.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>uri</code> - The URI of the icon.</dd>
@@ -274,7 +254,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<ul class="blockListLast">
<li class="blockList">
<h4>Icon</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.69">Icon</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.67">Icon</a>()</pre>
<div class="block">Bean constructor.</div>
</li>
</ul>
@@ -293,7 +273,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<li class="blockList">
<h4>getUri</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ELEMENTS">ELEMENTS</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.82">getUri</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.80">getUri</a>()</pre>
<div class="block">Returns the URI of this icon.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -301,32 +281,20 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?
</dl>
</li>
</ul>
-<a name="uri-java.net.URI-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>uri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
-public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.93">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</pre>
-<div class="block">Sets the URI of this icon.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>uri</code> - The URI of this icon.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>This object (for method chaining).</dd>
-</dl>
-</li>
-</ul>
-<a name="uri-java.lang.String-">
+<a name="uri-java.lang.Object-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
-public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.105">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</pre>
-<div class="block">Sets the URI of this icon.</div>
+public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.96">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)</pre>
+<div class="block">Sets the URI of this icon.
+ <p>
+ The value can be of any of the following types: <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.
+ Strings must be valid URIs.
+ <p>
+ URIs defined by <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a> can be used for values.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>uri</code> - The URI of this icon.</dd>
@@ -335,18 +303,23 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title=
</dl>
</li>
</ul>
-<a name="base-java.net.URI-">
+<a name="base-java.lang.Object-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>base</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.116">base</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> base)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.net.URI-">Common</a></code></span></div>
-<div class="block">Sets the URI base of this object.</div>
+<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.107">base</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> base)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.Object-">Common</a></code></span></div>
+<div class="block">Sets the URI base of this object.
+ <p>
+ The value can be of any of the following types: <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.
+ Strings must be valid URIs.
+ <p>
+ URIs defined by <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a> can be used for values.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.net.URI-">base</a></code> in class <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></code></dd>
+<dd><code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.Object-">base</a></code> in class <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>base</code> - The URI base of this object.</dd>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -360,7 +333,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title=
<ul class="blockListLast">
<li class="blockList">
<h4>lang</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.122">lang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> lang)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.113">lang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> lang)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#lang-java.lang.String-">Common</a></code></span></div>
<div class="block">Sets the language of this object.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84380388/content/site/apidocs/org/apache/juneau/dto/atom/Id.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Id.html b/content/site/apidocs/org/apache/juneau/dto/atom/Id.html
index 79c812c..2fc4910 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Id.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Id.html
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre><a href="../../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation">@Bean</a>(<a href="../../../../../org/apache/juneau/annotation/Bean.html#typeName--">typeName</a>="id")
-public class <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.44">Id</a>
+public class <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.42">Id</a>
extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></pre>
<div class="block">Represents an <code>atomId</code> construct in the RFC4287 specification.
<p>
@@ -178,7 +178,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
</tr>
<tr id="i0" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Id.html" title="class in org.apache.juneau.dto.atom">Id</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Id.html#base-java.net.URI-">base</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> base)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Id.html#base-java.lang.Object-">base</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> base)</code>
<div class="block">Sets the URI base of this object.</div>
</td>
</tr>
@@ -206,7 +206,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.dto.atom.<a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></h3>
-<code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.String-">base</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getBase--">getBase</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getLang--">getLang</a></code></li>
+<code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#getBase--">getBase</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getLang--">getLang</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -235,7 +235,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>Id</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.53">Id</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.51">Id</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)</pre>
<div class="block">Normal constructor.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -249,7 +249,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<ul class="blockListLast">
<li class="blockList">
<h4>Id</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.58">Id</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.56">Id</a>()</pre>
<div class="block">Bean constructor.</div>
</li>
</ul>
@@ -268,7 +268,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<li class="blockList">
<h4>getText</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#TEXT">TEXT</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.71">getText</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.69">getText</a>()</pre>
<div class="block">Returns the content of this identifier.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -283,7 +283,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<li class="blockList">
<h4>text</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="text")
-public <a href="../../../../../org/apache/juneau/dto/atom/Id.html" title="class in org.apache.juneau.dto.atom">Id</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.82">text</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)</pre>
+public <a href="../../../../../org/apache/juneau/dto/atom/Id.html" title="class in org.apache.juneau.dto.atom">Id</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.80">text</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)</pre>
<div class="block">Sets the content of this identifier.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -293,18 +293,23 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Id.html" title="c
</dl>
</li>
</ul>
-<a name="base-java.net.URI-">
+<a name="base-java.lang.Object-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>base</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Id.html" title="class in org.apache.juneau.dto.atom">Id</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.93">base</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> base)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.net.URI-">Common</a></code></span></div>
-<div class="block">Sets the URI base of this object.</div>
+<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Id.html" title="class in org.apache.juneau.dto.atom">Id</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.91">base</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> base)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.Object-">Common</a></code></span></div>
+<div class="block">Sets the URI base of this object.
+ <p>
+ The value can be of any of the following types: <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.
+ Strings must be valid URIs.
+ <p>
+ URIs defined by <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a> can be used for values.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.net.URI-">base</a></code> in class <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></code></dd>
+<dd><code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.Object-">base</a></code> in class <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>base</code> - The URI base of this object.</dd>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -318,7 +323,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Id.html" title="c
<ul class="blockListLast">
<li class="blockList">
<h4>lang</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Id.html" title="class in org.apache.juneau.dto.atom">Id</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.99">lang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> lang)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Id.html" title="class in org.apache.juneau.dto.atom">Id</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.97">lang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> lang)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#lang-java.lang.String-">Common</a></code></span></div>
<div class="block">Sets the language of this object.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84380388/content/site/apidocs/org/apache/juneau/dto/atom/Link.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Link.html b/content/site/apidocs/org/apache/juneau/dto/atom/Link.html
index 95de651..bf363c8 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Link.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Link.html
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre><a href="../../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation">@Bean</a>(<a href="../../../../../org/apache/juneau/annotation/Bean.html#typeName--">typeName</a>="link")
-public class <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.51">Link</a>
+public class <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.49">Link</a>
extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></pre>
<div class="block">Represents an <code>atomLink</code> construct in the RFC4287 specification.
<p>
@@ -187,7 +187,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
</tr>
<tr id="i0" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Link.html#base-java.net.URI-">base</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> base)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Link.html#base-java.lang.Object-">base</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> base)</code>
<div class="block">Sets the URI base of this object.</div>
</td>
</tr>
@@ -275,7 +275,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.dto.atom.<a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></h3>
-<code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.String-">base</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getBase--">getBase</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getLang--">getLang</a></code></li>
+<code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#getBase--">getBase</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getLang--">getLang</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -304,7 +304,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>Link</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.68">Link</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> rel,
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.66">Link</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> rel,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> href)</pre>
<div class="block">Normal constructor.</div>
@@ -322,7 +322,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<ul class="blockListLast">
<li class="blockList">
<h4>Link</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.73">Link</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.71">Link</a>()</pre>
<div class="block">Bean constructor.</div>
</li>
</ul>
@@ -341,7 +341,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<li class="blockList">
<h4>getHref</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ATTR">ATTR</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.86">getHref</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.84">getHref</a>()</pre>
<div class="block">Returns the href of the target of this link.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -356,7 +356,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<li class="blockList">
<h4>href</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="href")
-public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.97">href</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> href)</pre>
+public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.95">href</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> href)</pre>
<div class="block">Sets the href of the target of this link.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -373,7 +373,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title=
<li class="blockList">
<h4>getRel</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ATTR">ATTR</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.108">getRel</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.106">getRel</a>()</pre>
<div class="block">Returns the rel of this link.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -388,7 +388,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<li class="blockList">
<h4>rel</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="rel")
-public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.119">rel</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> rel)</pre>
+public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.117">rel</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> rel)</pre>
<div class="block">Sets the rel of this link.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -405,7 +405,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title=
<li class="blockList">
<h4>getType</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ATTR">ATTR</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.130">getType</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.128">getType</a>()</pre>
<div class="block">Returns the content type of the target of this link.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -420,7 +420,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<li class="blockList">
<h4>type</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="type")
-public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.149">type</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> type)</pre>
+public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.147">type</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> type)</pre>
<div class="block">Sets the content type of the target of this link.
<p>
Must be one of the following:
@@ -445,7 +445,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title=
<li class="blockList">
<h4>getHreflang</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ATTR">ATTR</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.160">getHreflang</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.158">getHreflang</a>()</pre>
<div class="block">Returns the language of the target of this link.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -460,7 +460,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<li class="blockList">
<h4>hreflang</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="hreflang")
-public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.171">hreflang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hreflang)</pre>
+public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.169">hreflang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hreflang)</pre>
<div class="block">Sets the language of the target of this link.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -477,7 +477,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title=
<li class="blockList">
<h4>getTitle</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ATTR">ATTR</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.182">getTitle</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.180">getTitle</a>()</pre>
<div class="block">Returns the title of the target of this link.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -492,7 +492,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<li class="blockList">
<h4>title</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="title")
-public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.193">title</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> title)</pre>
+public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.191">title</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> title)</pre>
<div class="block">Sets the title of the target of this link.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -509,7 +509,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title=
<li class="blockList">
<h4>getLength</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ATTR">ATTR</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.204">getLength</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.202">getLength</a>()</pre>
<div class="block">Returns the length of the contents of the target of this link.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -524,7 +524,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.
<li class="blockList">
<h4>length</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="length")
-public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.215">length</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a> length)</pre>
+public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.213">length</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a> length)</pre>
<div class="block">Sets the length of the contents of the target of this link.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -534,18 +534,23 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title=
</dl>
</li>
</ul>
-<a name="base-java.net.URI-">
+<a name="base-java.lang.Object-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>base</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.226">base</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> base)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.net.URI-">Common</a></code></span></div>
-<div class="block">Sets the URI base of this object.</div>
+<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.224">base</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> base)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.Object-">Common</a></code></span></div>
+<div class="block">Sets the URI base of this object.
+ <p>
+ The value can be of any of the following types: <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.
+ Strings must be valid URIs.
+ <p>
+ URIs defined by <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a> can be used for values.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.net.URI-">base</a></code> in class <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></code></dd>
+<dd><code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.Object-">base</a></code> in class <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>base</code> - The URI base of this object.</dd>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -559,7 +564,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title=
<ul class="blockListLast">
<li class="blockList">
<h4>lang</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.232">lang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> lang)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.230">lang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> lang)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#lang-java.lang.String-">Common</a></code></span></div>
<div class="block">Sets the language of this object.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84380388/content/site/apidocs/org/apache/juneau/dto/atom/Logo.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Logo.html b/content/site/apidocs/org/apache/juneau/dto/atom/Logo.html
index 6eb6b7a..3733d52 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Logo.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Logo.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre><a href="../../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation">@Bean</a>(<a href="../../../../../org/apache/juneau/annotation/Bean.html#typeName--">typeName</a>="logo")
-public class <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.45">Logo</a>
+public class <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.47">Logo</a>
extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></pre>
<div class="block">Represents an <code>atomLogo</code> construct in the RFC4287 specification.
<p>
@@ -157,12 +157,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
</td>
</tr>
<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Logo.html#Logo-java.lang.String-">Logo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</code>
-<div class="block">Normal constructor.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Logo.html#Logo-java.net.URI-">Logo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Logo.html#Logo-java.lang.Object-">Logo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)</code>
<div class="block">Normal constructor.</div>
</td>
</tr>
@@ -183,7 +178,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
</tr>
<tr id="i0" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Logo.html#base-java.net.URI-">base</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> base)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Logo.html#base-java.lang.Object-">base</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> base)</code>
<div class="block">Sets the URI base of this object.</div>
</td>
</tr>
@@ -201,13 +196,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
</tr>
<tr id="i3" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Logo.html#uri-java.lang.String-">uri</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</code>
-<div class="block">Sets the URI of the logo.</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Logo.html#uri-java.net.URI-">uri</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/atom/Logo.html#uri-java.lang.Object-">uri</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)</code>
<div class="block">Sets the URI of the logo.</div>
</td>
</tr>
@@ -217,7 +206,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.dto.atom.<a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></h3>
-<code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.String-">base</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getBase--">getBase</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getLang--">getLang</a></code></li>
+<code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#getBase--">getBase</a>, <a href="../../../../../org/apache/juneau/dto/atom/Common.html#getLang--">getLang</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -240,28 +229,19 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<!-- -->
</a>
<h3>Constructor Detail</h3>
-<a name="Logo-java.net.URI-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>Logo</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.55">Logo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</pre>
-<div class="block">Normal constructor.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>uri</code> - The URI of the logo.</dd>
-</dl>
-</li>
-</ul>
-<a name="Logo-java.lang.String-">
+<a name="Logo-java.lang.Object-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>Logo</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.64">Logo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</pre>
-<div class="block">Normal constructor.</div>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.62">Logo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)</pre>
+<div class="block">Normal constructor.
+ <p>
+ The value can be of any of the following types: <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.
+ Strings must be valid URIs.
+ <p>
+ URIs defined by <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a> can be used for values.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>uri</code> - The URI of the logo.</dd>
@@ -274,7 +254,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<ul class="blockListLast">
<li class="blockList">
<h4>Logo</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.69">Logo</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.67">Logo</a>()</pre>
<div class="block">Bean constructor.</div>
</li>
</ul>
@@ -293,7 +273,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<li class="blockList">
<h4>getUri</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ELEMENTS">ELEMENTS</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.82">getUri</a>()</pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.80">getUri</a>()</pre>
<div class="block">Returns the URI of the logo.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -301,32 +281,20 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?
</dl>
</li>
</ul>
-<a name="uri-java.net.URI-">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>uri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
-public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.93">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</pre>
-<div class="block">Sets the URI of the logo.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>uri</code> - The URI of the logo.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>This object (for method chaining).</dd>
-</dl>
-</li>
-</ul>
-<a name="uri-java.lang.String-">
+<a name="uri-java.lang.Object-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
-public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.105">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</pre>
-<div class="block">Sets the URI of the logo.</div>
+public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.96">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)</pre>
+<div class="block">Sets the URI of the logo.
+ <p>
+ The value can be of any of the following types: <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.
+ Strings must be valid URIs.
+ <p>
+ URIs defined by <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a> can be used for values.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>uri</code> - The URI of the logo.</dd>
@@ -335,18 +303,23 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title=
</dl>
</li>
</ul>
-<a name="base-java.net.URI-">
+<a name="base-java.lang.Object-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>base</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.116">base</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> base)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.net.URI-">Common</a></code></span></div>
-<div class="block">Sets the URI base of this object.</div>
+<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.107">base</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> base)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.Object-">Common</a></code></span></div>
+<div class="block">Sets the URI base of this object.
+ <p>
+ The value can be of any of the following types: <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.
+ Strings must be valid URIs.
+ <p>
+ URIs defined by <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a> can be used for values.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.net.URI-">base</a></code> in class <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></code></dd>
+<dd><code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#base-java.lang.Object-">base</a></code> in class <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>base</code> - The URI base of this object.</dd>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -360,7 +333,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title=
<ul class="blockListLast">
<li class="blockList">
<h4>lang</h4>
-<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.122">lang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> lang)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.113">lang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> lang)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/dto/atom/Common.html#lang-java.lang.String-">Common</a></code></span></div>
<div class="block">Sets the language of this object.</div>
<dl>