http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/org/apache/juneau/utils/Args.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/Args.html 
b/content/site/apidocs/org/apache/juneau/utils/Args.html
index b2f927d..40a1b99 100644
--- a/content/site/apidocs/org/apache/juneau/utils/Args.html
+++ b/content/site/apidocs/org/apache/juneau/utils/Args.html
@@ -316,7 +316,7 @@ extends <a 
href="../../../../org/apache/juneau/ObjectMap.html" title="class in o
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a 
href="../../../../org/apache/juneau/ObjectMap.html" title="class in 
org.apache.juneau">ObjectMap</a></h3>
-<code><a 
href="../../../../org/apache/juneau/ObjectMap.html#append-java.lang.String-java.lang.Object-">append</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#appendAll-java.util.Map-">appendAll</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#cast-java.lang.Class-">cast</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#cast-org.apache.juneau.ClassMeta-">cast</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#containsKey-java.lang.Object-">containsKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#containsOuterKey-java.lang.Object-">containsOuterKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#deleteAt-java.lang.String-">deleteAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#entrySet--">entrySet</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#exclude-java.lang.String...-">exclude</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#find-java.lang.Class-java.lang.String...-">find</a>,
 <a href
 
="../../../../org/apache/juneau/ObjectMap.html#find-java.lang.String...-">find</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findBoolean-java.lang.String...-">findBoolean</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findInt-java.lang.String...-">findInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findKeyIgnoreCase-java.lang.String-">findKeyIgnoreCase</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findList-java.lang.String...-">findList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findLong-java.lang.String...-">findLong</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findMap-java.lang.String...-">findMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findObjectList-java.lang.String...-">findObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findObjectMap-java.lang.String...-">findObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findString-java.lang.String.
 ..-">findString</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Class-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Class-java.lang.String-T-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.ClassMeta-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.ClassMeta-java.lang.String-T-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Object-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.transform.PojoSwap-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.String-java.lang.Object-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getAt-java.lang.Class-java.lang.String-">getAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getBeanSession--">getBeanSession</a>,
 <a href="../../../../org/apach
 e/juneau/ObjectMap.html#getBoolean-java.lang.String-">getBoolean</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#getBoolean-java.lang.String-java.lang.Boolean-">getBoolean</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getClassMeta-java.lang.String-">getClassMeta</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getFirstKey--">getFirstKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getInner--">getInner</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#getInt-java.lang.String-">getInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getInt-java.lang.String-java.lang.Integer-">getInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getList-java.lang.String-">getList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getList-java.lang.String-java.util.List-">getList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getLong-java.lang.String-">getLong</a>,
 <a href="../../../../org/apache/juneau/O
 bjectMap.html#getLong-java.lang.String-java.lang.Long-">getLong</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#getMap-java.lang.String-">getMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getMap-java.lang.String-java.util.Map-">getMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectList-java.lang.String-">getObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectList-java.lang.String-org.apache.juneau.ObjectList-">getObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectMap-java.lang.String-">getObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectMap-java.lang.String-org.apache.juneau.ObjectMap-">getObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getString-java.lang.String-">getString</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getString-java.lang.String-java.lang.String-">getString</a>,
 <a href="../../../../org/apache/juneau/O
 bjectMap.html#getStringArray-java.lang.String-">getStringArray</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#getStringArray-java.lang.String-java.lang.String:A-">getStringArray</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#include-java.lang.String...-">include</a>,
 <a href="../../../../org/apache/juneau/ObjectMap.html#keySet--">keySet</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#postAt-java.lang.String-java.lang.Object-">postAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putAt-java.lang.String-java.lang.Object-">putAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putIfEmpty-java.lang.String-java.lang.Object-">putIfEmpty</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putIfNull-java.lang.String-java.lang.Object-">putIfNull</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putJson-java.lang.String-java.lang.String-">putJson</a>,
 <a href="../../../../org/apache/juneau/ObjectMap.html#remove-java.lang
 .Class-java.lang.String-T-">remove</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#removeAll-java.util.Collection-">removeAll</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#removeAll-java.lang.String...-">removeAll</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#serializeTo-java.io.Writer-">serializeTo</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#setBeanSession-org.apache.juneau.BeanSession-">setBeanSession</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#setInner-org.apache.juneau.ObjectMap-">setInner</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#toString--">toString</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#toString-org.apache.juneau.serializer.WriterSerializer-">toString</a></code></li>
+<code><a 
href="../../../../org/apache/juneau/ObjectMap.html#append-java.lang.String-java.lang.Object-">append</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#appendAll-java.util.Map-">appendAll</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#cast-java.lang.Class-">cast</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#cast-org.apache.juneau.ClassMeta-">cast</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#containsKey-java.lang.Object-">containsKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#containsOuterKey-java.lang.Object-">containsOuterKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#deleteAt-java.lang.String-">deleteAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#entrySet--">entrySet</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#exclude-java.lang.String...-">exclude</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#find-java.lang.Class-java.lang.String...-">find</a>,
 <a href
 
="../../../../org/apache/juneau/ObjectMap.html#find-java.lang.String...-">find</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findBoolean-java.lang.String...-">findBoolean</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findInt-java.lang.String...-">findInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findKeyIgnoreCase-java.lang.String-">findKeyIgnoreCase</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findList-java.lang.String...-">findList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findLong-java.lang.String...-">findLong</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findMap-java.lang.String...-">findMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findObjectList-java.lang.String...-">findObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findObjectMap-java.lang.String...-">findObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findString-java.lang.String.
 ..-">findString</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Class-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Class-java.lang.String-T-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.ClassMeta-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.ClassMeta-java.lang.String-T-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Object-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.transform.PojoSwap-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.String-java.lang.Object-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getAt-java.lang.Class-java.lang.String-">getAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getBeanSession--">getBeanSession</a>,
 <a href="../../../../org/apach
 e/juneau/ObjectMap.html#getBoolean-java.lang.String-">getBoolean</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#getBoolean-java.lang.String-java.lang.Boolean-">getBoolean</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getClassMeta-java.lang.String-">getClassMeta</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getFirstKey--">getFirstKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getInt-java.lang.String-">getInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getInt-java.lang.String-java.lang.Integer-">getInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getList-java.lang.String-">getList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getList-java.lang.String-java.util.List-">getList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getLong-java.lang.String-">getLong</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getLong-java.lang.String-java.lang.Long-">getLong</a>,
 <a href="..
 
/../../../org/apache/juneau/ObjectMap.html#getMap-java.lang.String-">getMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getMap-java.lang.String-java.util.Map-">getMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectList-java.lang.String-">getObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectList-java.lang.String-org.apache.juneau.ObjectList-">getObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectMap-java.lang.String-">getObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectMap-java.lang.String-org.apache.juneau.ObjectMap-">getObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getString-java.lang.String-">getString</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getString-java.lang.String-java.lang.String-">getString</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getStringArray-java.lang.String-">getStringArray</a>,
 <a href="../
 
../../../org/apache/juneau/ObjectMap.html#getStringArray-java.lang.String-java.lang.String:A-">getStringArray</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#include-java.lang.String...-">include</a>,
 <a href="../../../../org/apache/juneau/ObjectMap.html#keySet--">keySet</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#postAt-java.lang.String-java.lang.Object-">postAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putAt-java.lang.String-java.lang.Object-">putAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putIfEmpty-java.lang.String-java.lang.Object-">putIfEmpty</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putIfNull-java.lang.String-java.lang.Object-">putIfNull</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putJson-java.lang.String-java.lang.String-">putJson</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#remove-java.lang.Class-java.lang.String-T-">remove</a>,
 <a href="../../../../org/apache/juneau/O
 bjectMap.html#removeAll-java.util.Collection-">removeAll</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#removeAll-java.lang.String...-">removeAll</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#serializeTo-java.io.Writer-">serializeTo</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#setBeanSession-org.apache.juneau.BeanSession-">setBeanSession</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#setInner-java.util.Map-">setInner</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#toString--">toString</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#toString-org.apache.juneau.serializer.WriterSerializer-">toString</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a 
name="methods.inherited.from.class.java.util.LinkedHashMap">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/org/apache/juneau/utils/ManifestFile.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/ManifestFile.html 
b/content/site/apidocs/org/apache/juneau/utils/ManifestFile.html
index f253615..7e06998 100644
--- a/content/site/apidocs/org/apache/juneau/utils/ManifestFile.html
+++ b/content/site/apidocs/org/apache/juneau/utils/ManifestFile.html
@@ -212,7 +212,7 @@ extends <a 
href="../../../../org/apache/juneau/ObjectMap.html" title="class in o
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a 
href="../../../../org/apache/juneau/ObjectMap.html" title="class in 
org.apache.juneau">ObjectMap</a></h3>
-<code><a 
href="../../../../org/apache/juneau/ObjectMap.html#append-java.lang.String-java.lang.Object-">append</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#appendAll-java.util.Map-">appendAll</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#cast-java.lang.Class-">cast</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#cast-org.apache.juneau.ClassMeta-">cast</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#containsKey-java.lang.Object-">containsKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#containsOuterKey-java.lang.Object-">containsOuterKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#deleteAt-java.lang.String-">deleteAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#entrySet--">entrySet</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#exclude-java.lang.String...-">exclude</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#find-java.lang.Class-java.lang.String...-">find</a>,
 <a href
 
="../../../../org/apache/juneau/ObjectMap.html#find-java.lang.String...-">find</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findBoolean-java.lang.String...-">findBoolean</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findInt-java.lang.String...-">findInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findKeyIgnoreCase-java.lang.String-">findKeyIgnoreCase</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findList-java.lang.String...-">findList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findLong-java.lang.String...-">findLong</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findMap-java.lang.String...-">findMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findObjectList-java.lang.String...-">findObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findObjectMap-java.lang.String...-">findObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findString-java.lang.String.
 ..-">findString</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Class-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Class-java.lang.String-T-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.ClassMeta-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.ClassMeta-java.lang.String-T-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Object-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.transform.PojoSwap-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.String-java.lang.Object-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getAt-java.lang.Class-java.lang.String-">getAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getBeanSession--">getBeanSession</a>,
 <a href="../../../../org/apach
 e/juneau/ObjectMap.html#getBoolean-java.lang.String-">getBoolean</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#getBoolean-java.lang.String-java.lang.Boolean-">getBoolean</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getClassMeta-java.lang.String-">getClassMeta</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getFirstKey--">getFirstKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getInner--">getInner</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#getInt-java.lang.String-">getInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getInt-java.lang.String-java.lang.Integer-">getInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getList-java.lang.String-">getList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getList-java.lang.String-java.util.List-">getList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getLong-java.lang.String-">getLong</a>,
 <a href="../../../../org/apache/juneau/O
 bjectMap.html#getLong-java.lang.String-java.lang.Long-">getLong</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#getMap-java.lang.String-">getMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getMap-java.lang.String-java.util.Map-">getMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectList-java.lang.String-">getObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectList-java.lang.String-org.apache.juneau.ObjectList-">getObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectMap-java.lang.String-">getObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectMap-java.lang.String-org.apache.juneau.ObjectMap-">getObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getString-java.lang.String-">getString</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getString-java.lang.String-java.lang.String-">getString</a>,
 <a href="../../../../org/apache/juneau/O
 bjectMap.html#getStringArray-java.lang.String-">getStringArray</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#getStringArray-java.lang.String-java.lang.String:A-">getStringArray</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#include-java.lang.String...-">include</a>,
 <a href="../../../../org/apache/juneau/ObjectMap.html#keySet--">keySet</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#postAt-java.lang.String-java.lang.Object-">postAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putAt-java.lang.String-java.lang.Object-">putAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putIfEmpty-java.lang.String-java.lang.Object-">putIfEmpty</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putIfNull-java.lang.String-java.lang.Object-">putIfNull</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putJson-java.lang.String-java.lang.String-">putJson</a>,
 <a href="../../../../org/apache/juneau/ObjectMap.html#remove-java.lang
 .Class-java.lang.String-T-">remove</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#removeAll-java.util.Collection-">removeAll</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#removeAll-java.lang.String...-">removeAll</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#serializeTo-java.io.Writer-">serializeTo</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#setBeanSession-org.apache.juneau.BeanSession-">setBeanSession</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#setInner-org.apache.juneau.ObjectMap-">setInner</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#toString--">toString</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#toString-org.apache.juneau.serializer.WriterSerializer-">toString</a></code></li>
+<code><a 
href="../../../../org/apache/juneau/ObjectMap.html#append-java.lang.String-java.lang.Object-">append</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#appendAll-java.util.Map-">appendAll</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#cast-java.lang.Class-">cast</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#cast-org.apache.juneau.ClassMeta-">cast</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#containsKey-java.lang.Object-">containsKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#containsOuterKey-java.lang.Object-">containsOuterKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#deleteAt-java.lang.String-">deleteAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#entrySet--">entrySet</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#exclude-java.lang.String...-">exclude</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#find-java.lang.Class-java.lang.String...-">find</a>,
 <a href
 
="../../../../org/apache/juneau/ObjectMap.html#find-java.lang.String...-">find</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findBoolean-java.lang.String...-">findBoolean</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findInt-java.lang.String...-">findInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findKeyIgnoreCase-java.lang.String-">findKeyIgnoreCase</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findList-java.lang.String...-">findList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findLong-java.lang.String...-">findLong</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findMap-java.lang.String...-">findMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findObjectList-java.lang.String...-">findObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findObjectMap-java.lang.String...-">findObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#findString-java.lang.String.
 ..-">findString</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Class-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Class-java.lang.String-T-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.ClassMeta-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.ClassMeta-java.lang.String-T-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.Object-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-org.apache.juneau.transform.PojoSwap-java.lang.String-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#get-java.lang.String-java.lang.Object-">get</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getAt-java.lang.Class-java.lang.String-">getAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getBeanSession--">getBeanSession</a>,
 <a href="../../../../org/apach
 e/juneau/ObjectMap.html#getBoolean-java.lang.String-">getBoolean</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#getBoolean-java.lang.String-java.lang.Boolean-">getBoolean</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getClassMeta-java.lang.String-">getClassMeta</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getFirstKey--">getFirstKey</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getInt-java.lang.String-">getInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getInt-java.lang.String-java.lang.Integer-">getInt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getList-java.lang.String-">getList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getList-java.lang.String-java.util.List-">getList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getLong-java.lang.String-">getLong</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getLong-java.lang.String-java.lang.Long-">getLong</a>,
 <a href="..
 
/../../../org/apache/juneau/ObjectMap.html#getMap-java.lang.String-">getMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getMap-java.lang.String-java.util.Map-">getMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectList-java.lang.String-">getObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectList-java.lang.String-org.apache.juneau.ObjectList-">getObjectList</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectMap-java.lang.String-">getObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getObjectMap-java.lang.String-org.apache.juneau.ObjectMap-">getObjectMap</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getString-java.lang.String-">getString</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getString-java.lang.String-java.lang.String-">getString</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#getStringArray-java.lang.String-">getStringArray</a>,
 <a href="../
 
../../../org/apache/juneau/ObjectMap.html#getStringArray-java.lang.String-java.lang.String:A-">getStringArray</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#include-java.lang.String...-">include</a>,
 <a href="../../../../org/apache/juneau/ObjectMap.html#keySet--">keySet</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#postAt-java.lang.String-java.lang.Object-">postAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putAt-java.lang.String-java.lang.Object-">putAt</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putIfEmpty-java.lang.String-java.lang.Object-">putIfEmpty</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putIfNull-java.lang.String-java.lang.Object-">putIfNull</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#putJson-java.lang.String-java.lang.String-">putJson</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#remove-java.lang.Class-java.lang.String-T-">remove</a>,
 <a href="../../../../org/apache/juneau/O
 bjectMap.html#removeAll-java.util.Collection-">removeAll</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#removeAll-java.lang.String...-">removeAll</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#serializeTo-java.io.Writer-">serializeTo</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#setBeanSession-org.apache.juneau.BeanSession-">setBeanSession</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#setInner-java.util.Map-">setInner</a>,
 <a 
href="../../../../org/apache/juneau/ObjectMap.html#toString--">toString</a>, <a 
href="../../../../org/apache/juneau/ObjectMap.html#toString-org.apache.juneau.serializer.WriterSerializer-">toString</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a 
name="methods.inherited.from.class.java.util.LinkedHashMap">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/org/apache/juneau/xml/XmlParserContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlParserContext.html 
b/content/site/apidocs/org/apache/juneau/xml/XmlParserContext.html
index f2094e3..fed0057 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlParserContext.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlParserContext.html
@@ -258,7 +258,7 @@ extends <a 
href="../../../../org/apache/juneau/parser/ParserContext.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a 
href="../../../../org/apache/juneau/Context.html" title="class in 
org.apache.juneau">Context</a></h3>
-<code><a 
href="../../../../org/apache/juneau/Context.html#toString--">toString</a></code></li>
+<code><a 
href="../../../../org/apache/juneau/Context.html#getPropertyStore--">getPropertyStore</a>,
 <a 
href="../../../../org/apache/juneau/Context.html#toString--">toString</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html 
b/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html
index fab95d2..b642e4b 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html
@@ -283,7 +283,7 @@ extends <a 
href="../../../../org/apache/juneau/parser/ParserSession.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a 
href="../../../../org/apache/juneau/Session.html" title="class in 
org.apache.juneau">Session</a></h3>
-<code><a 
href="../../../../org/apache/juneau/Session.html#addToCache-java.util.Map-">addToCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#addToCache-java.lang.String-java.lang.Object-">addToCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#addWarning-java.lang.String-java.lang.Object...-">addWarning</a>,
 <a href="../../../../org/apache/juneau/Session.html#finalize--">finalize</a>, 
<a 
href="../../../../org/apache/juneau/Session.html#getFromCache-java.lang.Class-java.lang.String-">getFromCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#getLogger--">getLogger</a>, <a 
href="../../../../org/apache/juneau/Session.html#getProperties--">getProperties</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#getWarnings--">getWarnings</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#hasWarnings--">hasWarnings</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#toString--">toString</a></code></li>
+<code><a 
href="../../../../org/apache/juneau/Session.html#addToCache-java.util.Map-">addToCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#addToCache-java.lang.String-java.lang.Object-">addToCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#addWarning-java.lang.String-java.lang.Object...-">addWarning</a>,
 <a href="../../../../org/apache/juneau/Session.html#finalize--">finalize</a>, 
<a 
href="../../../../org/apache/juneau/Session.html#getFromCache-java.lang.Class-java.lang.String-">getFromCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#getLogger--">getLogger</a>, <a 
href="../../../../org/apache/juneau/Session.html#getProperty-java.lang.Class-java.lang.String-">getProperty</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#getProperty-java.lang.Class-java.lang.String-T-">getProperty</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#getProperty-java.lang.String-">getProperty</a>,
 <a href="../../../../org/apache/juneau/Session.html#g
 etProperty-java.lang.String-java.lang.String-">getProperty</a>, <a 
href="../../../../org/apache/juneau/Session.html#getWarnings--">getWarnings</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#hasWarnings--">hasWarnings</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#toString--">toString</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/org/apache/juneau/xml/XmlSerializerContext.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/xml/XmlSerializerContext.html 
b/content/site/apidocs/org/apache/juneau/xml/XmlSerializerContext.html
index da535df..c0b94c1 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSerializerContext.html
@@ -209,7 +209,7 @@ extends <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;org.apache.juneau.serializer.<a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html" 
title="class in org.apache.juneau.serializer">SerializerContext</a></h3>
-<code><a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_abridged">SERIALIZER_abridged</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_absolutePathUriBase">SERIALIZER_absolutePathUriBase</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_addBeanTypeProperties">SERIALIZER_addBeanTypeProperties</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_detectRecursions">SERIALIZER_detectRecursions</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_ignoreRecursions">SERIALIZER_ignoreRecursions</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_initialDepth">SERIALIZER_initialDepth</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_maxDepth">SERIALIZER_maxDepth</a>,
 <a href="../../../../org/apache/juneau/serializer/SerializerContext.ht
 ml#SERIALIZER_quoteChar">SERIALIZER_quoteChar</a>, <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_relativeUriBase">SERIALIZER_relativeUriBase</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortCollections">SERIALIZER_sortCollections</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortMaps">SERIALIZER_sortMaps</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyCollections">SERIALIZER_trimEmptyCollections</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyMaps">SERIALIZER_trimEmptyMaps</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimNullProperties">SERIALIZER_trimNullProperties</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings">SERIALIZER_trimStrings</a>,
 <a href="../../../../org/
 
apache/juneau/serializer/SerializerContext.html#SERIALIZER_useWhitespace">SERIALIZER_useWhitespace</a></code></li>
+<code><a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_abridged">SERIALIZER_abridged</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_absolutePathUriBase">SERIALIZER_absolutePathUriBase</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_addBeanTypeProperties">SERIALIZER_addBeanTypeProperties</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_detectRecursions">SERIALIZER_detectRecursions</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_ignoreRecursions">SERIALIZER_ignoreRecursions</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_initialDepth">SERIALIZER_initialDepth</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_maxDepth">SERIALIZER_maxDepth</a>,
 <a href="../../../../org/apache/juneau/serializer/SerializerContext.ht
 ml#SERIALIZER_quoteChar">SERIALIZER_quoteChar</a>, <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_relativeUriBase">SERIALIZER_relativeUriBase</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortCollections">SERIALIZER_sortCollections</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortMaps">SERIALIZER_sortMaps</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyCollections">SERIALIZER_trimEmptyCollections</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyMaps">SERIALIZER_trimEmptyMaps</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimNullProperties">SERIALIZER_trimNullProperties</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings">SERIALIZER_trimStrings</a>,
 <a href="../../../../org/
 
apache/juneau/serializer/SerializerContext.html#SERIALIZER_uriRelativity">SERIALIZER_uriRelativity</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_uriResolution">SERIALIZER_uriResolution</a>,
 <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_useWhitespace">SERIALIZER_useWhitespace</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a 
name="fields.inherited.from.class.org.apache.juneau.BeanContext">
@@ -270,7 +270,7 @@ extends <a 
href="../../../../org/apache/juneau/serializer/SerializerContext.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a 
href="../../../../org/apache/juneau/Context.html" title="class in 
org.apache.juneau">Context</a></h3>
-<code><a 
href="../../../../org/apache/juneau/Context.html#toString--">toString</a></code></li>
+<code><a 
href="../../../../org/apache/juneau/Context.html#getPropertyStore--">getPropertyStore</a>,
 <a 
href="../../../../org/apache/juneau/Context.html#toString--">toString</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html 
b/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html
index 39dfde5..ed29812 100644
--- a/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/xml/XmlSerializerSession.html
@@ -271,7 +271,7 @@ extends <a 
href="../../../../org/apache/juneau/serializer/SerializerSession.html
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.<a 
href="../../../../org/apache/juneau/Session.html" title="class in 
org.apache.juneau">Session</a></h3>
-<code><a 
href="../../../../org/apache/juneau/Session.html#addToCache-java.util.Map-">addToCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#addToCache-java.lang.String-java.lang.Object-">addToCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#addWarning-java.lang.String-java.lang.Object...-">addWarning</a>,
 <a href="../../../../org/apache/juneau/Session.html#finalize--">finalize</a>, 
<a 
href="../../../../org/apache/juneau/Session.html#getFromCache-java.lang.Class-java.lang.String-">getFromCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#getLogger--">getLogger</a>, <a 
href="../../../../org/apache/juneau/Session.html#getProperties--">getProperties</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#getWarnings--">getWarnings</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#hasWarnings--">hasWarnings</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#toString--">toString</a></code></li>
+<code><a 
href="../../../../org/apache/juneau/Session.html#addToCache-java.util.Map-">addToCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#addToCache-java.lang.String-java.lang.Object-">addToCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#addWarning-java.lang.String-java.lang.Object...-">addWarning</a>,
 <a href="../../../../org/apache/juneau/Session.html#finalize--">finalize</a>, 
<a 
href="../../../../org/apache/juneau/Session.html#getFromCache-java.lang.Class-java.lang.String-">getFromCache</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#getLogger--">getLogger</a>, <a 
href="../../../../org/apache/juneau/Session.html#getProperty-java.lang.Class-java.lang.String-">getProperty</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#getProperty-java.lang.Class-java.lang.String-T-">getProperty</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#getProperty-java.lang.String-">getProperty</a>,
 <a href="../../../../org/apache/juneau/Session.html#g
 etProperty-java.lang.String-java.lang.String-">getProperty</a>, <a 
href="../../../../org/apache/juneau/Session.html#getWarnings--">getWarnings</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#hasWarnings--">hasWarnings</a>,
 <a 
href="../../../../org/apache/juneau/Session.html#toString--">toString</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html 
b/content/site/apidocs/overview-summary.html
index 29de933..f2dc114 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -6478,6 +6478,16 @@
          <li>New <a 
href="org/apache/juneau/html/annotation/Html.html#render--"><code>@Html.render()</code></a>
 annotation and <a href="org/apache/juneau/html/HtmlRender.html" title="class 
in org.apache.juneau.html"><code>HtmlRender</code></a> class that allows you
             to customize the HTML output and CSS style on bean properties:<br>
             <img class='bordered' src='doc-files/HtmlRender_1.png'>
+         <li><a href="org/apache/juneau/annotation/BeanProperty.html" 
title="annotation in 
org.apache.juneau.annotation"><code>@BeanProperty</code></a> annotation can now 
be applied to getters
+            and setters defined on interfaces.
+         <li>New methods on <a 
href="org/apache/juneau/serializer/SerializerSession.html" title="class in 
org.apache.juneau.serializer"><code>SerializerSession</code></a> and <a 
href="org/apache/juneau/parser/ParserSession.html" title="class in 
org.apache.juneau.parser"><code>ParserSession</code></a>
+            for retrieving context and runtime-override properties:
+            <ul>
+               <li><a 
href="org/apache/juneau/Session.html#getProperty-java.lang.String-"><code>Session.getProperty(String)</code></a>
+               <li><a 
href="org/apache/juneau/Session.html#getProperty-java.lang.String-java.lang.String-"><code>Session.getProperty(String,String)</code></a>
+               <li><a 
href="org/apache/juneau/Session.html#getProperty-java.lang.Class-java.lang.String-"><code>Session.getProperty(Class,String)</code></a>
+               <li><a 
href="org/apache/juneau/Session.html#getProperty-java.lang.Class-java.lang.String-T-"><code>Session.getProperty(Class,String,Object)</code></a>
+            </ul> 
       </ul>
 
       <h6 class='topic'>org.apache.juneau.rest</h6>
@@ -6606,6 +6616,8 @@
       <h6 class='topic'>org.apache.juneau.rest.client</h6>
       <ul class='spaced-list'>
          <li>New <a href="org/apache/juneau/remoteable/Path.html" 
title="annotation in org.apache.juneau.remoteable"><code>@Path</code></a> 
annotation for specifying path variables on remoteable interfaces.
+         <li>New <a href="org/apache/juneau/remoteable/RequestBean.html" 
title="annotation in 
org.apache.juneau.remoteable"><code>@RequestBean</code></a> annotation for 
specifying beans with remoteable annotations
+            defined on properties.
          <li>The following annotations (and related methods on RestCall) can 
now take <code>NameValuePairs</code> and beans as input 
             when using <js>"*"</js> as the name.
             <br><a href="org/apache/juneau/remoteable/FormData.html" 
title="annotation in 
org.apache.juneau.remoteable"><code>@FormData</code></a>,<a 
href="org/apache/juneau/remoteable/FormDataIfNE.html" title="annotation in 
org.apache.juneau.remoteable"><code>@FormDataIfNE</code></a>,

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-tree.html 
b/content/site/apidocs/overview-tree.html
index e251bb4..227b8a9 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -1330,6 +1330,7 @@
 <li type="circle">org.apache.juneau.html.annotation.<a 
href="org/apache/juneau/html/annotation/Html.html" title="annotation in 
org.apache.juneau.html.annotation"><span class="typeNameLink">Html</span></a> 
(implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.html.<a 
href="org/apache/juneau/html/HtmlLink.html" title="annotation in 
org.apache.juneau.html"><span class="typeNameLink">HtmlLink</span></a> 
(implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.json.annotation.<a 
href="org/apache/juneau/json/annotation/Json.html" title="annotation in 
org.apache.juneau.json.annotation"><span class="typeNameLink">Json</span></a> 
(implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.juneau.remoteable.<a 
href="org/apache/juneau/remoteable/RequestBean.html" title="annotation in 
org.apache.juneau.remoteable"><span class="typeNameLink">RequestBean</span></a> 
(implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a 
href="org/apache/juneau/remoteable/RemoteMethod.html" title="annotation in 
org.apache.juneau.remoteable"><span 
class="typeNameLink">RemoteMethod</span></a> (implements 
java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a 
href="org/apache/juneau/remoteable/Remoteable.html" title="annotation in 
org.apache.juneau.remoteable"><span class="typeNameLink">Remoteable</span></a> 
(implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.remoteable.<a 
href="org/apache/juneau/remoteable/QueryIfNE.html" title="annotation in 
org.apache.juneau.remoteable"><span class="typeNameLink">QueryIfNE</span></a> 
(implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/serialized-form.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/serialized-form.html 
b/content/site/apidocs/serialized-form.html
index f70d536..491dede 100644
--- a/content/site/apidocs/serialized-form.html
+++ b/content/site/apidocs/serialized-form.html
@@ -162,7 +162,7 @@
 <ul class="blockList">
 <li class="blockListLast">
 <h4>inner</h4>
-<pre><a href="org/apache/juneau/ObjectMap.html" title="class in 
org.apache.juneau">ObjectMap</a> inner</pre>
+<pre><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true";
 title="class or interface in java.util">Map</a>&lt;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true";
 title="class or interface in java.util">K</a>,<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true";
 title="class or interface in java.util">V</a>&gt; inner</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html 
b/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
index 5ac969b..18e60d9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
@@ -202,7 +202,7 @@
 <span class="sourceLineNo">194</span>            if (ctx.isNotABean(c))<a 
name="line.194"></a>
 <span class="sourceLineNo">195</span>               return "Class matches 
exclude-class list";<a name="line.195"></a>
 <span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>            if (! 
cVis.isVisible(c.getModifiers()))<a name="line.197"></a>
+<span class="sourceLineNo">197</span>            if (! 
(cVis.isVisible(c.getModifiers()) || c.isAnonymousClass()))<a 
name="line.197"></a>
 <span class="sourceLineNo">198</span>               return "Class is not 
public";<a name="line.198"></a>
 <span class="sourceLineNo">199</span><a name="line.199"></a>
 <span class="sourceLineNo">200</span>            if 
(c.isAnnotationPresent(BeanIgnore.class))<a name="line.200"></a>
@@ -565,7 +565,7 @@
 <span class="sourceLineNo">557</span>            Class&lt;?&gt;[] pt = 
m.getParameterTypes();<a name="line.557"></a>
 <span class="sourceLineNo">558</span>            Class&lt;?&gt; rt = 
m.getReturnType();<a name="line.558"></a>
 <span class="sourceLineNo">559</span>            boolean isGetter = false, 
isSetter = false;<a name="line.559"></a>
-<span class="sourceLineNo">560</span>            BeanProperty bp = 
m.getAnnotation(BeanProperty.class);<a name="line.560"></a>
+<span class="sourceLineNo">560</span>            BeanProperty bp = 
getMethodAnnotation(BeanProperty.class, m);<a name="line.560"></a>
 <span class="sourceLineNo">561</span>            String bpName = bp == null ? 
"" : bp.name();<a name="line.561"></a>
 <span class="sourceLineNo">562</span>            if (pt.length == 0) {<a 
name="line.562"></a>
 <span class="sourceLineNo">563</span>               if (n.startsWith("get") 
&amp;&amp; (! rt.equals(Void.TYPE))) {<a name="line.563"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.Builder.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.Builder.html 
b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.Builder.html
index ee485b5..6e07570 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.Builder.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.Builder.html
@@ -140,7 +140,7 @@
 <span class="sourceLineNo">132</span>         }<a name="line.132"></a>
 <span class="sourceLineNo">133</span><a name="line.133"></a>
 <span class="sourceLineNo">134</span>         if (getter != null) {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>            BeanProperty p = 
getter.getAnnotation(BeanProperty.class);<a name="line.135"></a>
+<span class="sourceLineNo">135</span>            BeanProperty p = 
getMethodAnnotation(BeanProperty.class, getter);<a name="line.135"></a>
 <span class="sourceLineNo">136</span>            if (rawTypeMeta == null)<a 
name="line.136"></a>
 <span class="sourceLineNo">137</span>               rawTypeMeta = 
f.resolveClassMeta(p, getter.getGenericReturnType(), typeVarImpls);<a 
name="line.137"></a>
 <span class="sourceLineNo">138</span>            isUri |= (rawTypeMeta.isUri() 
|| getter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a 
name="line.138"></a>
@@ -154,7 +154,7 @@
 <span class="sourceLineNo">146</span>         }<a name="line.146"></a>
 <span class="sourceLineNo">147</span><a name="line.147"></a>
 <span class="sourceLineNo">148</span>         if (setter != null) {<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>            BeanProperty p = 
setter.getAnnotation(BeanProperty.class);<a name="line.149"></a>
+<span class="sourceLineNo">149</span>            BeanProperty p = 
getMethodAnnotation(BeanProperty.class, setter);<a name="line.149"></a>
 <span class="sourceLineNo">150</span>            if (rawTypeMeta == null)<a 
name="line.150"></a>
 <span class="sourceLineNo">151</span>               rawTypeMeta = 
f.resolveClassMeta(p, setter.getGenericParameterTypes()[0], typeVarImpls);<a 
name="line.151"></a>
 <span class="sourceLineNo">152</span>            isUri |= (rawTypeMeta.isUri() 
|| setter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a 
name="line.152"></a>
@@ -232,7 +232,7 @@
 <span class="sourceLineNo">224</span>         if (c == Null.class)<a 
name="line.224"></a>
 <span class="sourceLineNo">225</span>            return null;<a 
name="line.225"></a>
 <span class="sourceLineNo">226</span>         try {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>            if 
(ClassUtils.isParentClass(PojoSwap.class, c)) {<a name="line.227"></a>
+<span class="sourceLineNo">227</span>            if 
(isParentClass(PojoSwap.class, c)) {<a name="line.227"></a>
 <span class="sourceLineNo">228</span>               return 
(PojoSwap)c.newInstance();<a name="line.228"></a>
 <span class="sourceLineNo">229</span>            }<a name="line.229"></a>
 <span class="sourceLineNo">230</span>            throw new 
RuntimeException("TODO - Surrogate swaps not yet supported.");<a 
name="line.230"></a>
@@ -900,75 +900,96 @@
 <span class="sourceLineNo">892</span>         appendAnnotations(a, 
field.getType(), l);<a name="line.892"></a>
 <span class="sourceLineNo">893</span>      }<a name="line.893"></a>
 <span class="sourceLineNo">894</span>      if (getter != null) {<a 
name="line.894"></a>
-<span class="sourceLineNo">895</span>         addIfNotNull(l, 
getter.getAnnotation(a));<a name="line.895"></a>
+<span class="sourceLineNo">895</span>         addIfNotNull(l, 
getMethodAnnotation(a, getter));<a name="line.895"></a>
 <span class="sourceLineNo">896</span>         appendAnnotations(a, 
getter.getReturnType(), l);<a name="line.896"></a>
 <span class="sourceLineNo">897</span>      }<a name="line.897"></a>
 <span class="sourceLineNo">898</span>      if (setter != null) {<a 
name="line.898"></a>
-<span class="sourceLineNo">899</span>         addIfNotNull(l, 
setter.getAnnotation(a));<a name="line.899"></a>
+<span class="sourceLineNo">899</span>         addIfNotNull(l, 
getMethodAnnotation(a, setter));<a name="line.899"></a>
 <span class="sourceLineNo">900</span>         appendAnnotations(a, 
setter.getReturnType(), l);<a name="line.900"></a>
 <span class="sourceLineNo">901</span>      }<a name="line.901"></a>
-<span class="sourceLineNo">902</span>      appendAnnotations(a, 
this.getBeanMeta().getClassMeta().getInnerClass(), l);<a name="line.902"></a>
-<span class="sourceLineNo">903</span>      return l;<a name="line.903"></a>
-<span class="sourceLineNo">904</span>   }<a name="line.904"></a>
-<span class="sourceLineNo">905</span><a name="line.905"></a>
-<span class="sourceLineNo">906</span>   private Object transform(BeanSession 
session, Object o) throws SerializeException {<a name="line.906"></a>
-<span class="sourceLineNo">907</span>      // First use swap defined via 
@BeanProperty.<a name="line.907"></a>
-<span class="sourceLineNo">908</span>      if (swap != null)<a 
name="line.908"></a>
-<span class="sourceLineNo">909</span>         return swap.swap(session, o);<a 
name="line.909"></a>
-<span class="sourceLineNo">910</span>      if (o == null)<a 
name="line.910"></a>
-<span class="sourceLineNo">911</span>         return null;<a 
name="line.911"></a>
-<span class="sourceLineNo">912</span>      // Otherwise, look it up via bean 
context.<a name="line.912"></a>
-<span class="sourceLineNo">913</span>      if 
(rawTypeMeta.hasChildPojoSwaps()) {<a name="line.913"></a>
-<span class="sourceLineNo">914</span>         PojoSwap f = 
rawTypeMeta.getChildPojoSwapForSwap(o.getClass());<a name="line.914"></a>
-<span class="sourceLineNo">915</span>         if (f != null)<a 
name="line.915"></a>
-<span class="sourceLineNo">916</span>            return f.swap(session, o);<a 
name="line.916"></a>
-<span class="sourceLineNo">917</span>      }<a name="line.917"></a>
-<span class="sourceLineNo">918</span>      return o;<a name="line.918"></a>
-<span class="sourceLineNo">919</span>   }<a name="line.919"></a>
-<span class="sourceLineNo">920</span><a name="line.920"></a>
-<span class="sourceLineNo">921</span>   private Object unswap(BeanSession 
session, Object o) throws ParseException {<a name="line.921"></a>
-<span class="sourceLineNo">922</span>      if (swap != null)<a 
name="line.922"></a>
-<span class="sourceLineNo">923</span>         return swap.unswap(session, o, 
rawTypeMeta);<a name="line.923"></a>
-<span class="sourceLineNo">924</span>      if (o == null)<a 
name="line.924"></a>
-<span class="sourceLineNo">925</span>         return null;<a 
name="line.925"></a>
-<span class="sourceLineNo">926</span>      if 
(rawTypeMeta.hasChildPojoSwaps()) {<a name="line.926"></a>
-<span class="sourceLineNo">927</span>         PojoSwap f = 
rawTypeMeta.getChildPojoSwapForUnswap(o.getClass());<a name="line.927"></a>
-<span class="sourceLineNo">928</span>         if (f != null)<a 
name="line.928"></a>
-<span class="sourceLineNo">929</span>            return f.unswap(session, o, 
rawTypeMeta);<a name="line.929"></a>
-<span class="sourceLineNo">930</span>      }<a name="line.930"></a>
-<span class="sourceLineNo">931</span>      return o;<a name="line.931"></a>
-<span class="sourceLineNo">932</span>   }<a name="line.932"></a>
-<span class="sourceLineNo">933</span><a name="line.933"></a>
-<span class="sourceLineNo">934</span>   private Object 
applyChildPropertiesFilter(BeanSession session, ClassMeta cm, Object o) {<a 
name="line.934"></a>
-<span class="sourceLineNo">935</span>      if (o == null)<a 
name="line.935"></a>
-<span class="sourceLineNo">936</span>         return null;<a 
name="line.936"></a>
-<span class="sourceLineNo">937</span>      if (cm.isBean())<a 
name="line.937"></a>
-<span class="sourceLineNo">938</span>         return new BeanMap(session, o, 
new BeanMetaFiltered(cm.getBeanMeta(), properties));<a name="line.938"></a>
-<span class="sourceLineNo">939</span>      if (cm.isMap())<a 
name="line.939"></a>
-<span class="sourceLineNo">940</span>         return new FilteredMap(cm, 
(Map)o, properties);<a name="line.940"></a>
-<span class="sourceLineNo">941</span>      if (cm.isObject()) {<a 
name="line.941"></a>
-<span class="sourceLineNo">942</span>         if (o instanceof Map)<a 
name="line.942"></a>
-<span class="sourceLineNo">943</span>            return new FilteredMap(cm, 
(Map)o, properties);<a name="line.943"></a>
-<span class="sourceLineNo">944</span>         BeanMeta bm = 
beanContext.getBeanMeta(o.getClass());<a name="line.944"></a>
-<span class="sourceLineNo">945</span>         if (bm != null)<a 
name="line.945"></a>
-<span class="sourceLineNo">946</span>            return new BeanMap(session, 
o, new BeanMetaFiltered(cm.getBeanMeta(), properties));<a name="line.946"></a>
-<span class="sourceLineNo">947</span>      }<a name="line.947"></a>
-<span class="sourceLineNo">948</span>      return o;<a name="line.948"></a>
-<span class="sourceLineNo">949</span>   }<a name="line.949"></a>
-<span class="sourceLineNo">950</span><a name="line.950"></a>
-<span class="sourceLineNo">951</span>   private static String 
findClassName(Object o) {<a name="line.951"></a>
-<span class="sourceLineNo">952</span>      if (o == null)<a 
name="line.952"></a>
-<span class="sourceLineNo">953</span>         return null;<a 
name="line.953"></a>
-<span class="sourceLineNo">954</span>      if (o instanceof Class)<a 
name="line.954"></a>
-<span class="sourceLineNo">955</span>         return 
((Class&lt;?&gt;)o).getName();<a name="line.955"></a>
-<span class="sourceLineNo">956</span>      return o.getClass().getName();<a 
name="line.956"></a>
-<span class="sourceLineNo">957</span>   }<a name="line.957"></a>
-<span class="sourceLineNo">958</span><a name="line.958"></a>
-<span class="sourceLineNo">959</span>   @Override /* Object */<a 
name="line.959"></a>
-<span class="sourceLineNo">960</span>   public String toString() {<a 
name="line.960"></a>
-<span class="sourceLineNo">961</span>      return name + ": " + 
this.rawTypeMeta.getInnerClass().getName() + ", field=["+field+"], 
getter=["+getter+"], setter=["+setter+"]";<a name="line.961"></a>
-<span class="sourceLineNo">962</span>   }<a name="line.962"></a>
-<span class="sourceLineNo">963</span>}<a name="line.963"></a>
+<span class="sourceLineNo">902</span><a name="line.902"></a>
+<span class="sourceLineNo">903</span>      appendAnnotations(a, 
this.getBeanMeta().getClassMeta().getInnerClass(), l);<a name="line.903"></a>
+<span class="sourceLineNo">904</span>      return l;<a name="line.904"></a>
+<span class="sourceLineNo">905</span>   }<a name="line.905"></a>
+<span class="sourceLineNo">906</span><a name="line.906"></a>
+<span class="sourceLineNo">907</span>   /**<a name="line.907"></a>
+<span class="sourceLineNo">908</span>    * Returns the specified annotation on 
the field or methods that define this property.<a name="line.908"></a>
+<span class="sourceLineNo">909</span>    * &lt;p&gt;<a name="line.909"></a>
+<span class="sourceLineNo">910</span>    * This method will search up the 
parent class/interface hierarchy chain to search for the annotation on<a 
name="line.910"></a>
+<span class="sourceLineNo">911</span>    * overridden getters and setters.<a 
name="line.911"></a>
+<span class="sourceLineNo">912</span>    *<a name="line.912"></a>
+<span class="sourceLineNo">913</span>    * @param a The annotation to search 
for.<a name="line.913"></a>
+<span class="sourceLineNo">914</span>    * @return The annotation, or 
&lt;jk&gt;null&lt;/jk&gt; if it wasn't found.<a name="line.914"></a>
+<span class="sourceLineNo">915</span>    */<a name="line.915"></a>
+<span class="sourceLineNo">916</span>   public &lt;A extends Annotation&gt; A 
getAnnotation(Class&lt;A&gt; a) {<a name="line.916"></a>
+<span class="sourceLineNo">917</span>      A t = null;<a name="line.917"></a>
+<span class="sourceLineNo">918</span>      if (field != null)<a 
name="line.918"></a>
+<span class="sourceLineNo">919</span>         t = field.getAnnotation(a);<a 
name="line.919"></a>
+<span class="sourceLineNo">920</span>      if (t == null &amp;&amp; getter != 
null)<a name="line.920"></a>
+<span class="sourceLineNo">921</span>         t = getMethodAnnotation(a, 
getter);<a name="line.921"></a>
+<span class="sourceLineNo">922</span>      if (t == null &amp;&amp; setter != 
null)<a name="line.922"></a>
+<span class="sourceLineNo">923</span>         t = getMethodAnnotation(a, 
setter);<a name="line.923"></a>
+<span class="sourceLineNo">924</span>      return t;<a name="line.924"></a>
+<span class="sourceLineNo">925</span>   }<a name="line.925"></a>
+<span class="sourceLineNo">926</span><a name="line.926"></a>
+<span class="sourceLineNo">927</span>   private Object transform(BeanSession 
session, Object o) throws SerializeException {<a name="line.927"></a>
+<span class="sourceLineNo">928</span>      // First use swap defined via 
@BeanProperty.<a name="line.928"></a>
+<span class="sourceLineNo">929</span>      if (swap != null)<a 
name="line.929"></a>
+<span class="sourceLineNo">930</span>         return swap.swap(session, o);<a 
name="line.930"></a>
+<span class="sourceLineNo">931</span>      if (o == null)<a 
name="line.931"></a>
+<span class="sourceLineNo">932</span>         return null;<a 
name="line.932"></a>
+<span class="sourceLineNo">933</span>      // Otherwise, look it up via bean 
context.<a name="line.933"></a>
+<span class="sourceLineNo">934</span>      if 
(rawTypeMeta.hasChildPojoSwaps()) {<a name="line.934"></a>
+<span class="sourceLineNo">935</span>         PojoSwap f = 
rawTypeMeta.getChildPojoSwapForSwap(o.getClass());<a name="line.935"></a>
+<span class="sourceLineNo">936</span>         if (f != null)<a 
name="line.936"></a>
+<span class="sourceLineNo">937</span>            return f.swap(session, o);<a 
name="line.937"></a>
+<span class="sourceLineNo">938</span>      }<a name="line.938"></a>
+<span class="sourceLineNo">939</span>      return o;<a name="line.939"></a>
+<span class="sourceLineNo">940</span>   }<a name="line.940"></a>
+<span class="sourceLineNo">941</span><a name="line.941"></a>
+<span class="sourceLineNo">942</span>   private Object unswap(BeanSession 
session, Object o) throws ParseException {<a name="line.942"></a>
+<span class="sourceLineNo">943</span>      if (swap != null)<a 
name="line.943"></a>
+<span class="sourceLineNo">944</span>         return swap.unswap(session, o, 
rawTypeMeta);<a name="line.944"></a>
+<span class="sourceLineNo">945</span>      if (o == null)<a 
name="line.945"></a>
+<span class="sourceLineNo">946</span>         return null;<a 
name="line.946"></a>
+<span class="sourceLineNo">947</span>      if 
(rawTypeMeta.hasChildPojoSwaps()) {<a name="line.947"></a>
+<span class="sourceLineNo">948</span>         PojoSwap f = 
rawTypeMeta.getChildPojoSwapForUnswap(o.getClass());<a name="line.948"></a>
+<span class="sourceLineNo">949</span>         if (f != null)<a 
name="line.949"></a>
+<span class="sourceLineNo">950</span>            return f.unswap(session, o, 
rawTypeMeta);<a name="line.950"></a>
+<span class="sourceLineNo">951</span>      }<a name="line.951"></a>
+<span class="sourceLineNo">952</span>      return o;<a name="line.952"></a>
+<span class="sourceLineNo">953</span>   }<a name="line.953"></a>
+<span class="sourceLineNo">954</span><a name="line.954"></a>
+<span class="sourceLineNo">955</span>   private Object 
applyChildPropertiesFilter(BeanSession session, ClassMeta cm, Object o) {<a 
name="line.955"></a>
+<span class="sourceLineNo">956</span>      if (o == null)<a 
name="line.956"></a>
+<span class="sourceLineNo">957</span>         return null;<a 
name="line.957"></a>
+<span class="sourceLineNo">958</span>      if (cm.isBean())<a 
name="line.958"></a>
+<span class="sourceLineNo">959</span>         return new BeanMap(session, o, 
new BeanMetaFiltered(cm.getBeanMeta(), properties));<a name="line.959"></a>
+<span class="sourceLineNo">960</span>      if (cm.isMap())<a 
name="line.960"></a>
+<span class="sourceLineNo">961</span>         return new FilteredMap(cm, 
(Map)o, properties);<a name="line.961"></a>
+<span class="sourceLineNo">962</span>      if (cm.isObject()) {<a 
name="line.962"></a>
+<span class="sourceLineNo">963</span>         if (o instanceof Map)<a 
name="line.963"></a>
+<span class="sourceLineNo">964</span>            return new FilteredMap(cm, 
(Map)o, properties);<a name="line.964"></a>
+<span class="sourceLineNo">965</span>         BeanMeta bm = 
beanContext.getBeanMeta(o.getClass());<a name="line.965"></a>
+<span class="sourceLineNo">966</span>         if (bm != null)<a 
name="line.966"></a>
+<span class="sourceLineNo">967</span>            return new BeanMap(session, 
o, new BeanMetaFiltered(cm.getBeanMeta(), properties));<a name="line.967"></a>
+<span class="sourceLineNo">968</span>      }<a name="line.968"></a>
+<span class="sourceLineNo">969</span>      return o;<a name="line.969"></a>
+<span class="sourceLineNo">970</span>   }<a name="line.970"></a>
+<span class="sourceLineNo">971</span><a name="line.971"></a>
+<span class="sourceLineNo">972</span>   private static String 
findClassName(Object o) {<a name="line.972"></a>
+<span class="sourceLineNo">973</span>      if (o == null)<a 
name="line.973"></a>
+<span class="sourceLineNo">974</span>         return null;<a 
name="line.974"></a>
+<span class="sourceLineNo">975</span>      if (o instanceof Class)<a 
name="line.975"></a>
+<span class="sourceLineNo">976</span>         return 
((Class&lt;?&gt;)o).getName();<a name="line.976"></a>
+<span class="sourceLineNo">977</span>      return o.getClass().getName();<a 
name="line.977"></a>
+<span class="sourceLineNo">978</span>   }<a name="line.978"></a>
+<span class="sourceLineNo">979</span><a name="line.979"></a>
+<span class="sourceLineNo">980</span>   @Override /* Object */<a 
name="line.980"></a>
+<span class="sourceLineNo">981</span>   public String toString() {<a 
name="line.981"></a>
+<span class="sourceLineNo">982</span>      return name + ": " + 
this.rawTypeMeta.getInnerClass().getName() + ", field=["+field+"], 
getter=["+getter+"], setter=["+setter+"]";<a name="line.982"></a>
+<span class="sourceLineNo">983</span>   }<a name="line.983"></a>
+<span class="sourceLineNo">984</span>}<a name="line.984"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b852a3e8/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html 
b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
index ee485b5..6e07570 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
@@ -140,7 +140,7 @@
 <span class="sourceLineNo">132</span>         }<a name="line.132"></a>
 <span class="sourceLineNo">133</span><a name="line.133"></a>
 <span class="sourceLineNo">134</span>         if (getter != null) {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>            BeanProperty p = 
getter.getAnnotation(BeanProperty.class);<a name="line.135"></a>
+<span class="sourceLineNo">135</span>            BeanProperty p = 
getMethodAnnotation(BeanProperty.class, getter);<a name="line.135"></a>
 <span class="sourceLineNo">136</span>            if (rawTypeMeta == null)<a 
name="line.136"></a>
 <span class="sourceLineNo">137</span>               rawTypeMeta = 
f.resolveClassMeta(p, getter.getGenericReturnType(), typeVarImpls);<a 
name="line.137"></a>
 <span class="sourceLineNo">138</span>            isUri |= (rawTypeMeta.isUri() 
|| getter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a 
name="line.138"></a>
@@ -154,7 +154,7 @@
 <span class="sourceLineNo">146</span>         }<a name="line.146"></a>
 <span class="sourceLineNo">147</span><a name="line.147"></a>
 <span class="sourceLineNo">148</span>         if (setter != null) {<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>            BeanProperty p = 
setter.getAnnotation(BeanProperty.class);<a name="line.149"></a>
+<span class="sourceLineNo">149</span>            BeanProperty p = 
getMethodAnnotation(BeanProperty.class, setter);<a name="line.149"></a>
 <span class="sourceLineNo">150</span>            if (rawTypeMeta == null)<a 
name="line.150"></a>
 <span class="sourceLineNo">151</span>               rawTypeMeta = 
f.resolveClassMeta(p, setter.getGenericParameterTypes()[0], typeVarImpls);<a 
name="line.151"></a>
 <span class="sourceLineNo">152</span>            isUri |= (rawTypeMeta.isUri() 
|| setter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a 
name="line.152"></a>
@@ -232,7 +232,7 @@
 <span class="sourceLineNo">224</span>         if (c == Null.class)<a 
name="line.224"></a>
 <span class="sourceLineNo">225</span>            return null;<a 
name="line.225"></a>
 <span class="sourceLineNo">226</span>         try {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>            if 
(ClassUtils.isParentClass(PojoSwap.class, c)) {<a name="line.227"></a>
+<span class="sourceLineNo">227</span>            if 
(isParentClass(PojoSwap.class, c)) {<a name="line.227"></a>
 <span class="sourceLineNo">228</span>               return 
(PojoSwap)c.newInstance();<a name="line.228"></a>
 <span class="sourceLineNo">229</span>            }<a name="line.229"></a>
 <span class="sourceLineNo">230</span>            throw new 
RuntimeException("TODO - Surrogate swaps not yet supported.");<a 
name="line.230"></a>
@@ -900,75 +900,96 @@
 <span class="sourceLineNo">892</span>         appendAnnotations(a, 
field.getType(), l);<a name="line.892"></a>
 <span class="sourceLineNo">893</span>      }<a name="line.893"></a>
 <span class="sourceLineNo">894</span>      if (getter != null) {<a 
name="line.894"></a>
-<span class="sourceLineNo">895</span>         addIfNotNull(l, 
getter.getAnnotation(a));<a name="line.895"></a>
+<span class="sourceLineNo">895</span>         addIfNotNull(l, 
getMethodAnnotation(a, getter));<a name="line.895"></a>
 <span class="sourceLineNo">896</span>         appendAnnotations(a, 
getter.getReturnType(), l);<a name="line.896"></a>
 <span class="sourceLineNo">897</span>      }<a name="line.897"></a>
 <span class="sourceLineNo">898</span>      if (setter != null) {<a 
name="line.898"></a>
-<span class="sourceLineNo">899</span>         addIfNotNull(l, 
setter.getAnnotation(a));<a name="line.899"></a>
+<span class="sourceLineNo">899</span>         addIfNotNull(l, 
getMethodAnnotation(a, setter));<a name="line.899"></a>
 <span class="sourceLineNo">900</span>         appendAnnotations(a, 
setter.getReturnType(), l);<a name="line.900"></a>
 <span class="sourceLineNo">901</span>      }<a name="line.901"></a>
-<span class="sourceLineNo">902</span>      appendAnnotations(a, 
this.getBeanMeta().getClassMeta().getInnerClass(), l);<a name="line.902"></a>
-<span class="sourceLineNo">903</span>      return l;<a name="line.903"></a>
-<span class="sourceLineNo">904</span>   }<a name="line.904"></a>
-<span class="sourceLineNo">905</span><a name="line.905"></a>
-<span class="sourceLineNo">906</span>   private Object transform(BeanSession 
session, Object o) throws SerializeException {<a name="line.906"></a>
-<span class="sourceLineNo">907</span>      // First use swap defined via 
@BeanProperty.<a name="line.907"></a>
-<span class="sourceLineNo">908</span>      if (swap != null)<a 
name="line.908"></a>
-<span class="sourceLineNo">909</span>         return swap.swap(session, o);<a 
name="line.909"></a>
-<span class="sourceLineNo">910</span>      if (o == null)<a 
name="line.910"></a>
-<span class="sourceLineNo">911</span>         return null;<a 
name="line.911"></a>
-<span class="sourceLineNo">912</span>      // Otherwise, look it up via bean 
context.<a name="line.912"></a>
-<span class="sourceLineNo">913</span>      if 
(rawTypeMeta.hasChildPojoSwaps()) {<a name="line.913"></a>
-<span class="sourceLineNo">914</span>         PojoSwap f = 
rawTypeMeta.getChildPojoSwapForSwap(o.getClass());<a name="line.914"></a>
-<span class="sourceLineNo">915</span>         if (f != null)<a 
name="line.915"></a>
-<span class="sourceLineNo">916</span>            return f.swap(session, o);<a 
name="line.916"></a>
-<span class="sourceLineNo">917</span>      }<a name="line.917"></a>
-<span class="sourceLineNo">918</span>      return o;<a name="line.918"></a>
-<span class="sourceLineNo">919</span>   }<a name="line.919"></a>
-<span class="sourceLineNo">920</span><a name="line.920"></a>
-<span class="sourceLineNo">921</span>   private Object unswap(BeanSession 
session, Object o) throws ParseException {<a name="line.921"></a>
-<span class="sourceLineNo">922</span>      if (swap != null)<a 
name="line.922"></a>
-<span class="sourceLineNo">923</span>         return swap.unswap(session, o, 
rawTypeMeta);<a name="line.923"></a>
-<span class="sourceLineNo">924</span>      if (o == null)<a 
name="line.924"></a>
-<span class="sourceLineNo">925</span>         return null;<a 
name="line.925"></a>
-<span class="sourceLineNo">926</span>      if 
(rawTypeMeta.hasChildPojoSwaps()) {<a name="line.926"></a>
-<span class="sourceLineNo">927</span>         PojoSwap f = 
rawTypeMeta.getChildPojoSwapForUnswap(o.getClass());<a name="line.927"></a>
-<span class="sourceLineNo">928</span>         if (f != null)<a 
name="line.928"></a>
-<span class="sourceLineNo">929</span>            return f.unswap(session, o, 
rawTypeMeta);<a name="line.929"></a>
-<span class="sourceLineNo">930</span>      }<a name="line.930"></a>
-<span class="sourceLineNo">931</span>      return o;<a name="line.931"></a>
-<span class="sourceLineNo">932</span>   }<a name="line.932"></a>
-<span class="sourceLineNo">933</span><a name="line.933"></a>
-<span class="sourceLineNo">934</span>   private Object 
applyChildPropertiesFilter(BeanSession session, ClassMeta cm, Object o) {<a 
name="line.934"></a>
-<span class="sourceLineNo">935</span>      if (o == null)<a 
name="line.935"></a>
-<span class="sourceLineNo">936</span>         return null;<a 
name="line.936"></a>
-<span class="sourceLineNo">937</span>      if (cm.isBean())<a 
name="line.937"></a>
-<span class="sourceLineNo">938</span>         return new BeanMap(session, o, 
new BeanMetaFiltered(cm.getBeanMeta(), properties));<a name="line.938"></a>
-<span class="sourceLineNo">939</span>      if (cm.isMap())<a 
name="line.939"></a>
-<span class="sourceLineNo">940</span>         return new FilteredMap(cm, 
(Map)o, properties);<a name="line.940"></a>
-<span class="sourceLineNo">941</span>      if (cm.isObject()) {<a 
name="line.941"></a>
-<span class="sourceLineNo">942</span>         if (o instanceof Map)<a 
name="line.942"></a>
-<span class="sourceLineNo">943</span>            return new FilteredMap(cm, 
(Map)o, properties);<a name="line.943"></a>
-<span class="sourceLineNo">944</span>         BeanMeta bm = 
beanContext.getBeanMeta(o.getClass());<a name="line.944"></a>
-<span class="sourceLineNo">945</span>         if (bm != null)<a 
name="line.945"></a>
-<span class="sourceLineNo">946</span>            return new BeanMap(session, 
o, new BeanMetaFiltered(cm.getBeanMeta(), properties));<a name="line.946"></a>
-<span class="sourceLineNo">947</span>      }<a name="line.947"></a>
-<span class="sourceLineNo">948</span>      return o;<a name="line.948"></a>
-<span class="sourceLineNo">949</span>   }<a name="line.949"></a>
-<span class="sourceLineNo">950</span><a name="line.950"></a>
-<span class="sourceLineNo">951</span>   private static String 
findClassName(Object o) {<a name="line.951"></a>
-<span class="sourceLineNo">952</span>      if (o == null)<a 
name="line.952"></a>
-<span class="sourceLineNo">953</span>         return null;<a 
name="line.953"></a>
-<span class="sourceLineNo">954</span>      if (o instanceof Class)<a 
name="line.954"></a>
-<span class="sourceLineNo">955</span>         return 
((Class&lt;?&gt;)o).getName();<a name="line.955"></a>
-<span class="sourceLineNo">956</span>      return o.getClass().getName();<a 
name="line.956"></a>
-<span class="sourceLineNo">957</span>   }<a name="line.957"></a>
-<span class="sourceLineNo">958</span><a name="line.958"></a>
-<span class="sourceLineNo">959</span>   @Override /* Object */<a 
name="line.959"></a>
-<span class="sourceLineNo">960</span>   public String toString() {<a 
name="line.960"></a>
-<span class="sourceLineNo">961</span>      return name + ": " + 
this.rawTypeMeta.getInnerClass().getName() + ", field=["+field+"], 
getter=["+getter+"], setter=["+setter+"]";<a name="line.961"></a>
-<span class="sourceLineNo">962</span>   }<a name="line.962"></a>
-<span class="sourceLineNo">963</span>}<a name="line.963"></a>
+<span class="sourceLineNo">902</span><a name="line.902"></a>
+<span class="sourceLineNo">903</span>      appendAnnotations(a, 
this.getBeanMeta().getClassMeta().getInnerClass(), l);<a name="line.903"></a>
+<span class="sourceLineNo">904</span>      return l;<a name="line.904"></a>
+<span class="sourceLineNo">905</span>   }<a name="line.905"></a>
+<span class="sourceLineNo">906</span><a name="line.906"></a>
+<span class="sourceLineNo">907</span>   /**<a name="line.907"></a>
+<span class="sourceLineNo">908</span>    * Returns the specified annotation on 
the field or methods that define this property.<a name="line.908"></a>
+<span class="sourceLineNo">909</span>    * &lt;p&gt;<a name="line.909"></a>
+<span class="sourceLineNo">910</span>    * This method will search up the 
parent class/interface hierarchy chain to search for the annotation on<a 
name="line.910"></a>
+<span class="sourceLineNo">911</span>    * overridden getters and setters.<a 
name="line.911"></a>
+<span class="sourceLineNo">912</span>    *<a name="line.912"></a>
+<span class="sourceLineNo">913</span>    * @param a The annotation to search 
for.<a name="line.913"></a>
+<span class="sourceLineNo">914</span>    * @return The annotation, or 
&lt;jk&gt;null&lt;/jk&gt; if it wasn't found.<a name="line.914"></a>
+<span class="sourceLineNo">915</span>    */<a name="line.915"></a>
+<span class="sourceLineNo">916</span>   public &lt;A extends Annotation&gt; A 
getAnnotation(Class&lt;A&gt; a) {<a name="line.916"></a>
+<span class="sourceLineNo">917</span>      A t = null;<a name="line.917"></a>
+<span class="sourceLineNo">918</span>      if (field != null)<a 
name="line.918"></a>
+<span class="sourceLineNo">919</span>         t = field.getAnnotation(a);<a 
name="line.919"></a>
+<span class="sourceLineNo">920</span>      if (t == null &amp;&amp; getter != 
null)<a name="line.920"></a>
+<span class="sourceLineNo">921</span>         t = getMethodAnnotation(a, 
getter);<a name="line.921"></a>
+<span class="sourceLineNo">922</span>      if (t == null &amp;&amp; setter != 
null)<a name="line.922"></a>
+<span class="sourceLineNo">923</span>         t = getMethodAnnotation(a, 
setter);<a name="line.923"></a>
+<span class="sourceLineNo">924</span>      return t;<a name="line.924"></a>
+<span class="sourceLineNo">925</span>   }<a name="line.925"></a>
+<span class="sourceLineNo">926</span><a name="line.926"></a>
+<span class="sourceLineNo">927</span>   private Object transform(BeanSession 
session, Object o) throws SerializeException {<a name="line.927"></a>
+<span class="sourceLineNo">928</span>      // First use swap defined via 
@BeanProperty.<a name="line.928"></a>
+<span class="sourceLineNo">929</span>      if (swap != null)<a 
name="line.929"></a>
+<span class="sourceLineNo">930</span>         return swap.swap(session, o);<a 
name="line.930"></a>
+<span class="sourceLineNo">931</span>      if (o == null)<a 
name="line.931"></a>
+<span class="sourceLineNo">932</span>         return null;<a 
name="line.932"></a>
+<span class="sourceLineNo">933</span>      // Otherwise, look it up via bean 
context.<a name="line.933"></a>
+<span class="sourceLineNo">934</span>      if 
(rawTypeMeta.hasChildPojoSwaps()) {<a name="line.934"></a>
+<span class="sourceLineNo">935</span>         PojoSwap f = 
rawTypeMeta.getChildPojoSwapForSwap(o.getClass());<a name="line.935"></a>
+<span class="sourceLineNo">936</span>         if (f != null)<a 
name="line.936"></a>
+<span class="sourceLineNo">937</span>            return f.swap(session, o);<a 
name="line.937"></a>
+<span class="sourceLineNo">938</span>      }<a name="line.938"></a>
+<span class="sourceLineNo">939</span>      return o;<a name="line.939"></a>
+<span class="sourceLineNo">940</span>   }<a name="line.940"></a>
+<span class="sourceLineNo">941</span><a name="line.941"></a>
+<span class="sourceLineNo">942</span>   private Object unswap(BeanSession 
session, Object o) throws ParseException {<a name="line.942"></a>
+<span class="sourceLineNo">943</span>      if (swap != null)<a 
name="line.943"></a>
+<span class="sourceLineNo">944</span>         return swap.unswap(session, o, 
rawTypeMeta);<a name="line.944"></a>
+<span class="sourceLineNo">945</span>      if (o == null)<a 
name="line.945"></a>
+<span class="sourceLineNo">946</span>         return null;<a 
name="line.946"></a>
+<span class="sourceLineNo">947</span>      if 
(rawTypeMeta.hasChildPojoSwaps()) {<a name="line.947"></a>
+<span class="sourceLineNo">948</span>         PojoSwap f = 
rawTypeMeta.getChildPojoSwapForUnswap(o.getClass());<a name="line.948"></a>
+<span class="sourceLineNo">949</span>         if (f != null)<a 
name="line.949"></a>
+<span class="sourceLineNo">950</span>            return f.unswap(session, o, 
rawTypeMeta);<a name="line.950"></a>
+<span class="sourceLineNo">951</span>      }<a name="line.951"></a>
+<span class="sourceLineNo">952</span>      return o;<a name="line.952"></a>
+<span class="sourceLineNo">953</span>   }<a name="line.953"></a>
+<span class="sourceLineNo">954</span><a name="line.954"></a>
+<span class="sourceLineNo">955</span>   private Object 
applyChildPropertiesFilter(BeanSession session, ClassMeta cm, Object o) {<a 
name="line.955"></a>
+<span class="sourceLineNo">956</span>      if (o == null)<a 
name="line.956"></a>
+<span class="sourceLineNo">957</span>         return null;<a 
name="line.957"></a>
+<span class="sourceLineNo">958</span>      if (cm.isBean())<a 
name="line.958"></a>
+<span class="sourceLineNo">959</span>         return new BeanMap(session, o, 
new BeanMetaFiltered(cm.getBeanMeta(), properties));<a name="line.959"></a>
+<span class="sourceLineNo">960</span>      if (cm.isMap())<a 
name="line.960"></a>
+<span class="sourceLineNo">961</span>         return new FilteredMap(cm, 
(Map)o, properties);<a name="line.961"></a>
+<span class="sourceLineNo">962</span>      if (cm.isObject()) {<a 
name="line.962"></a>
+<span class="sourceLineNo">963</span>         if (o instanceof Map)<a 
name="line.963"></a>
+<span class="sourceLineNo">964</span>            return new FilteredMap(cm, 
(Map)o, properties);<a name="line.964"></a>
+<span class="sourceLineNo">965</span>         BeanMeta bm = 
beanContext.getBeanMeta(o.getClass());<a name="line.965"></a>
+<span class="sourceLineNo">966</span>         if (bm != null)<a 
name="line.966"></a>
+<span class="sourceLineNo">967</span>            return new BeanMap(session, 
o, new BeanMetaFiltered(cm.getBeanMeta(), properties));<a name="line.967"></a>
+<span class="sourceLineNo">968</span>      }<a name="line.968"></a>
+<span class="sourceLineNo">969</span>      return o;<a name="line.969"></a>
+<span class="sourceLineNo">970</span>   }<a name="line.970"></a>
+<span class="sourceLineNo">971</span><a name="line.971"></a>
+<span class="sourceLineNo">972</span>   private static String 
findClassName(Object o) {<a name="line.972"></a>
+<span class="sourceLineNo">973</span>      if (o == null)<a 
name="line.973"></a>
+<span class="sourceLineNo">974</span>         return null;<a 
name="line.974"></a>
+<span class="sourceLineNo">975</span>      if (o instanceof Class)<a 
name="line.975"></a>
+<span class="sourceLineNo">976</span>         return 
((Class&lt;?&gt;)o).getName();<a name="line.976"></a>
+<span class="sourceLineNo">977</span>      return o.getClass().getName();<a 
name="line.977"></a>
+<span class="sourceLineNo">978</span>   }<a name="line.978"></a>
+<span class="sourceLineNo">979</span><a name="line.979"></a>
+<span class="sourceLineNo">980</span>   @Override /* Object */<a 
name="line.980"></a>
+<span class="sourceLineNo">981</span>   public String toString() {<a 
name="line.981"></a>
+<span class="sourceLineNo">982</span>      return name + ": " + 
this.rawTypeMeta.getInnerClass().getName() + ", field=["+field+"], 
getter=["+getter+"], setter=["+setter+"]";<a name="line.982"></a>
+<span class="sourceLineNo">983</span>   }<a name="line.983"></a>
+<span class="sourceLineNo">984</span>}<a name="line.984"></a>
 
 
 


Reply via email to