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 2018/01/14 23:07:24 UTC

[41/51] [partial] juneau-website git commit: Update javadocs.

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/c319662c/content/site/apidocs/org/apache/juneau/annotation/Bean.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/Bean.html b/content/site/apidocs/org/apache/juneau/annotation/Bean.html
index 007fd03..12ea9a2 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/Bean.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/Bean.html
@@ -96,16 +96,17 @@
  <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#TYPE" title="class or interface in java.lang.annotation">TYPE</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/Bean.html#line.39">Bean</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.40">Bean</a></pre>
 <div class="block">Used to tailor how beans get interpreted by the framework.
-
+ 
  <p>
  This annotation can be applied to classes and interfaces.
  
- <h6 class='topic'>Documentation</h6>
-   <ul>
-      <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanAnnotation">Overview &gt; @Bean Annotation</a>
-   </ul></div>
+ 
+ <h5 class='topic'>Documentation</h5>
+ <ul>
+   <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanAnnotation">Overview &gt; @Bean Annotation</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -199,60 +200,50 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <!--   -->
 </a>
 <h3>Element Detail</h3>
-<a name="typeName--">
+<a name="beanDictionary--">
 <!--   -->
 </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.57">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.
- <br>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.
+<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/Bean.html#line.53">beanDictionary</a></pre>
+<div class="block">Bean dictionary.
  
  <p>
- It is also used to specify element names in XML.
-
+ The list of classes that make up the bean dictionary for all properties in this class and all subclasses.
+ 
  <h5 class='section'>See Also:</h5>
  <ul>
    <li class='jf'><a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanDictionary"><code>BeanContext.BEAN_beanDictionary</code></a>
  </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>""</dd>
+<dd>{}</dd>
 </dl>
 </li>
 </ul>
 </li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="typePropertyName--">
+<li class="blockList"><a name="excludeProperties--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>typePropertyName</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.80">typePropertyName</a></pre>
-<div class="block">The property name to use for representing the type name.
-
- <p>
- This can be used to override the name used for the <js>"_type"</js> property used by the <a href="../../../../org/apache/juneau/annotation/Bean.html#typeName--"><code>typeName()</code></a> setting.
-
- <ul class='doctree'>
-   <li class='warn'>
-      Be careful what value you specify for this.  
-      <br>It should not interfere with bean property names or common HTML attribute names.
- </ul>
+<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.70">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>
- The default value if not specified is <js>"_type"</js> .
+ <h5 class='section'>Example:</h5>
+ <p class='bcode'>
+   <jc>// Exclude the 'city' and 'state' properties from the Address class.</jc>
+   <ja>@Bean</ja>(excludeProperties=<js>"city,state"</js>})
+   <jk>public class</jk> Address {...}
+ </p>
  
  <h5 class='section'>See Also:</h5>
  <ul>
-   <li class='jf'><a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanTypePropertyName"><code>BeanContext.BEAN_beanTypePropertyName</code></a>
+   <li class='jf'><a href="../../../../org/apache/juneau/BeanContext.html#BEAN_excludeProperties"><code>BeanContext.BEAN_excludeProperties</code></a>
  </ul></div>
 <dl>
 <dt>Default:</dt>
@@ -263,96 +254,104 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 </li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="properties--">
+<li class="blockList"><a name="interfaceClass--">
 <!--   -->
 </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.102">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.
-
+<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.104">interfaceClass</a></pre>
+<div class="block">Identifies a class to be used as the interface class for this and all subclasses.
+ 
  <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#getProperties--"><code>BeanFilter.getProperties()</code></a> method.
-
- <h5 class='section'>Example:</h5>
+ When specified, only the list of properties defined on the interface class will be used during serialization.
+ Additional properties on subclasses will be ignored.
+ 
  <p class='bcode'>
-   <jc>// Address class with only street/city/state properties (in that order).</jc>
-   <jc>// All other properties are ignored.</jc>
-   <ja>@Bean</ja>(properties=<js>"street,city,state"</js>)
-   <jk>public class</jk> Address {
-      ...
- </p></div>
+   <jc>// Parent class</jc>
+   <ja>@Bean</ja>(interfaceClass=A.<jk>class</jk>)
+   <jk>public abstract class</jk> A {
+      <jk>public</jk> String <jf>f0</jf> = <js>"f0"</js>;
+   }
+ 
+   <jc>// Sub class</jc>
+   <jk>public class</jk> A1 <jk>extends</jk> A {
+      <jk>public</jk> String <jf>f1</jf> = <js>"f1"</js>;
+   }
+ 
+   <jc>// Produces "{f0:'f0'}"</jc>
+   String json = JsonSerializer.<jsf>DEFAULT_LAX</jsf>.serialize(<jk>new</jk> A1());
+ </p>
+ 
+ <p>
+ Note that this annotation can be used on the parent class so that it filters to all child classes,
+ or can be set individually on the child classes.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='jf'><a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanFilters"><code>BeanContext.BEAN_beanFilters</code></a>
+ </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>""</dd>
+<dd>java.lang.Object.class</dd>
 </dl>
 </li>
 </ul>
 </li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="sort--">
+<li class="blockList"><a name="properties--">
 <!--   -->
 </a>
 <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.122">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.
- Otherwise, the natural order of the bean properties is used which is dependent on the JVM vendor.
- On IBM JVMs, the bean properties are ordered based on their ordering in the Java file.
- On Oracle JVMs, the bean properties are not ordered (which follows the official JVM specs).
-
- <p>
- This property is disabled by default so that IBM JVM users don't have to use <a href="../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation"><code>@Bean</code></a> annotations
- to force bean properties to be in a particular order and can just alter the order of the fields/methods
- in the Java file.
-
+<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.125">properties</a></pre>
+<div class="block">The set and order of names of properties associated with a bean class.
+ 
  <p>
- This annotation is equivalent to using the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_sortProperties"><code>BeanContext.BEAN_sortProperties</code></a> property, but applied to
- individual classes instead of globally at the serializer or parser level.</div>
+ 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.
+ 
+ <h5 class='section'>Example:</h5>
+ <p class='bcode'>
+   <jc>// Address class with only street/city/state properties (in that order).</jc>
+   <ja>@Bean</ja>(properties=<js>"street,city,state"</js>)
+   <jk>public class</jk> Address {...}
+ </p>
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='jf'><a href="../../../../org/apache/juneau/BeanContext.html#BEAN_includeProperties"><code>BeanContext.BEAN_includeProperties</code></a>
+ </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>false</dd>
+<dd>""</dd>
 </dl>
 </li>
 </ul>
 </li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="excludeProperties--">
+<li class="blockList"><a name="propertyFilter--">
 <!--   -->
 </a>
 <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.140">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>.
-
+<h4>propertyFilter</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/transform/PropertyFilter.html" title="class in org.apache.juneau.transform">PropertyFilter</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.138">propertyFilter</a></pre>
+<div class="block">Property filter.
+ 
  <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.
-
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
-   <jc>// Address class with only street/city/state properties (in that order).</jc>
-   <jc>// All other properties are ignored.</jc>
-   <ja>@Bean</ja>(excludeProperties=<js>"city,state"</js>})
-   <jk>public class</jk> Address {
-      ...
- </p></div>
+ Property filters can be used to intercept calls to getters and setters and alter their values in transit. 
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='jc'><a href="../../../../org/apache/juneau/transform/PropertyFilter.html" title="class in org.apache.juneau.transform"><code>PropertyFilter</code></a>
+ </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>""</dd>
+<dd>org.apache.juneau.transform.PropertyFilter.class</dd>
 </dl>
 </li>
 </ul>
@@ -365,26 +364,23 @@ 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.163">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.158">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.
- For example, the <a href="../../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><code>PropertyNamerDLC</code></a> will convert property names to dashed-lowercase, and these will be used
- as attribute names in JSON, and element names in XML.
-
- <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#getPropertyNamer--"><code>BeanFilter.getPropertyNamer()</code></a> method.
-
+ 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <jc>// Define a class with dashed-lowercase property names.</jc>
    <ja>@Bean</ja>(propertyNamer=PropertyNamerDashedLC.<jk>class</jk>)
-   <jk>public class</jk> MyClass {
-      ...
-   }
- </p></div>
+   <jk>public class</jk> MyBean {...}
+ </p>
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='jf'><a href="../../../../org/apache/juneau/BeanContext.html#BEAN_propertyNamer"><code>BeanContext.BEAN_propertyNamer</code></a>
+ </ul></div>
 <dl>
 <dt>Default:</dt>
 <dd>org.apache.juneau.PropertyNamerDefault.class</dd>
@@ -394,47 +390,33 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 </li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="interfaceClass--">
+<li class="blockList"><a name="sort--">
 <!--   -->
 </a>
 <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.198">interfaceClass</a></pre>
-<div class="block">Identifies a class to be used as the interface class for this and all subclasses.
-
+<h4>sort</h4>
+<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.179">sort</a></pre>
+<div class="block">Sort bean properties in alphabetical order.
+ 
  <p>
- When specified, only the list of properties defined on the interface class will be used during serialization.
- Additional properties on subclasses will be ignored.
-
+ When <jk>true</jk>, all bean properties will be serialized and access in alphabetical order.
+ <br>Otherwise, the natural order of the bean properties is used which is dependent on the JVM vendor.
+ 
+ <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <jc>// Parent class</jc>
-   <ja>@Bean</ja>(interfaceClass=A.<jk>class</jk>)
-   <jk>public abstract class</jk> A {
-      <jk>public</jk> String <jf>f0</jf> = <js>"f0"</js>;
-   }
-
-   <jc>// Sub class</jc>
-   <jk>public class</jk> A1 <jk>extends</jk> A {
-      <jk>public</jk> String <jf>f1</jf> = <js>"f1"</js>;
-   }
-
-   JsonSerializer s = JsonSerializer.<jsf>DEFAULT_LAX</jsf>;
-   A1 a1 = <jk>new</jk> A1();
-   String r = s.serialize(a1);
-   <jsm>assertEquals</jsm>(<js>"{f0:'f0'}"</js>, r);  <jc>// Note f1 is not serialized.</jc>
+   <jc>// Sort bean properties alphabetically during serialization.</jc>
+   <ja>@Bean</ja>(sort=<jk>true</jk>)
+   <jk>public class</jk> MyBean {...}
  </p>
-
- <p>
- Note that this annotation can be used on the parent class so that it filters to all child classes,
- or can be set individually on the child classes.
-
- <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#getInterfaceClass--"><code>BeanFilter.getInterfaceClass()</code></a> method.</div>
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='jf'><a href="../../../../org/apache/juneau/BeanContext.html#BEAN_sortProperties"><code>BeanContext.BEAN_sortProperties</code></a>
+ </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>java.lang.Object.class</dd>
+<dd>false</dd>
 </dl>
 </li>
 </ul>
@@ -447,13 +429,13 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <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.225">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.206">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>.
  Any properties in the stop class or in its base classes will be ignored during analysis.
-
+ 
  <p>
  For example, in the following class hierarchy, instances of <code>C3</code> will include property <code>p3</code>,
  but not <code>p1</code> or <code>p2</code>.
@@ -461,11 +443,11 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
    <jk>public class</jk> C1 {
       <jk>public int</jk> getP1();
    }
-
+ 
    <jk>public class</jk> C2 <jk>extends</jk> C1 {
       <jk>public int</jk> getP2();
    }
-
+ 
    <ja>@Bean</ja>(stopClass=C2.<jk>class</jk>)
    <jk>public class</jk> C3 <jk>extends</jk> C2 {
       <jk>public int</jk> getP3();
@@ -480,17 +462,29 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 </li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="beanDictionary--">
+<li class="blockList"><a name="typeName--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<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/Bean.html#line.238">beanDictionary</a></pre>
-<div class="block">Bean dictionary.
-
+<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.231">typeName</a></pre>
+<div class="block">An identifying name for this class.
+ 
  <p>
- The list of classes that make up the bean dictionary for all properties in this class and all subclasses.
+ The name is used to identify the class type during parsing when it cannot be inferred through reflection.
+ <br>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.
+ 
+ <p>
+ It is also used to specify element names in XML.
+ 
+ <h5 class='section'>Example:</h5>
+ <p class='bcode'>
+   <jc>// Use _type='mybean' to identify this bean.</jc>
+   <ja>@Bean</ja>(typeName=<js>"mybean"</js>)
+   <jk>public class</jk> MyBean {...}
+ </p>
  
  <h5 class='section'>See Also:</h5>
  <ul>
@@ -498,32 +492,42 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
  </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>{}</dd>
+<dd>""</dd>
 </dl>
 </li>
 </ul>
 </li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="propertyFilter--">
+<li class="blockList"><a name="typePropertyName--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>propertyFilter</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/transform/PropertyFilter.html" title="class in org.apache.juneau.transform">PropertyFilter</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Bean.html#line.251">propertyFilter</a></pre>
-<div class="block">Property filter.
+<h4>typePropertyName</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.254">typePropertyName</a></pre>
+<div class="block">The property name to use for representing the type name.
  
  <p>
- Property filters can be used to intercept calls to getters and setters and alter their values in transit. 
+ This can be used to override the name used for the <js>"_type"</js> property used by the <a href="../../../../org/apache/juneau/annotation/Bean.html#typeName--"><code>typeName()</code></a> setting.
+ 
+ <p>
+ The default value if not specified is <js>"_type"</js> .
+ 
+ <h5 class='section'>Example:</h5>
+ <p class='bcode'>
+   <jc>// Use 'type' instead of '_type' for bean names.</jc>
+   <ja>@Bean</ja>(typePropertyName=<js>"type"</js>)
+   <jk>public class</jk> MyBean {...}
+ </p>
  
  <h5 class='section'>See Also:</h5>
  <ul>
-   <li class='jc'><a href="../../../../org/apache/juneau/transform/PropertyFilter.html" title="class in org.apache.juneau.transform"><code>PropertyFilter</code></a>
+   <li class='jf'><a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanTypePropertyName"><code>BeanContext.BEAN_beanTypePropertyName</code></a>
  </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>org.apache.juneau.transform.PropertyFilter.class</dd>
+<dd>""</dd>
 </dl>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/c319662c/content/site/apidocs/org/apache/juneau/annotation/BeanConstructor.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/BeanConstructor.html b/content/site/apidocs/org/apache/juneau/annotation/BeanConstructor.html
index d27fed3..8ad5ca7 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/BeanConstructor.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/BeanConstructor.html
@@ -96,33 +96,34 @@
  <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#CONSTRUCTOR" title="class or interface in java.lang.annotation">CONSTRUCTOR</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/BeanConstructor.html#line.54">BeanConstructor</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/BeanConstructor.html#line.55">BeanConstructor</a></pre>
 <div class="block">Maps constructor arguments to property names on beans with read-only properties.
-
+ 
  <p>
  This annotation can be used in the case of beans with properties whose values can only be set by passing them in
  through a constructor on the class.
  <br>Since method parameter names are lost during compilation, this annotation essentially redefines them so that they
  are available at runtime.
-
+ 
  <p>
  This annotation can only be applied to constructors and can only be applied to one constructor per class.
-
+ 
  <p>
  When present, bean instantiation is delayed until the call to <a href="../../../../org/apache/juneau/BeanMap.html#getBean--"><code>BeanMap.getBean()</code></a>.
  Until then, bean property values are stored in a local cache until <code>getBean()</code> is called.
  Because of this additional caching step, parsing into read-only beans tends to be slower and use more memory than
  parsing into beans with writable properties.
-
+ 
  <p>
  Attempting to call <a href="../../../../org/apache/juneau/BeanMap.html#put-java.lang.String-java.lang.Object-"><code>BeanMap.put(String,Object)</code></a> on a read-only property after calling <a href="../../../../org/apache/juneau/BeanMap.html#getBean--"><code>BeanMap.getBean()</code></a>
  will result in a <a href="../../../../org/apache/juneau/BeanRuntimeException.html" title="class in org.apache.juneau"><code>BeanRuntimeException</code></a> being thrown.
  Multiple calls to <a href="../../../../org/apache/juneau/BeanMap.html#getBean--"><code>BeanMap.getBean()</code></a> will return the same bean instance.
-
- <h6 class='topic'>Documentation</h6>
-   <ul>
-      <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanConstructorAnnotation">Overview &gt; @BeanConstructor Annotation</a>
-   </ul></div>
+ 
+ 
+ <h5 class='topic'>Documentation</h5>
+ <ul>
+   <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanConstructorAnnotation">Overview &gt; @BeanConstructor Annotation</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -168,9 +169,9 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockListLast">
 <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/BeanConstructor.html#line.62">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/BeanConstructor.html#line.63">properties</a></pre>
 <div class="block">The names of the properties of the constructor arguments.
-
+ 
  <p>
  The number of properties listed must match the number of arguments in the constructor.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/c319662c/content/site/apidocs/org/apache/juneau/annotation/BeanIgnore.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/BeanIgnore.html b/content/site/apidocs/org/apache/juneau/annotation/BeanIgnore.html
index fd959e9..8d35e45 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/BeanIgnore.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/BeanIgnore.html
@@ -96,24 +96,25 @@
  <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/ElementType.html?is-external=true#TYPE" title="class or interface in java.lang.annotation">TYPE</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/BeanIgnore.html#line.43">BeanIgnore</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/BeanIgnore.html#line.44">BeanIgnore</a></pre>
 <div class="block">Ignore classes, fields, and methods from being interpreted as bean or bean components.
-
+ 
  <p>
  Applied to classes that may look like beans, but you want to be treated as non-beans.
  For example, if you want to force a bean to be converted to a string using the <code>toString()</code> method, use
  this annotation on the class.
-
+ 
  <p>
  Applies to fields that should not be interpreted as bean property fields.
-
+ 
  <p>
  Applies to getters or setters that should not be interpreted as bean property getters or setters.
  
- <h6 class='topic'>Documentation</h6>
-   <ul>
-      <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanIgnoreAnnotation">Overview &gt; @BeanIgnore Annotation</a>
-   </ul></div>
+ 
+ <h5 class='topic'>Documentation</h5>
+ <ul>
+   <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanIgnoreAnnotation">Overview &gt; @BeanIgnore Annotation</a>
+ </ul></div>
 </li>
 </ul>
 </div>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/c319662c/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html b/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
index ce17b10..78029eb 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
@@ -96,16 +96,17 @@
  <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.37">BeanProperty</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.38">BeanProperty</a></pre>
 <div class="block">Used tailor how bean properties get interpreted by the framework.
-
+ 
  <p>
  This annotation is applied to public fields and public getter/setter methods of beans.
  
- <h6 class='topic'>Documentation</h6>
-   <ul>
-      <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanPropertyAnnotation">Overview &gt; @BeanProperty Annotation</a>
-   </ul></div>
+ 
+ <h5 class='topic'>Documentation</h5>
+ <ul>
+   <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanPropertyAnnotation">Overview &gt; @BeanProperty Annotation</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -188,18 +189,18 @@ 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.128">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.129">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 of the property.
  However, this property can be used to assign a different property name from the automatically inferred value.
-
+ 
  <p>
  If the <a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanFieldVisibility"><code>BeanContext.BEAN_beanFieldVisibility</code></a> setting on the bean context excludes this field (e.g. the
  visibility is set to PUBLIC, but the field is PROTECTED), this annotation can be used to force the field to be
  identified as a property.
-
+ 
  <h6 class='topic'>Dynamic beans</h6>
  <p>
  The bean property named <js>"*"</js> is the designated "dynamic property" which allows for "extra" bean
@@ -207,69 +208,69 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
  This is similar in concept to the Jackson <ja>@JsonGetterAll</ja> and <ja>@JsonSetterAll</ja> annotations.
  The primary purpose is for backwards compatibility in parsing newer streams with addition information into older
  beans.
-
+ 
  <p>
-   The following examples show how to define dynamic bean properties.
+ The following examples show how to define dynamic bean properties.
  <p class='bcode'>
    <jc>// Option #1 - A simple public Map field.
    // The field name can be anything.</jc>
    <jk>public class</jk> BeanWithDynaField {
-
+ 
       <ja>@BeanProperty</ja>(name=<js>"*"</js>)
       <jk>public</jk> Map&lt;String,Object&gt; extraStuff = <jk>new</jk> LinkedHashMap&lt;String,Object&gt;();
    }
-
+ 
    <jc>// Option #2 - Getters and setters.
    // Method names can be anything.
    // Getter must return a Map with String keys.
    // Setter must take in two arguments.</jc>
    <jk>public class</jk> BeanWithDynaMethods {
-
+ 
       <ja>@BeanProperty</ja>(name=<js>"*"</js>)
       <jk>public</jk> Map&lt;String,Object&gt; getMyExtraStuff() {
          ...
       }
-
+ 
       <ja>@BeanProperty</ja>(name=<js>"*"</js>)
       <jk>public void</jk> setAnExtraField(String name, Object value) {
          ...
       }
    }
-
+ 
    <jc>// Option #3 - Getter only.
    // Properties will be added through the getter.</jc>
    <jk>public class</jk> BeanWithDynaGetterOnly {
-
+ 
       <ja>@BeanProperty</ja>(name=<js>"*"</js>)
       <jk>public</jk> Map&lt;String,Object&gt; getMyExtraStuff() {
          ...
       }
    }
  </p>
-
+ 
 <p>
  Similar rules apply for value types and swaps.
  The property values optionally can be any serializable type or use swaps.
  <p class='bcode'>
    <jc>// A serializable type other than Object.</jc>
    <jk>public class</jk> BeanWithDynaFieldWithListValues {
-
+ 
       <ja>@BeanProperty</ja>(name=<js>"*"</js>)
       <jk>public</jk> Map&lt;String,List&lt;String&gt;&gt; getMyExtraStuff() {
          ...
       }
    }
-
+ 
    <jc>// A swapped value.</jc>
    <jk>public class</jk> BeanWithDynaFieldWithSwappedValues {
-
+ 
       <ja>@BeanProperty</ja>(name=<js>"*"</js>, swap=CalendarSwap.<jsf>ISO8601DTZ</jsf>.<jk>class</jk>)
       <jk>public</jk> Map&lt;String,Calendar&gt; getMyExtraStuff() {
          ...
       }
    }
  </p>
-
+ 
  <ul class='doctree'>
    <li class='info'>
       Note that if you're not interested in these additional properties, you can also use the
@@ -291,15 +292,15 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <h4>value</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.142">value</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.143">value</a></pre>
 <div class="block">A synonym for <a href="../../../../org/apache/juneau/annotation/BeanProperty.html#name--"><code>name()</code></a>.
-
+ 
  <p>
  The following annotations are equivalent:
-
+ 
  <p class='bcode'>
    <ja>@BeanProperty</ja>(name=<js>"foo"</js>)
-
+ 
    <ja>@BeanProperty</ja>(<js>"foo"</js>)
  </p></div>
 <dl>
@@ -317,22 +318,22 @@ 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.166">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.167">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.
  However, you'll want to specify this value if you're parsing beans where the bean property class is an interface
  or abstract class to identify the bean type to instantiate.
  Otherwise, you may cause an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/InstantiationException.html?is-external=true" title="class or interface in java.lang"><code>InstantiationException</code></a> when trying to set these fields.
-
+ 
  <p>
  This property must denote a concrete bean class with a no-arg constructor.
-
+ 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <jk>public class</jk> MyBean {
-
+ 
       <jc>// Identify concrete map type.</jc>
       <ja>@BeanProperty</ja>(type=HashMap.<jk>class</jk>)
       <jk>public</jk> Map <jf>p1</jf>;
@@ -353,14 +354,14 @@ 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.182">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.183">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.
-
+ 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <jk>public class</jk> MyBean {
-
+ 
       <jc>// Identify concrete map type with String keys and Integer values.</jc>
       <ja>@BeanProperty</ja>(type=HashMap.<jk>class</jk>, params={String.<jk>class</jk>,Integer.<jk>class</jk>})
       <jk>public</jk> Map <jf>p1</jf>;
@@ -381,9 +382,9 @@ 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.214">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.215">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:
  <ul class='spaced-list'>
@@ -392,21 +393,21 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
    <li>Bean/Map arrays - Same, but applied to each element in the array.
    <li>Bean/Map collections - Same, but applied to each element in the collection.
  </ul>
-
+ 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <jk>public class</jk> MyClass {
-
+ 
       <jc>// Only render 'f1' when serializing this bean property.</jc>
       <ja>@BeanProperty</ja>(properties=<js>"f1"</js>)
       <jk>public</jk> MyChildClass x1 = <jk>new</jk> MyChildClass();
    }
-
+ 
    <jk>public class</jk> MyChildClass {
       <jk>public int</jk> f1 = 1;
       <jk>public int</jk> f2 = 2;
    }
-
+ 
    <jc>// Renders "{x1:{f1:1}}"</jc>
    String json = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(<jk>new</jk> MyClass());
  </p></div>
@@ -425,9 +426,9 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockList">
 <li class="blockList">
 <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.227">beanDictionary</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.228">beanDictionary</a></pre>
 <div class="block">Bean dictionary.
-
+ 
  <p>
  The list of classes that make up the bean dictionary this bean property.
  
@@ -450,16 +451,16 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
 <ul class="blockListLast">
 <li class="blockList">
 <h4>format</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.245">format</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.246">format</a></pre>
 <div class="block">Specifies a String format for converting the bean property value to a formatted string.
-
+ 
  <p>
  Note that this is usually a one-way conversion during serialization.
-
+ 
  <p>
  During parsing, we will attempt to convert the value to the original form by using the
  <a href="../../../../org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-"><code>BeanSession.convertToType(Object, Class)</code></a> but there is no guarantee that this will succeed.
-
+ 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <ja>@BeanProperty</ja>(format=<js>"$%.2f"</js>)

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/c319662c/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html b/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
index 09e234a..f6c16d3 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
@@ -95,18 +95,20 @@
 <pre><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#METHOD" title="class or interface in java.lang.annotation">METHOD</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/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/NameProperty.html#line.36">NameProperty</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/NameProperty.html#line.38">NameProperty</a></pre>
 <div class="block">Identifies a setter as a method for setting the name of a POJO as it's known by its parent object.
-
- <h5 class='section'>Notes:</h5>
+ 
+ 
+ <h5 class='topic'>Notes</h5>
  <ul>
    <li>The annotated field or method does not need to be public.
  </ul>
  
- <h6 class='topic'>Documentation</h6>
-   <ul>
-      <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.NamePropertyAnnotation">Overview &gt; @NameProperty Annotation</a>
-   </ul></div>
+ 
+ <h5 class='topic'>Documentation</h5>
+ <ul>
+   <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.NamePropertyAnnotation">Overview &gt; @NameProperty Annotation</a>
+ </ul></div>
 </li>
 </ul>
 </div>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/c319662c/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html b/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
index 1148a6d..0519f8e 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
@@ -95,21 +95,23 @@
 <pre><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#METHOD" title="class or interface in java.lang.annotation">METHOD</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/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/ParentProperty.html#line.39">ParentProperty</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/ParentProperty.html#line.41">ParentProperty</a></pre>
 <div class="block">Identifies a setter as a method for adding a parent reference to a child object.
-
+ 
  <p>
  Used by the parsers to add references to parent objects in child objects.
-
- <h5 class='section'>Notes:</h5>
+ 
+ 
+ <h5 class='topic'>Notes</h5>
  <ul>
    <li>The annotated field or method does not need to be public.
  </ul>
  
- <h6 class='topic'>Documentation</h6>
-   <ul>
-      <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.NamePropertyAnnotation">Overview &gt; @NameProperty Annotation</a>
-   </ul></div>
+ 
+ <h5 class='topic'>Documentation</h5>
+ <ul>
+   <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.NamePropertyAnnotation">Overview &gt; @NameProperty Annotation</a>
+ </ul></div>
 </li>
 </ul>
 </div>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/c319662c/content/site/apidocs/org/apache/juneau/annotation/Swap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/Swap.html b/content/site/apidocs/org/apache/juneau/annotation/Swap.html
index ca22900..0e09abf 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/Swap.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/Swap.html
@@ -96,9 +96,9 @@
  <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#TYPE" title="class or interface in java.lang.annotation">TYPE</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#ANNOTATION_TYPE" title="class or interface in java.lang.annotation">ANNOTATION_TYPE</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="clas
 s 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/Swap.html#line.42">Swap</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swap.html#line.43">Swap</a></pre>
 <div class="block">Associates <a href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> and <a href="../../../../org/apache/juneau/transform/Surrogate.html" title="interface in org.apache.juneau.transform"><code>Surrogate</code></a> classes with POJOs and bean properties.
-
+ 
  <p>
  This annotation can be used in the following locations:
  <ul>
@@ -107,10 +107,11 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
    <li>Inside the <a href="../../../../org/apache/juneau/annotation/Swaps.html" title="annotation in org.apache.juneau.annotation"><code>@Swaps</code></a> annotation.
  </ul>
  
- <h6 class='topic'>Documentation</h6>
-   <ul>
-      <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.SwapAnnotation">Overview &gt; @Swap Annotation</a>
-   </ul></div>
+ 
+ <h5 class='topic'>Documentation</h5>
+ <ul>
+   <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.SwapAnnotation">Overview &gt; @Swap Annotation</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -168,17 +169,17 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
 <!--   -->
 </a>
 <h3>Element Detail</h3>
-<a name="value--">
+<a name="impl--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>value</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/Swap.html#line.50">value</a></pre>
+<h4>impl</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/Swap.html#line.51">impl</a></pre>
 <div class="block">The <a href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> and <a href="../../../../org/apache/juneau/transform/Surrogate.html" title="interface in org.apache.juneau.transform"><code>Surrogate</code></a> class.
-
+ 
  <p>
- A synonym for <a href="../../../../org/apache/juneau/annotation/Swap.html#impl--"><code>impl()</code></a>.</div>
+ A synonym for <a href="../../../../org/apache/juneau/annotation/Swap.html#value--"><code>value()</code></a>.</div>
 <dl>
 <dt>Default:</dt>
 <dd>org.apache.juneau.annotation.Null.class</dd>
@@ -188,20 +189,36 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
 </li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="impl--">
+<li class="blockList"><a name="mediaTypes--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>impl</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/Swap.html#line.58">impl</a></pre>
-<div class="block">The <a href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> and <a href="../../../../org/apache/juneau/transform/Surrogate.html" title="interface in org.apache.juneau.transform"><code>Surrogate</code></a> class.
-
+<h4>mediaTypes</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/Swap.html#line.75">mediaTypes</a></pre>
+<div class="block">Identifies the media types that this swap is applicable for.
+ 
  <p>
- A synonym for <a href="../../../../org/apache/juneau/annotation/Swap.html#value--"><code>value()</code></a>.</div>
+ In the following example, the swap is only invoked by the JSON serializer:
+ 
+ <p class='bcode'>
+   <ja>@Swap</ja>(impl=ToStringSwap.<jk>class</jk>, mediaTypes=<js>"&#42;/json"</js>)
+   <jk>public class</jk> MyBean { ... }
+ 
+   <jk>public class</jk> ToStringSwap <jk>extends</jk> PojoSwap&lt;Object,String&gt; {
+         <jk>public</jk> String swap(BeanSession session, Object o) <jk>throws</jk> Exception {
+            <jk>return</jk> o.toString();
+         }
+      }
+ </p>
+ 
+ <h5 class='section'>Documentation:</h5>
+ <ul>
+   <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.PerMediaTypePojoSwaps">Overview &gt; Per-media-type PojoSwaps</a>
+ </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>org.apache.juneau.annotation.Null.class</dd>
+<dd>{}</dd>
 </dl>
 </li>
 </ul>
@@ -214,26 +231,26 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
 <ul class="blockList">
 <li class="blockList">
 <h4>template</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/Swap.html#line.96">template</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/Swap.html#line.112">template</a></pre>
 <div class="block">Identifies a template string along with this swap.
-
+ 
  <p>
  Template strings are arbitrary strings associated with swaps that help provide additional context information
  for the swap class.
  They're called 'templates' because their primary purpose is for providing template names, such as Apache FreeMarker
  template names.
-
+ 
  <p>
  The following is an example of a templated swap class used to serialize POJOs to HTML using FreeMarker:
-
+ 
  <p class='bcode'>
    <jc>// Our templated swap class.</jc>
    <jk>public class</jk> FreeMarkerSwap <jk>extends</jk> PojoSwap&lt;Object,Reader&gt; {
-
+ 
       <jk>public</jk> MediaType[] forMediaTypes() {
          <jk>return</jk> MediaType.<jsm>forStrings</jsm>(<js>"&#42;/html"</js>);
       }
-
+ 
       <jk>public</jk> Reader swap(BeanSession session, Object o, String template) <jk>throws</jk> Exception {
          <jk>return</jk> getFreeMarkerReader(template, o);  <jc>// Some method that creates raw HTML.</jc>
       }
@@ -244,10 +261,10 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
    <jk>public class</jk> MyPojo {}
  </p>
  
-   <h5 class='section'>Documentation:</h5>
-   <ul>
-      <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.TemplatedSwaps">Overview &gt; Templated Swaps</a>
-   </ul></div>
+ <h5 class='section'>Documentation:</h5>
+ <ul>
+   <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.TemplatedSwaps">Overview &gt; Templated Swaps</a>
+ </ul></div>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
@@ -257,36 +274,20 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
 </li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="mediaTypes--">
+<li class="blockList"><a name="value--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>mediaTypes</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/Swap.html#line.120">mediaTypes</a></pre>
-<div class="block">Identifies the media types that this swap is applicable for.
-
- <p>
- In the following example, the swap is only invoked by the JSON serializer:
-
- <p class='bcode'>
-   <ja>@Swap</ja>(impl=ToStringSwap.<jk>class</jk>, mediaTypes=<js>"&#42;/json"</js>)
-   <jk>public class</jk> MyBean { ... }
-
-   <jk>public class</jk> ToStringSwap <jk>extends</jk> PojoSwap&lt;Object,String&gt; {
-         <jk>public</jk> String swap(BeanSession session, Object o) <jk>throws</jk> Exception {
-            <jk>return</jk> o.toString();
-         }
-      }
- </p>
+<h4>value</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/Swap.html#line.120">value</a></pre>
+<div class="block">The <a href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> and <a href="../../../../org/apache/juneau/transform/Surrogate.html" title="interface in org.apache.juneau.transform"><code>Surrogate</code></a> class.
  
-   <h5 class='section'>Documentation:</h5>
-   <ul>
-      <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.PerMediaTypePojoSwaps">Overview &gt; Per-media-type PojoSwaps</a>
-   </ul></div>
+ <p>
+ A synonym for <a href="../../../../org/apache/juneau/annotation/Swap.html#impl--"><code>impl()</code></a>.</div>
 <dl>
 <dt>Default:</dt>
-<dd>{}</dd>
+<dd>org.apache.juneau.annotation.Null.class</dd>
 </dl>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/c319662c/content/site/apidocs/org/apache/juneau/annotation/Swaps.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/Swaps.html b/content/site/apidocs/org/apache/juneau/annotation/Swaps.html
index 05b00b0..30044ba 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/Swaps.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/Swaps.html
@@ -96,9 +96,9 @@
  <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#TYPE" title="class or interface in java.lang.annotation">TYPE</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/Swaps.html#line.43">Swaps</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swaps.html#line.44">Swaps</a></pre>
 <div class="block">Used to associate multiple swaps with the same POJO class.
-
+ 
  <p class='bcode'>
    <ja>@Swaps</ja>(
       {
@@ -110,10 +110,11 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
    <jk>public class</jk> MyPojo {}
  </p>
  
- <h6 class='topic'>Documentation</h6>
-   <ul>
-      <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.SwapAnnotation">Overview &gt; @Swap Annotation</a>
-   </ul></div>
+ 
+ <h5 class='topic'>Documentation</h5>
+ <ul>
+   <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.SwapAnnotation">Overview &gt; @Swap Annotation</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -159,7 +160,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
 <ul class="blockListLast">
 <li class="blockList">
 <h4>value</h4>
-<pre>public abstract&nbsp;<a href="../../../../org/apache/juneau/annotation/Swap.html" title="annotation in org.apache.juneau.annotation">Swap</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Swaps.html#line.48">value</a></pre>
+<pre>public abstract&nbsp;<a href="../../../../org/apache/juneau/annotation/Swap.html" title="annotation in org.apache.juneau.annotation">Swap</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/annotation/Swaps.html#line.49">value</a></pre>
 <div class="block">The swaps to apply to this POJO class.</div>
 <dl>
 <dt>Default:</dt>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/c319662c/content/site/apidocs/org/apache/juneau/annotation/URI.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/URI.html b/content/site/apidocs/org/apache/juneau/annotation/URI.html
index a888cfc..ccc83d4 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/URI.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/URI.html
@@ -96,17 +96,18 @@
  <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#TYPE" title="class or interface in java.lang.annotation">TYPE</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/URI.html#line.36">URI</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/URI.html#line.37">URI</a></pre>
 <div class="block">Used to identify a class or bean property as a URI.
-
+ 
  <p>
  This annotation allows you to identify other classes that return URIs via <code>toString()</code> as URI objects.
-
  
- <h6 class='topic'>Documentation</h6>
-   <ul>
-      <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.URIAnnotation">Overview &gt; @URI Annotation</a>
-   </ul></div>
+ 
+ 
+ <h5 class='topic'>Documentation</h5>
+ <ul>
+   <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.URIAnnotation">Overview &gt; @URI Annotation</a>
+ </ul></div>
 </li>
 </ul>
 </div>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/c319662c/content/site/apidocs/org/apache/juneau/csv/CsvParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/csv/CsvParser.html b/content/site/apidocs/org/apache/juneau/csv/CsvParser.html
index 271fa06..f735f73 100644
--- a/content/site/apidocs/org/apache/juneau/csv/CsvParser.html
+++ b/content/site/apidocs/org/apache/juneau/csv/CsvParser.html
@@ -367,7 +367,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
 <pre>public&nbsp;<a href="../../../../org/apache/juneau/parser/ReaderParserSession.html" title="class in org.apache.juneau.parser">ReaderParserSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/csv/CsvParser.html#line.66">createSession</a>(<a href="../../../../org/apache/juneau/parser/ParserSessionArgs.html" title="class in org.apache.juneau.parser">ParserSessionArgs</a>&nbsp;args)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/parser/Parser.html#createSession-org.apache.juneau.parser.ParserSessionArgs-">Parser</a></code></span></div>
 <div class="block">Create the session object that will be passed in to the parse method.
-
+ 
  <p>
  It's up to implementers to decide what the session object looks like, although typically it's going to be a
  subclass of <a href="../../../../org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser"><code>ParserSession</code></a>.</div>