You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/11/26 19:46:30 UTC

[21/51] [partial] juneau-website git commit: New Security-Best-Practices section in javadocs.

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/svl/Var.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/Var.html b/content/site/apidocs/org/apache/juneau/svl/Var.html
index ac92b47..94d76e9 100644
--- a/content/site/apidocs/org/apache/juneau/svl/Var.html
+++ b/content/site/apidocs/org/apache/juneau/svl/Var.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":6,"i3":6};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":6,"i5":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -181,26 +181,38 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
+<td class="colFirst"><code>protected boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/Var.html#allowNested--">allowNested</a></span>()</code>
+<div class="block">Returns whether nested variables are supported by this variable.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>protected boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/Var.html#allowRecurse--">allowRecurse</a></span>()</code>
+<div class="block">Returns whether variables in the resolved contents of this variable should also be resolved.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/Var.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">doResolve</a></span>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
          <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;arg)</code>
 <div class="block">The method called from <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/Var.html#getName--">getName</a></span>()</code>
 <div class="block">Return the name of this variable.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve</a></span>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
        <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;arg)</code>
 <div class="block">The interface that needs to be implemented for subclasses of <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/Var.html#resolveTo-org.apache.juneau.svl.VarResolverSession-java.io.Writer-java.lang.String-">resolveTo</a></span>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
          <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;w,
@@ -274,13 +286,62 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="allowNested--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>allowNested</h4>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.101">allowNested</a>()</pre>
+<div class="block">Returns whether nested variables are supported by this variable.
+ 
+ <p>
+ For example, in <js>"$X{$Y{xxx}}"</js>, $Y is a nested variable that will be resolved if this method returns
+ <jk>true</jk>.
+ 
+ <p>
+ The default implementation of this method always returns <jk>true</jk>.  
+ Subclasses can override this method to override the default behavior.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if nested variables are supported by this variable.</dd>
+</dl>
+</li>
+</ul>
+<a name="allowRecurse--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>allowRecurse</h4>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.123">allowRecurse</a>()</pre>
+<div class="block">Returns whether variables in the resolved contents of this variable should also be resolved.
+ 
+ <p>
+ For example, if <js>"$X{xxx}"</js> resolves to <js>"$Y{xxx}"<js>, then the $Y variable will be recursively
+ resolved if this method returns <jk>true</jk>.
+ 
+ <p>
+ The default implementation of this method always returns <jk>true</jk>.  
+ Subclasses can override this method to override the default behavior.
+ 
+ <h6 class='topic'>Important Note</h6>
+ <p>
+ As a general rule, variables that resolve user-entered data should not be recursively resolved as this may 
+ cause a security hole.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if resolved variables should be recursively resolved.</dd>
+</dl>
+</li>
+</ul>
 <a name="doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>doResolve</h4>
-<pre>protected&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/svl/Var.html#line.100">doResolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>protected&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/svl/Var.html#line.139">doResolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
                            <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;arg)
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">The method called from <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.
@@ -305,7 +366,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>resolve</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/svl/Var.html#line.112">resolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<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/svl/Var.html#line.151">resolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
                                <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;arg)
                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">The interface that needs to be implemented for subclasses of <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>.</div>
@@ -326,7 +387,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolveTo</h4>
-<pre>public abstract&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.122">resolveTo</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public abstract&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.161">resolveTo</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
                                <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;w,
                                <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;arg)
                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/svl/VarResolverBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/VarResolverBuilder.html b/content/site/apidocs/org/apache/juneau/svl/VarResolverBuilder.html
index c28140e..c73f042 100644
--- a/content/site/apidocs/org/apache/juneau/svl/VarResolverBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/svl/VarResolverBuilder.html
@@ -222,7 +222,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>build</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.35">build</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.34">build</a>()</pre>
 <div class="block">Create a new var resolver using the settings in this builder.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -236,7 +236,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>vars</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.48">vars</a>(<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;vars)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.47">vars</a>(<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;vars)</pre>
 <div class="block">Register new variables with this resolver.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -253,7 +253,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>defaultVars</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.70">defaultVars</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.69">defaultVars</a>()</pre>
 <div class="block">Adds the default variables to this builder.
 
  <p>
@@ -276,7 +276,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>contextObject</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.85">contextObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.84">contextObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;object)</pre>
 <div class="block">Associates a context object with this resolver.
 
@@ -298,7 +298,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>contextObjects</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.100">contextObjects</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">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;map)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.99">contextObjects</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">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;map)</pre>
 <div class="block">Associates multiple context objects with this resolver.
 
  <p>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
index 287b4b1..60b88cb 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
@@ -246,7 +246,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></h3>
-<code><a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</a></code></li>
+<code><a href="../../../../../org/apache/juneau/svl/Var.html#allowNested--">allowNested</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#allowRecurse--">allowRecurse</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</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/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html
index 2e91d24..e04c954 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html
@@ -231,7 +231,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></h3>
-<code><a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</a></code></li>
+<code><a href="../../../../../org/apache/juneau/svl/Var.html#allowNested--">allowNested</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#allowRecurse--">allowRecurse</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</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/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/svl/vars/IfVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/IfVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/IfVar.html
index 9e86794..54541fe 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/IfVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/IfVar.html
@@ -241,7 +241,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></h3>
-<code><a href="../../../../../org/apache/juneau/svl/Var.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">doResolve</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</a></code></li>
+<code><a href="../../../../../org/apache/juneau/svl/Var.html#allowNested--">allowNested</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#allowRecurse--">allowRecurse</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">doResolve</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</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/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/svl/vars/ManifestFileVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/ManifestFileVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/ManifestFileVar.html
index 06238c1..97239c6 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/ManifestFileVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/ManifestFileVar.html
@@ -246,7 +246,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></h3>
-<code><a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</a></code></li>
+<code><a href="../../../../../org/apache/juneau/svl/Var.html#allowNested--">allowNested</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#allowRecurse--">allowRecurse</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</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/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/svl/vars/SwitchVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/SwitchVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/SwitchVar.html
index 3395b89..f35d509 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/SwitchVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/SwitchVar.html
@@ -238,7 +238,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></h3>
-<code><a href="../../../../../org/apache/juneau/svl/Var.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">doResolve</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</a></code></li>
+<code><a href="../../../../../org/apache/juneau/svl/Var.html#allowNested--">allowNested</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#allowRecurse--">allowRecurse</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">doResolve</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</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/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/svl/vars/SystemPropertiesVar.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/SystemPropertiesVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/SystemPropertiesVar.html
index e84cee2..272e407 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/SystemPropertiesVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/SystemPropertiesVar.html
@@ -223,7 +223,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MapVar.html" title="class
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></h3>
-<code><a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</a></code></li>
+<code><a href="../../../../../org/apache/juneau/svl/Var.html#allowNested--">allowNested</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#allowRecurse--">allowRecurse</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</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/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/transform/AnnotationBeanFilterBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/transform/AnnotationBeanFilterBuilder.html b/content/site/apidocs/org/apache/juneau/transform/AnnotationBeanFilterBuilder.html
index 34861c4..65d1ae4 100644
--- a/content/site/apidocs/org/apache/juneau/transform/AnnotationBeanFilterBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/transform/AnnotationBeanFilterBuilder.html
@@ -131,7 +131,8 @@ extends <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html"
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/transform/AnnotationBeanFilterBuilder.html#AnnotationBeanFilterBuilder-java.lang.Class-java.util.Map-">AnnotationBeanFilterBuilder</a></span>(<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;annotatedClass,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/transform/AnnotationBeanFilterBuilder.html#AnnotationBeanFilterBuilder-org.apache.juneau.BeanContext-java.lang.Class-java.util.Map-">AnnotationBeanFilterBuilder</a></span>(<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a>&nbsp;bc,
+                           <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;annotatedClass,
                            <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/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;,<a href="../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation">Bean</a>&gt;&nbsp;annotations)</code>
 <div class="block">Constructor.</div>
 </td>
@@ -150,7 +151,7 @@ extends <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html"
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.transform.<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a></h3>
-<code><a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#beanDictionary-java.lang.Class...-">beanDictionary</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#build--">build</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#excludeProperties-java.lang.String...-">excludeProperties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#interfaceClass-java.lang.Class-">interfaceClass</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#properties-java.lang.String...-">properties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#propertyNamer-java.lang.Class-">propertyNamer</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#propertyNamer-org.apache.juneau.PropertyNamer-">propertyNamer</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#setBeanDictionary-java.lang.Class...-">setBeanDictionary
 </a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#sortProperties-boolean-">sortProperties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#stopClass-java.lang.Class-">stopClass</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#typeName-java.lang.String-">typeName</a></code></li>
+<code><a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#beanDictionary-java.lang.Class...-">beanDictionary</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#build--">build</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#excludeProperties-java.lang.String...-">excludeProperties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#interfaceClass-java.lang.Class-">interfaceClass</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#properties-java.lang.String...-">properties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#propertyNamer-org.apache.juneau.BeanContext-java.lang.Class-">propertyNamer</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#propertyNamer-org.apache.juneau.PropertyNamer-">propertyNamer</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#setBeanDictionary-java.lan
 g.Class...-">setBeanDictionary</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#sortProperties-boolean-">sortProperties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#stopClass-java.lang.Class-">stopClass</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#typeName-java.lang.String-">typeName</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -173,18 +174,21 @@ extends <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html"
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="AnnotationBeanFilterBuilder-java.lang.Class-java.util.Map-">
+<a name="AnnotationBeanFilterBuilder-org.apache.juneau.BeanContext-java.lang.Class-java.util.Map-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>AnnotationBeanFilterBuilder</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/AnnotationBeanFilterBuilder.html#line.38">AnnotationBeanFilterBuilder</a>(<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;annotatedClass,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/AnnotationBeanFilterBuilder.html#line.41">AnnotationBeanFilterBuilder</a>(<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a>&nbsp;bc,
+                                   <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;annotatedClass,
                                    <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/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;,<a href="../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation">Bean</a>&gt;&nbsp;annotations)
                             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>bc</code> - The bean context creating this builder.  
+   Used to instantiate <a href="../../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau"><code>PropertyNamers</code></a>.</dd>
 <dd><code>annotatedClass</code> - The class found to have a <a href="../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation"><code>@Bean</code></a> annotation.</dd>
 <dd><code>annotations</code> - The <a href="../../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation"><code>@Bean</code></a> annotations found on the class and all parent classes in child-to-parent order.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/transform/BeanFilterBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/transform/BeanFilterBuilder.html b/content/site/apidocs/org/apache/juneau/transform/BeanFilterBuilder.html
index 125b1e0..4a6c2e7 100644
--- a/content/site/apidocs/org/apache/juneau/transform/BeanFilterBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/transform/BeanFilterBuilder.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.49">BeanFilterBuilder</a>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.47">BeanFilterBuilder</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Builder class for <a href="../../../../org/apache/juneau/transform/BeanFilter.html" title="class in org.apache.juneau.transform"><code>BeanFilter</code></a> objects.
 
@@ -208,7 +208,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#propertyNamer-java.lang.Class-">propertyNamer</a></span>(<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;c)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#propertyNamer-org.apache.juneau.BeanContext-java.lang.Class-">propertyNamer</a></span>(<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a>&nbsp;bc,
+             <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;c)</code>
 <div class="block">The property namer to use to name bean properties.</div>
 </td>
 </tr>
@@ -270,7 +271,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>BeanFilterBuilder</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.64">BeanFilterBuilder</a>(<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;beanClass)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.62">BeanFilterBuilder</a>(<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;beanClass)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -292,7 +293,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>typeName</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.74">typeName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;typeName)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.72">typeName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;typeName)</pre>
 <div class="block">Specifies the type name for this bean.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -308,7 +309,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>properties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.90">properties</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;properties)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.88">properties</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;properties)</pre>
 <div class="block">Specifies the set and order of names of properties associated with the bean class.
 
  <p>
@@ -329,7 +330,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>excludeProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.101">excludeProperties</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;excludeProperties)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.99">excludeProperties</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;excludeProperties)</pre>
 <div class="block">Specifies the list of properties to ignore on a bean.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -345,7 +346,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>interfaceClass</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.145">interfaceClass</a>(<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;interfaceClass)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.143">interfaceClass</a>(<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;interfaceClass)</pre>
 <div class="block">Identifies a class to be used as the interface class for this and all subclasses.
 
  <p>
@@ -371,7 +372,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
       }
    }
 
-   JsonSerializer s = new JsonSerializerBuilder().beanFilters(AFilter.<jk>class</jk>).build();
+   JsonSerializer s = JsonSerializer.create().beanFilters(AFilter.<jk>class</jk>).build();
    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>
@@ -394,7 +395,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>stopClass</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.179">stopClass</a>(<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;stopClass)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.177">stopClass</a>(<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;stopClass)</pre>
 <div class="block">Identifies a stop class for this class and all subclasses.
 
  <p>
@@ -433,7 +434,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>sortProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.190">sortProperties</a>(boolean&nbsp;sortProperties)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.188">sortProperties</a>(boolean&nbsp;sortProperties)</pre>
 <div class="block">Sort properties in alphabetical order.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -449,7 +450,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>propertyNamer</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.201">propertyNamer</a>(<a href="../../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>&nbsp;propertyNamer)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.199">propertyNamer</a>(<a href="../../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>&nbsp;propertyNamer)</pre>
 <div class="block">The property namer to use to name bean properties.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -459,17 +460,19 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
-<a name="propertyNamer-java.lang.Class-">
+<a name="propertyNamer-org.apache.juneau.BeanContext-java.lang.Class-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>propertyNamer</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.213">propertyNamer</a>(<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;c)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.212">propertyNamer</a>(<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a>&nbsp;bc,
+                                       <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;c)
                                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">The property namer to use to name bean properties.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>bc</code> - The bean context used to instantiate the property namer.</dd>
 <dd><code>c</code> - The property namer class.  Must have a public no-arg constructor.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>This object (for method chaining).</dd>
@@ -484,7 +487,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setBeanDictionary</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.224">setBeanDictionary</a>(<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;c)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.223">setBeanDictionary</a>(<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;c)</pre>
 <div class="block">Sets the contents of this bean's bean dictionary.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -500,7 +503,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>beanDictionary</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.235">beanDictionary</a>(<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;c)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.234">beanDictionary</a>(<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;c)</pre>
 <div class="block">Adds classes to this bean's bean dictionary.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -516,7 +519,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>build</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilter.html" title="class in org.apache.juneau.transform">BeanFilter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.248">build</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/transform/BeanFilter.html" title="class in org.apache.juneau.transform">BeanFilter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/BeanFilterBuilder.html#line.247">build</a>()</pre>
 <div class="block">Creates a <a href="../../../../org/apache/juneau/transform/BeanFilter.html" title="class in org.apache.juneau.transform"><code>BeanFilter</code></a> with settings in this builder class.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/transform/InterfaceBeanFilterBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/transform/InterfaceBeanFilterBuilder.html b/content/site/apidocs/org/apache/juneau/transform/InterfaceBeanFilterBuilder.html
index b8c963f..6ee94a3 100644
--- a/content/site/apidocs/org/apache/juneau/transform/InterfaceBeanFilterBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/transform/InterfaceBeanFilterBuilder.html
@@ -133,7 +133,8 @@ extends <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html"
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/transform/InterfaceBeanFilterBuilder.html#InterfaceBeanFilterBuilder-java.lang.Class-">InterfaceBeanFilterBuilder</a></span>(<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;interfaceClass)</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/transform/InterfaceBeanFilterBuilder.html#InterfaceBeanFilterBuilder-org.apache.juneau.BeanContext-java.lang.Class-">InterfaceBeanFilterBuilder</a></span>(<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a>&nbsp;bc,
+                          <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;interfaceClass)</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -151,7 +152,7 @@ extends <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html"
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.transform.<a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html" title="class in org.apache.juneau.transform">BeanFilterBuilder</a></h3>
-<code><a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#beanDictionary-java.lang.Class...-">beanDictionary</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#build--">build</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#excludeProperties-java.lang.String...-">excludeProperties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#interfaceClass-java.lang.Class-">interfaceClass</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#properties-java.lang.String...-">properties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#propertyNamer-java.lang.Class-">propertyNamer</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#propertyNamer-org.apache.juneau.PropertyNamer-">propertyNamer</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#setBeanDictionary-java.lang.Class...-">setBeanDictionary
 </a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#sortProperties-boolean-">sortProperties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#stopClass-java.lang.Class-">stopClass</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#typeName-java.lang.String-">typeName</a></code></li>
+<code><a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#beanDictionary-java.lang.Class...-">beanDictionary</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#build--">build</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#excludeProperties-java.lang.String...-">excludeProperties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#interfaceClass-java.lang.Class-">interfaceClass</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#properties-java.lang.String...-">properties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#propertyNamer-org.apache.juneau.BeanContext-java.lang.Class-">propertyNamer</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#propertyNamer-org.apache.juneau.PropertyNamer-">propertyNamer</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#setBeanDictionary-java.lan
 g.Class...-">setBeanDictionary</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#sortProperties-boolean-">sortProperties</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#stopClass-java.lang.Class-">stopClass</a>, <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html#typeName-java.lang.String-">typeName</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -174,16 +175,18 @@ extends <a href="../../../../org/apache/juneau/transform/BeanFilterBuilder.html"
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="InterfaceBeanFilterBuilder-java.lang.Class-">
+<a name="InterfaceBeanFilterBuilder-org.apache.juneau.BeanContext-java.lang.Class-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>InterfaceBeanFilterBuilder</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/InterfaceBeanFilterBuilder.html#line.38">InterfaceBeanFilterBuilder</a>(<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;interfaceClass)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/transform/InterfaceBeanFilterBuilder.html#line.39">InterfaceBeanFilterBuilder</a>(<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a>&nbsp;bc,
+                                  <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;interfaceClass)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>bc</code> - Bean context used for instantiating <a href="../../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau"><code>PropertyNamer</code></a> instances.</dd>
 <dd><code>interfaceClass</code> - The class to use as an interface on all child classes.</dd>
 </dl>
 </li>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/transform/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/transform/package-summary.html b/content/site/apidocs/org/apache/juneau/transform/package-summary.html
index 4c0a066..c711131 100644
--- a/content/site/apidocs/org/apache/juneau/transform/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/transform/package-summary.html
@@ -274,7 +274,7 @@
       }
    }
    
-   WriterSerializer s = <jk>new</jk> JsonSerializerBuilder().beanFilters(MyBeanFilter.<jk>class</jk>).build();
+   WriterSerializer s = JsonSerializer.<jsm>create</jsm>().beanFilters(MyBeanFilter.<jk>class</jk>).build();
    Person p = getPerson();
    String json = s.serialize(p);  <jc>// Prints "{age:45,name:'John Smith'}"</jc>
       </p>
@@ -297,7 +297,7 @@
       }
    }
    
-   WriterSerializer s = <jk>new</jk> JsonSerializerBuilder().beanFilters(MyBeanFilter.<jk>class</jk>).build();
+   WriterSerializer s = JsonSerializer.<jsm>create</jsm>().beanFilters(MyBeanFilter.<jk>class</jk>).build();
    Person p = getPerson();
    String json = s.serialize(p);  <jc>// Prints "{age:45}"</jc>
       </p>
@@ -330,12 +330,12 @@
    }
    
    <jc>// Serialize to JSON</jc>
-   WriterSerializer s = <jk>new</jk> JsonSerializerBuilder().beanFilters(MyBeanFilter.<jk>class</jk>).build();
+   WriterSerializer s = JsonSerializer.<jsm>create</jsm>().beanFilters(MyBeanFilter.<jk>class</jk>).build();
    Person person = getPerson();
    String json = s.serialize(p);  <jc>// Prints "{AGE:45,NAME:'John Smith'}"</jc>
    
    <jc>// Parse back into bean</jc>
-   ReaderParser p = <jk>new</jk> JsonParserBuilder().beanFilters(MyBeanFilter.<jk>class</jk>).build();
+   ReaderParser p = JsonParser.<jsm>create</jsm>().beanFilters(MyBeanFilter.<jk>class</jk>).build();
    person = p.parse(json, Person.class); <jc>// Read back into original object</jc>
       </p>
       <p>
@@ -389,7 +389,7 @@
       </p>
       <p class='bcode'>
    <jc>// Serialize to JSON</jc>
-   WriterSerializer s = <jk>new</jk> JsonSerializerBuilder().beanFilters(MyBeanFilter.<jk>class</jk>).build();
+   WriterSerializer s = JsonSerializer.<jsm>create</jsm>().beanFilters(MyBeanFilter.<jk>class</jk>).build();
    MyClass c = <jk>new</jk> MyClassBar();
    String json = s.serialize(p);  <jc>// Prints "{foo:'foo'}"</jc>
       </p>  
@@ -419,7 +419,7 @@
       </p>
       <p class='bcode'>
    <jc>// Serialize to JSON</jc>
-   WriterSerializer s = <jk>new</jk> JsonSerializerBuilder().beanFilters(MyClass.<jk>class</jk>).build();
+   WriterSerializer s = JsonSerializer.<jsm>create</jsm>().beanFilters(MyClass.<jk>class</jk>).build();
       </p>
       <p>
          In fact, this is the shortcut used in the <code>RequestEchoResource</code> sample class:
@@ -532,11 +532,11 @@
    }
 
    <jc>// Create a new JSON serializer, associate our date swap with it, and serialize a sample bean.</jc>
-   Serializer serializer = <jk>new</jk> JsonSerializerBuilder().pojoSwaps(MyDateSwap.<jk>class</jk>).build();
+   Serializer serializer = JsonSerializer.<jsm>create</jsm>().pojoSwaps(MyDateSwap.<jk>class</jk>).build();
    String json = serializer.serialize(<jk>new</jk> MyBean());  <jc>// == "{date:'2012-03-03T04:05:06-0500'}"</jc>
    
    <jc>// Create a JSON parser, associate our date swap with it, and reconstruct our bean (including the date).</jc>
-   ReaderParser parser = <jk>new</jk> JsonParserBuilder().pojoSwaps(MyDateSwap.<jk>class</jk>).build();
+   ReaderParser parser = JsonParser.<jsm>create</jsm>().pojoSwaps(MyDateSwap.<jk>class</jk>).build();
    MyBean bean = parser.parse(json, MyBean.<jk>class</jk>);
    <jk>int</jk> day = bean.<jf>date</jf>.getDay();                   <jc>// == 3</jc>
       </p>
@@ -605,8 +605,8 @@
       </p>
       <p class='bcode'>
    <jc>// Create a JSON serializer and register the BASE64 encoding swap with it.</jc>
-   Serializer serializer = <jk>new</jk> JsonSerializerBuilder().pojoSwaps(ByteArrayBase64Swap.<jk>class</jk>).build();
-   ReaderParser parser = <jk>new</jk> JsonParserBuilder().pojoSwaps(ByteArrayBase64Swap.<jk>class</jk>).build();
+   Serializer serializer = JsonSerializer.<jsm>create</jsm>().pojoSwaps(ByteArrayBase64Swap.<jk>class</jk>).build();
+   ReaderParser parser = JsonParser.<jsm>create</jsm>().pojoSwaps(ByteArrayBase64Swap.<jk>class</jk>).build();
    
    <jk>byte</jk>[] a1 = {1,2,3};
    String s1 = serializer.serialize(a1);     <jc>// Produces "'AQID'"</jc>
@@ -685,7 +685,7 @@
       </p>
       <p class='bcode'>
    <jc>// Create a JSON serializer that can serialize Iterators.</jc>
-   Serializer serializer = <jk>new</jk> JsonSerializerBuilder().pojoSwaps(IteratorSwap.<jk>class</jk>).build();
+   Serializer serializer = JsonSerializer.<jsm>create</jsm>().pojoSwaps(IteratorSwap.<jk>class</jk>).build();
    
    <jc>// Construct an iterator we want to serialize.</jc>
    Iterator iterator = <jk>new</jk> ObjectList(1,2,3).iterator();
@@ -694,7 +694,7 @@
    String s = serializer.serialize(iterator);      <jc>// Produces "[1,2,3]"</jc>
    
    <jc>// Try to parse it.</jc>
-   ReaderParser parser = <jk>new</jk> JsonParserBuilder().pojoSwaps(IteratorSwap.<jk>class</jk>).build();
+   ReaderParser parser = JsonParser.<jsm>create</jsm>().pojoSwaps(IteratorSwap.<jk>class</jk>).build();
    iterator = parser.parse(s, Iterator.<jk>class</jk>);     <jc>// Throws ParseException!!!</jc>
       </p>
    </div>
@@ -739,7 +739,7 @@
       </p>
       <p class='bcode'>
    <jc>// Serialize to JSON</jc>
-   WriterSerializer s = <jk>new</jk> JsonSerializerBuilder().beanFilters(MyBeanFilter.<jk>class</jk>).build();
+   WriterSerializer s = JsonSerializer.<jsm>create</jsm>().beanFilters(MyBeanFilter.<jk>class</jk>).build();
    MyClass c = <jk>new</jk> MyClassBar();
    String json = s.serialize(p);  <jc>// Prints "{foo:'foo'}"</jc>
       </p>  
@@ -769,7 +769,7 @@
       </p>
       <p class='bcode'>
    <jc>// Serialize to JSON</jc>
-   WriterSerializer s = <jk>new</jk> JsonSerializerBuilder().beanFilters(MyClass.<jk>class</jk>).build();
+   WriterSerializer s = JsonSerializer.<jsm>create</jsm>().beanFilters(MyClass.<jk>class</jk>).build();
       </p>
    </div>
 
@@ -825,7 +825,7 @@
       </p>
       <p class='bcode'>
    <jc>// Create a JSON serializer that can serialize Iterators.</jc>
-   Serializer serializer = <jk>new</jk> JsonSerializerBuilder().pojoSwaps(MySerializableSurrogate.<jk>class</jk>).build();
+   Serializer serializer = JsonSerializer.<jsm>create</jsm>().pojoSwaps(MySerializableSurrogate.<jk>class</jk>).build();
       </p>
       <p>
          When the serializer encounters the non-serializable class, it will serialize an instance of the surrogate 

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/uon/UonParser.Decoding.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonParser.Decoding.html b/content/site/apidocs/org/apache/juneau/uon/UonParser.Decoding.html
index 19cb38f..2bd18e9 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonParser.Decoding.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonParser.Decoding.html
@@ -209,7 +209,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonParser.html" title="class
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon">UonParser</a></h3>
-<code><a href="../../../../org/apache/juneau/uon/UonParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#createParameterSession--">createParameterSession</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#createSession-org.apache.juneau.parser.ParserSessionArgs-">createSession</a></code></li>
+<code><a href="../../../../org/apache/juneau/uon/UonParser.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#create--">create</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#createParameterSession--">createParameterSession</a>, <a href="../../../../org/apache/juneau/uon/UonParser.html#createSession-org.apache.juneau.parser.ParserSessionArgs-">createSession</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.parser.ReaderParser">

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/uon/UonParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonParser.html b/content/site/apidocs/org/apache/juneau/uon/UonParser.html
index 819e8f8..bb630ca 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonParser.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonParser.html
@@ -18,8 +18,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":10,"i1":9,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -244,7 +244,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -257,12 +257,18 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
 </td>
 </tr>
 <tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/uon/UonParserBuilder.html" title="class in org.apache.juneau.uon">UonParserBuilder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonParser.html#create--">create</a></span>()</code>
+<div class="block">Instantiates a new clean-slate <a href="../../../../org/apache/juneau/uon/UonParserBuilder.html" title="class in org.apache.juneau.uon"><code>UonParserBuilder</code></a> object.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>protected <a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonParser.html#createParameterSession--">createParameterSession</a></span>()</code>
 <div class="block">Create a UON parser session for parsing parameter values.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonParser.html#createSession-org.apache.juneau.parser.ParserSessionArgs-">createSession</a></span>(<a href="../../../../org/apache/juneau/parser/ParserSessionArgs.html" title="class in org.apache.juneau.parser">ParserSessionArgs</a>&nbsp;args)</code>
 <div class="block">Create the session object that will be passed in to the parse method.</div>
@@ -420,13 +426,34 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
 </dl>
 </li>
 </ul>
+<a name="create--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>create</h4>
+<pre>public static&nbsp;<a href="../../../../org/apache/juneau/uon/UonParserBuilder.html" title="class in org.apache.juneau.uon">UonParserBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.130">create</a>()</pre>
+<div class="block">Instantiates a new clean-slate <a href="../../../../org/apache/juneau/uon/UonParserBuilder.html" title="class in org.apache.juneau.uon"><code>UonParserBuilder</code></a> object.
+ 
+ <p>
+ This is equivalent to simply calling <code><jk>new</jk> UonParserBuilder()</code>.
+ 
+ <p>
+ Note that this method creates a builder initialized to all default settings, whereas <a href="../../../../org/apache/juneau/uon/UonParser.html#builder--"><code>builder()</code></a> copies 
+ the settings of the object called on.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A new <a href="../../../../org/apache/juneau/uon/UonParserBuilder.html" title="class in org.apache.juneau.uon"><code>UonParserBuilder</code></a> object.</dd>
+</dl>
+</li>
+</ul>
 <a name="createParameterSession--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createParameterSession</h4>
-<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.123">createParameterSession</a>()</pre>
+<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.139">createParameterSession</a>()</pre>
 <div class="block">Create a UON parser session for parsing parameter values.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -440,7 +467,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParser.html" title="
 <ul class="blockListLast">
 <li class="blockList">
 <h4>createSession</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.128">createSession</a>(<a href="../../../../org/apache/juneau/parser/ParserSessionArgs.html" title="class in org.apache.juneau.parser">ParserSessionArgs</a>&nbsp;args)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/uon/UonParserSession.html" title="class in org.apache.juneau.uon">UonParserSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/uon/UonParser.html#line.144">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.
 

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/org/apache/juneau/uon/UonParserContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonParserContext.html b/content/site/apidocs/org/apache/juneau/uon/UonParserContext.html
index 42b47c3..655b2b0 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonParserContext.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonParserContext.html
@@ -194,7 +194,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/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></h3>
-<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.BeanSessionArgs-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Ty
 pe-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getExcludeProperties-java.lang.Class-">getExcludeProperties</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getIncludeProperties-java.lang.Class-">getIncludeProperties</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanCo
 ntext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
+<code><a href="../../../../org/apache/juneau/BeanContext.html#Z:Z_class--">_class</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession--">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#createSession-org.apache.juneau.BeanSessionArgs-">createSession</a>, <a href="../../../../org/apache/juneau/BeanContext.html#dumpCacheStats--">dumpCacheStats</a>, <a href="../../../../org/apache/juneau/BeanContext.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanMeta-java.lang.Class-">getBeanMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanRegistry--">getBeanRegistry</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getBeanTypePropertyName--">getBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.Class-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMeta-java.lang.reflect.Ty
 pe-java.lang.reflect.Type...-">getClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getClassMetaForObject-T-">getClassMetaForObject</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getExcludeProperties-java.lang.Class-">getExcludeProperties</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getImplClassConstructor-java.lang.Class-org.apache.juneau.Visibility-">getImplClassConstructor</a>, <a href="../../../../org/apache/juneau/BeanContext.html#getIncludeProperties-java.lang.Class-">getIncludeProperties</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hashCode--">hashCode</a>, <a href="../../../../org/apache/juneau/BeanContext.html#hasSameCache-org.apache.juneau.BeanContext-">hasSameCache</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isBean-java.lang.Object-">isBean</a>, <a href="../../../../org/apache/juneau/BeanContext.html#isNotABean-java.lang.Class-">isNotABean</a>, <a href="../../../../org/apache/juneau/BeanCo
 ntext.html#newInstance-java.lang.Class-java.lang.Object-java.lang.Object...-">newInstance</a>, <a href="../../../../org/apache/juneau/BeanContext.html#newInstanceFromOuter-java.lang.Object-java.lang.Class-java.lang.Object-java.lang.Object...-">newInstanceFromOuter</a>, <a href="../../../../org/apache/juneau/BeanContext.html#object--">object</a>, <a href="../../../../org/apache/juneau/BeanContext.html#resolveClassMeta-org.apache.juneau.annotation.BeanProperty-java.lang.reflect.Type-java.util.Map-">resolveClassMeta</a>, <a href="../../../../org/apache/juneau/BeanContext.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Context">