juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [39/51] [partial] incubator-juneau-website git commit: Update javadocs
Date Thu, 15 Sep 2016 21:28:34 GMT
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/Bean.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/Bean.html b/content/apidocs/org/apache/juneau/annotation/Bean.html
index a395f82..36bc262 100644
--- a/content/apidocs/org/apache/juneau/annotation/Bean.html
+++ b/content/apidocs/org/apache/juneau/annotation/Bean.html
@@ -173,11 +173,17 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/annotation/BeanSubType.html" title="annotation in org.apache.juneau.annotation">BeanSubType</a>[]</code></td>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/annotation/Bean.html#subTypes--">subTypes</a></span></code>
 <div class="block">Used in conjunction with <a href="../../../../org/apache/juneau/annotation/Bean.html#subTypeProperty--"><code>subTypeProperty()</code></a> to set up bean subtypes.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><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></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/annotation/Bean.html#typeName--">typeName</a></span></code>
+<div class="block">An identifying name for this class.</div>
+</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -193,13 +199,80 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <!--   -->
 </a>
 <h3>Element Detail</h3>
-<a name="properties--">
+<a name="typeName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>typeName</h4>
+<pre>public abstract&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.97">typeName</a></pre>
+<div class="block">An identifying name for this class.
+ <p>
+ The name is used to identify the class type during parsing when it cannot be inferred through reflection.
+ For example, if a bean property is of type <code>Object</code>, then the serializer will add the name to the
+   output so that the class can be determined during parsing.
+ It is also used to specify element names in XML.
+ <p>
+ The name is used in combination with the bean dictionary defined through <a href="../../../../org/apache/juneau/annotation/BeanProperty.html#beanDictionary--"><code>BeanProperty.beanDictionary()</code></a> or <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanDictionary"><code>BeanContext.BEAN_beanDictionary</code></a>.  Together, they make up
+   a simple name/value mapping of names to classes.
+ Names do not need to be universally unique.  However, they must be unique within a dictionary.
+
+ <dl>
+   <dt>Example:</dt>
+   <dd>
+      <p class='bcode'>
+   <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>(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()};
+   }
+
+   <ja>@Bean</ja>(typeName=<js>"bar"</js>)
+   <jk>public class</jk> Bar {}
+
+   <ja>@Bean</ja>(typeName=<js>"baz"</js>)
+   <jk>public class</jk> Baz {}
+      </p>
+      <p>
+         When serialized as XML, the bean is rendered as:
+      </p>
+      <p class='bcode'>
+   <xt>&lt;foo&gt;</xt>
+      <xt>&lt;x&gt;</xt>
+         <xt>&lt;bar/&gt;v
+         <xt>&lt;baz/&gt;</xt>
+      <xt>&lt;/x&gt;</xt>
+   <xt>&lt;/foo&gt;</xt>
+      </p>
+      <p>
+         When serialized as JSON, <js>'n'</js> attributes would be added when needed to infer the type during parsing:
+      </p>
+      <p class='bcode'>
+   {
+      <jsa>x</jsa>: [
+         {<jsa>_type</jsa>:<jss>'bar'</jss>},
+         {<jsa>_type</jsa>:<jss>'baz'</jss>}
+      ]
+   }   *
+   </dd>
+ </dl></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="properties--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>properties</h4>
-<pre>public abstract&nbsp;<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>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.64">properties</a></pre>
+<pre>public abstract&nbsp;<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>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.119">properties</a></pre>
 <div class="block">The set and order of names of properties associated with a bean class.
  <p>
    The order specified is the same order that the entries will be returned by the <a href="../../../../org/apache/juneau/BeanMap.html#entrySet--"><code>BeanMap.entrySet()</code></a> and related methods.
@@ -233,7 +306,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>sort</h4>
-<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.82">sort</a></pre>
+<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.137">sort</a></pre>
 <div class="block">Sort bean properties in alphabetical order.
  <p>
    When <jk>true</jk>, all bean properties will be serialized and access in alphabetical order.
@@ -263,7 +336,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>excludeProperties</h4>
-<pre>public abstract&nbsp;<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>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.102">excludeProperties</a></pre>
+<pre>public abstract&nbsp;<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>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.157">excludeProperties</a></pre>
 <div class="block">Specifies a list of properties that should be excluded from <a href="../../../../org/apache/juneau/BeanMap.html#entrySet--"><code>BeanMap.entrySet()</code></a>.
  <p>
    This annotation is an alternative to using the <a href="../../../../org/apache/juneau/transform/BeanFilter.html" title="class in org.apache.juneau.transform"><code>BeanFilter</code></a> class with an implemented <a href="../../../../org/apache/juneau/transform/BeanFilter.html#getExcludeProperties--"><code>BeanFilter.getExcludeProperties()</code></a> method.
@@ -295,7 +368,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>propertyNamer</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.126">propertyNamer</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.181">propertyNamer</a></pre>
 <div class="block">Associates a <a href="../../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau"><code>PropertyNamer</code></a> with this bean to tailor the names of the bean properties.
  <p>
    Property namers are used to transform bean property names from standard form to some other form.
@@ -331,7 +404,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>subTypeProperty</h4>
-<pre>public abstract&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.175">subTypeProperty</a></pre>
+<pre>public abstract&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.229">subTypeProperty</a></pre>
 <div class="block">Defines a virtual property on a superclass that identifies bean subtype classes.
  <p>
    In the following example, the abstract class has two subclasses that are differentiated
@@ -340,21 +413,20 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
    <jc>// Abstract superclass</jc>
    <ja>@Bean</ja>(
       subTypeProperty=<js>"subType"</js>,
-      subTypes={
-         <ja>@BeanSubType</ja>(type=A1.<jk>class</jk>, id=<js>"A1"</js>),
-         <ja>@BeanSubType</ja>(type=A2.<jk>class</jk>, id=<js>"A2"</js>)
-      }
+      subTypes={A1.class, A2.class}
    )
    <jk>public class</jk> A {
       <jk>public</jk> String <jf>f0</jf> = <js>"f0"</js>;
    }
 
    <jc>// Subclass 1</jc>
+   <ja>@Bean</ja>(typeName=<js>"A1"</js>)
    <jk>public class</jk> A1 <jk>extends</jk> A {
       <jk>public</jk> String <jf>f1</jf>;
    }
 
    <jc>// Subclass 2</jc>
+   <ja>@Bean</ja>(typeName=<js>"A2"</js>)
    <jk>public class</jk> A2 <jk>extends</jk> A {
       <jk>public</jk> String <jf>f2</jf>;
    }
@@ -379,7 +451,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
    This annotation is an alternative to using the <a href="../../../../org/apache/juneau/transform/BeanFilter.html" title="class in org.apache.juneau.transform"><code>BeanFilter</code></a> class with an implemented <a href="../../../../org/apache/juneau/transform/BeanFilter.html#getSubTypeProperty--"><code>BeanFilter.getSubTypeProperty()</code></a> method.</div>
 <dl>
 <dt>Default:</dt>
-<dd>""</dd>
+<dd>"_subtype"</dd>
 </dl>
 </li>
 </ul>
@@ -392,7 +464,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>subTypes</h4>
-<pre>public abstract&nbsp;<a href="../../../../org/apache/juneau/annotation/BeanSubType.html" title="annotation in org.apache.juneau.annotation">BeanSubType</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.180">subTypes</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.234">subTypes</a></pre>
 <div class="block">Used in conjunction with <a href="../../../../org/apache/juneau/annotation/Bean.html#subTypeProperty--"><code>subTypeProperty()</code></a> to set up bean subtypes.</div>
 <dl>
 <dt>Default:</dt>
@@ -409,7 +481,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>interfaceClass</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.210">interfaceClass</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.264">interfaceClass</a></pre>
 <div class="block">Identifies a class to be used as the interface class for this and all subclasses.
  <p>
    When specified, only the list of properties defined on the interface class will be used during serialization.
@@ -451,7 +523,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockListLast">
 <li class="blockList">
 <h4>stopClass</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.235">stopClass</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.289">stopClass</a></pre>
 <div class="block">Identifies a stop class for the annotated class.
  <p>
  Identical in purpose to the stop class specified by <a href="http://docs.oracle.com/javase/7/docs/api/java/beans/Introspector.html?is-external=true#getBeanInfo-java.lang.Class-java.lang.Class-" title="class or interface in java.beans"><code>Introspector.getBeanInfo(Class, Class)</code></a>.
@@ -546,6 +618,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/BeanConstructor.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/BeanConstructor.html b/content/apidocs/org/apache/juneau/annotation/BeanConstructor.html
index 4c85002..2e53937 100644
--- a/content/apidocs/org/apache/juneau/annotation/BeanConstructor.html
+++ b/content/apidocs/org/apache/juneau/annotation/BeanConstructor.html
@@ -272,6 +272,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/BeanIgnore.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/BeanIgnore.html b/content/apidocs/org/apache/juneau/annotation/BeanIgnore.html
index 62ee01c..d90725f 100644
--- a/content/apidocs/org/apache/juneau/annotation/BeanIgnore.html
+++ b/content/apidocs/org/apache/juneau/annotation/BeanIgnore.html
@@ -176,6 +176,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/BeanProperty.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/BeanProperty.html b/content/apidocs/org/apache/juneau/annotation/BeanProperty.html
index cac2e96..532b440 100644
--- a/content/apidocs/org/apache/juneau/annotation/BeanProperty.html
+++ b/content/apidocs/org/apache/juneau/annotation/BeanProperty.html
@@ -44,7 +44,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/annotation/BeanIgnore.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/BeanSubType.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/Consumes.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/annotation/BeanProperty.html" target="_top">Frames</a></li>
@@ -97,7 +97,7 @@
  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>={<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#METHOD" title="class or interface in java.lang.annotation">METHOD</a>})
  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</a>)
  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.52">BeanProperty</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.49">BeanProperty</a></pre>
 <div class="block">Used tailor how bean properties get interpreted by the framework.
  <p>
    Can be used to do the following:
@@ -107,7 +107,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
    <li>Identify a specific subclass for a property with a general class type.
    <li>Identify class types of elements in properties of type <code>Collection</code> or <code>Map</code>.
    <li>Hide properties during serialization.
-   <li>Associate transforms with bean property values, such as a transform to convert a <code>Calendar</code> field to a string.
+   <li>Associate transforms with bean property values, such as a POJO swap to convert a <code>Calendar</code> field to a string.
    <li>Override the list of properties during serialization on child elements of a property of type <code>Collection</code> or <code>Map</code>.
    <li>Identify a property as the URL for a bean.
    <li>Identify a property as the ID for a bean.
@@ -137,9 +137,9 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <th class="colLast" scope="col">Optional Element and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/annotation/BeanProperty.html#beanUri--">beanUri</a></span></code>
-<div class="block">Marks a bean property as a resource URI identifier for the bean.</div>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/annotation/BeanProperty.html#beanDictionary--">beanDictionary</a></span></code>
+<div class="block">The list of classes that make up the bean dictionary for this bean property.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -196,7 +196,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>name</h4>
-<pre>public abstract&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.64">name</a></pre>
+<pre>public abstract&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.61">name</a></pre>
 <div class="block">Identifies the name of the property.
  <p>
    Normally, this is automatically inferred from the field name or getter method name
@@ -220,7 +220,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>type</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.90">type</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.87">type</a></pre>
 <div class="block">Identifies a specialized class type for the property.
  <p>
    Normally this can be inferred through reflection of the field type or getter return type.
@@ -258,7 +258,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>params</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.111">params</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.108">params</a></pre>
 <div class="block">For bean properties of maps and collections, this annotation can be used to identify
  the class types of the contents of the bean property object when the generic parameter
  types are interfaces or abstract classes.
@@ -291,7 +291,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>swap</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.137">swap</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.134">swap</a></pre>
 <div class="block">Associates a <a href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> or <a href="../../../../org/apache/juneau/transform/SurrogateSwap.html" title="class in org.apache.juneau.transform"><code>SurrogateSwap</code></a> with this bean property that will swap the value object
    with another object during serialization and parsing.
  <p>
@@ -308,7 +308,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
    <jk>public class</jk> MyClass {
 
       <jc>// During serialization, convert to ISO8601 date-time string.</jc>
-      <ja>@BeanProperty</ja>(transform=CalendarSwap.ISO8601DT.<jk>class</jk>)
+      <ja>@BeanProperty</ja>(pojoSwap=CalendarSwap.ISO8601DT.<jk>class</jk>)
       <jk>public</jk> Calendar getTime();
    }
       </p>
@@ -329,7 +329,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>properties</h4>
-<pre>public abstract&nbsp;<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>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.172">properties</a></pre>
+<pre>public abstract&nbsp;<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>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.169">properties</a></pre>
 <div class="block">Used to limit which child properties are rendered by the serializers.
  <p>
  Can be used on any of the following bean property types:
@@ -370,25 +370,27 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 </li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="beanUri--">
+<li class="blockList"><a name="beanDictionary--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>beanUri</h4>
-<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.185">beanUri</a></pre>
-<div class="block">Marks a bean property as a resource URI identifier for the bean.
+<h4>beanDictionary</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.184">beanDictionary</a></pre>
+<div class="block">The list of classes that make up the bean dictionary for this bean property.
  <p>
- Has the following effects on the following serializers:
- <ul class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in org.apache.juneau.xml"><code>XmlSerializer</code></a> - Will be rendered as an XML attribute on the bean element, unless
-      marked with a <a href="../../../../org/apache/juneau/xml/annotation/Xml.html#format--"><code>Xml.format()</code></a> value of <a href="../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ELEMENT"><code>XmlFormat.ELEMENT</code></a>.
-   <li><a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena"><code>RdfSerializer</code></a> - Will be rendered as the value of the <js>"rdf:about"</js> attribute
-      for the bean.
+ The dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred through reflection.
+ The names are defined through the <a href="../../../../org/apache/juneau/annotation/Bean.html#typeName--"><code>Bean.typeName()</code></a> annotation defined on the bean class.
+ <p>
+ This list can consist of the following class types:
+ <ul>
+   <li>Any bean class that specifies a value for <a href="../../../../org/apache/juneau/annotation/Bean.html#typeName--"><code>@Bean.name()</code></a>;
+   <li>Any subclass of <a href="../../../../org/apache/juneau/BeanDictionaryBuilder.html" title="class in org.apache.juneau"><code>BeanDictionaryBuilder</code></a> that defines an entire set of mappings.
+      Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.
  </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>false</dd>
+<dd>{}</dd>
 </dl>
 </li>
 </ul>
@@ -421,7 +423,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/annotation/BeanIgnore.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/BeanSubType.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/Consumes.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/annotation/BeanProperty.html" target="_top">Frames</a></li>
@@ -459,6 +461,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/BeanSubType.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/BeanSubType.html b/content/apidocs/org/apache/juneau/annotation/BeanSubType.html
deleted file mode 100644
index 8fa474c..0000000
--- a/content/apidocs/org/apache/juneau/annotation/BeanSubType.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BeanSubType (Apache Juneau (incubating) 6.0.0-incubating-SNAPSHOT)</title>
-<link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="BeanSubType (Apache Juneau (incubating) 6.0.0-incubating-SNAPSHOT)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/BeanSubType.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/Consumes.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/annotation/BeanSubType.html" target="_top">Frames</a></li>
-<li><a href="BeanSubType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
-<li>Optional</li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau.annotation</div>
-<h2 title="Annotation Type BeanSubType" class="title">Annotation Type BeanSubType</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Documented.html?is-external=true" title="class or interface in java.lang.annotation">@Documented</a>
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>={})
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</a>)
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../src-html/org/apache/juneau/annotation/BeanSubType.html#line.30">BeanSubType</a></pre>
-<div class="block">Maps a bean subclass with a string identifier.
- <p>
-   Used in conjunction with <a href="../../../../org/apache/juneau/annotation/Bean.html#subTypes--"><code>Bean.subTypes()</code></a> for defining mappings of bean subclasses with string identifiers.</div>
-<dl>
-<dt><span class="simpleTagLabel">Author:</span></dt>
-<dd>James Bognar (james.bognar@salesforce.com)</dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.required.element.summary">
-<!--   -->
-</a>
-<h3>Required Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Required Element Summary table, listing required elements, and an explanation">
-<caption><span>Required Elements</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Required Element and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><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></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/annotation/BeanSubType.html#id--">id</a></span></code>
-<div class="block">A string identifier for this subtype.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/annotation/BeanSubType.html#type--">type</a></span></code>
-<div class="block">The bean subclass.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.element.detail">
-<!--   -->
-</a>
-<h3>Element Detail</h3>
-<a name="type--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>type</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanSubType.html#line.37">type</a></pre>
-<div class="block">The bean subclass.
- <p>
- Must be a subclass or subinterface of the parent bean.</div>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="id--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>id</h4>
-<pre>public abstract&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/BeanSubType.html#line.45">id</a></pre>
-<div class="block">A string identifier for this subtype.
- <p>
- This identifier is used in conjunction with the <a href="../../../../org/apache/juneau/annotation/Bean.html#subTypeProperty--"><code>Bean.subTypeProperty()</code></a> during serialization
-   to create a <code>{subType:<js>'id'</js>}</code> property on the serialized object.</div>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/BeanSubType.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/Consumes.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/annotation/BeanSubType.html" target="_top">Frames</a></li>
-<li><a href="BeanSubType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
-<li>Optional</li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/Consumes.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/Consumes.html b/content/apidocs/org/apache/juneau/annotation/Consumes.html
index c40d399..f691fdd 100644
--- a/content/apidocs/org/apache/juneau/annotation/Consumes.html
+++ b/content/apidocs/org/apache/juneau/annotation/Consumes.html
@@ -43,7 +43,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/annotation/BeanSubType.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/annotation/NameProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -222,7 +222,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Con
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/annotation/BeanSubType.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/annotation/NameProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -261,6 +261,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Con
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/NameProperty.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/NameProperty.html b/content/apidocs/org/apache/juneau/annotation/NameProperty.html
index 8a47bfa..e1448d4 100644
--- a/content/apidocs/org/apache/juneau/annotation/NameProperty.html
+++ b/content/apidocs/org/apache/juneau/annotation/NameProperty.html
@@ -172,6 +172,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Nam
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/ParentProperty.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/ParentProperty.html b/content/apidocs/org/apache/juneau/annotation/ParentProperty.html
index cef5769..42d1269 100644
--- a/content/apidocs/org/apache/juneau/annotation/ParentProperty.html
+++ b/content/apidocs/org/apache/juneau/annotation/ParentProperty.html
@@ -172,6 +172,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Par
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/Pojo.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/Pojo.html b/content/apidocs/org/apache/juneau/annotation/Pojo.html
index 77f96f3..6cf4bff 100644
--- a/content/apidocs/org/apache/juneau/annotation/Pojo.html
+++ b/content/apidocs/org/apache/juneau/annotation/Pojo.html
@@ -168,7 +168,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Poj
       <jk>public</jk> String <jf>f1</jf>;
    }
 
-   <jc>// Our transform to force the bean to be serialized as a String</jc>
+   <jc>// Our POJO swap to force the bean to be serialized as a String</jc>
    <jk>public class</jk> BSwap <jk>extends</jk> PojoSwap&lt;B,String&gt; {
       <jk>public</jk> String swap(B o) <jk>throws</jk> SerializeException {
          <jk>return</jk> o.f1;
@@ -271,6 +271,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Poj
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/Produces.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/Produces.html b/content/apidocs/org/apache/juneau/annotation/Produces.html
index 6365191..8bfa03a 100644
--- a/content/apidocs/org/apache/juneau/annotation/Produces.html
+++ b/content/apidocs/org/apache/juneau/annotation/Produces.html
@@ -295,6 +295,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Pro
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/Remoteable.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/Remoteable.html b/content/apidocs/org/apache/juneau/annotation/Remoteable.html
index 5189151..a0f4461 100644
--- a/content/apidocs/org/apache/juneau/annotation/Remoteable.html
+++ b/content/apidocs/org/apache/juneau/annotation/Remoteable.html
@@ -164,6 +164,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Rem
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/ThreadSafe.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/ThreadSafe.html b/content/apidocs/org/apache/juneau/annotation/ThreadSafe.html
index b6b4bab..cb71841 100644
--- a/content/apidocs/org/apache/juneau/annotation/ThreadSafe.html
+++ b/content/apidocs/org/apache/juneau/annotation/ThreadSafe.html
@@ -169,6 +169,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Thr
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d81e61b1/content/apidocs/org/apache/juneau/annotation/URI.html
----------------------------------------------------------------------
diff --git a/content/apidocs/org/apache/juneau/annotation/URI.html b/content/apidocs/org/apache/juneau/annotation/URI.html
index 65de34b..8285c96 100644
--- a/content/apidocs/org/apache/juneau/annotation/URI.html
+++ b/content/apidocs/org/apache/juneau/annotation/URI.html
@@ -204,6 +204,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/URI
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
 </body>
 </html>


Mime
View raw message