http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/allclasses-noframe.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/allclasses-noframe.html 
b/content/site/apidocs/allclasses-noframe.html
index d4c3436..587b7d0 100644
--- a/content/site/apidocs/allclasses-noframe.html
+++ b/content/site/apidocs/allclasses-noframe.html
@@ -124,9 +124,16 @@
 <li><a href="org/apache/juneau/dto/swagger/Contact.html" title="class in 
org.apache.juneau.dto.swagger">Contact</a></li>
 <li><a href="org/apache/juneau/dto/atom/Content.html" title="class in 
org.apache.juneau.dto.atom">Content</a></li>
 <li><a href="org/apache/juneau/Context.html" title="class in 
org.apache.juneau">Context</a></li>
-<li><a href="org/apache/juneau/ContextFactory.html" title="class in 
org.apache.juneau">ContextFactory</a></li>
-<li><a href="org/apache/juneau/CoreApi.html" title="class in 
org.apache.juneau">CoreApi</a></li>
+<li><a href="org/apache/juneau/CoreObject.html" title="class in 
org.apache.juneau">CoreObject</a></li>
+<li><a href="org/apache/juneau/CoreObjectBuilder.html" title="class in 
org.apache.juneau">CoreObjectBuilder</a></li>
+<li><a href="org/apache/juneau/csv/CsvParser.html" title="class in 
org.apache.juneau.csv">CsvParser</a></li>
+<li><a href="org/apache/juneau/csv/CsvParserBuilder.html" title="class in 
org.apache.juneau.csv">CsvParserBuilder</a></li>
+<li><a href="org/apache/juneau/csv/CsvParserContext.html" title="class in 
org.apache.juneau.csv">CsvParserContext</a></li>
+<li><a href="org/apache/juneau/csv/CsvParserSession.html" title="class in 
org.apache.juneau.csv">CsvParserSession</a></li>
 <li><a href="org/apache/juneau/csv/CsvSerializer.html" title="class in 
org.apache.juneau.csv">CsvSerializer</a></li>
+<li><a href="org/apache/juneau/csv/CsvSerializerBuilder.html" title="class in 
org.apache.juneau.csv">CsvSerializerBuilder</a></li>
+<li><a href="org/apache/juneau/csv/CsvSerializerContext.html" title="class in 
org.apache.juneau.csv">CsvSerializerContext</a></li>
+<li><a href="org/apache/juneau/csv/CsvSerializerSession.html" title="class in 
org.apache.juneau.csv">CsvSerializerSession</a></li>
 <li><a href="org/apache/juneau/dto/html5/Data.html" title="class in 
org.apache.juneau.dto.html5">Data</a></li>
 <li><a href="org/apache/juneau/dto/html5/Datalist.html" title="class in 
org.apache.juneau.dto.html5">Datalist</a></li>
 <li><a href="org/apache/juneau/dto/cognos/DataSet.html" title="class in 
org.apache.juneau.dto.cognos">DataSet</a></li>
@@ -178,6 +185,7 @@
 <li><a href="org/apache/juneau/encoders/Encoder.html" title="class in 
org.apache.juneau.encoders">Encoder</a></li>
 <li><a href="org/apache/juneau/ini/Encoder.html" title="interface in 
org.apache.juneau.ini"><span class="interfaceName">Encoder</span></a></li>
 <li><a href="org/apache/juneau/encoders/EncoderGroup.html" title="class in 
org.apache.juneau.encoders">EncoderGroup</a></li>
+<li><a href="org/apache/juneau/encoders/EncoderGroupBuilder.html" title="class 
in org.apache.juneau.encoders">EncoderGroupBuilder</a></li>
 <li><a href="org/apache/juneau/encoders/EncoderMatch.html" title="class in 
org.apache.juneau.encoders">EncoderMatch</a></li>
 <li><a href="org/apache/juneau/dto/atom/Entry.html" title="class in 
org.apache.juneau.dto.atom">Entry</a></li>
 <li><a href="org/apache/juneau/ini/EntryListener.html" title="class in 
org.apache.juneau.ini">EntryListener</a></li>
@@ -228,12 +236,14 @@
 <li><a href="org/apache/juneau/dto/html5/HtmlElementVoid.html" title="class in 
org.apache.juneau.dto.html5">HtmlElementVoid</a></li>
 <li><a href="org/apache/juneau/html/HtmlLink.html" title="annotation in 
org.apache.juneau.html">HtmlLink</a></li>
 <li><a href="org/apache/juneau/html/HtmlParser.html" title="class in 
org.apache.juneau.html">HtmlParser</a></li>
+<li><a href="org/apache/juneau/html/HtmlParserBuilder.html" title="class in 
org.apache.juneau.html">HtmlParserBuilder</a></li>
 <li><a href="org/apache/juneau/html/HtmlParserContext.html" title="class in 
org.apache.juneau.html">HtmlParserContext</a></li>
 <li><a href="org/apache/juneau/html/HtmlParserSession.html" title="class in 
org.apache.juneau.html">HtmlParserSession</a></li>
 <li><a href="org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class 
in org.apache.juneau.html">HtmlSchemaDocSerializer</a></li>
 <li><a href="org/apache/juneau/html/HtmlSerializer.html" title="class in 
org.apache.juneau.html">HtmlSerializer</a></li>
 <li><a href="org/apache/juneau/html/HtmlSerializer.Sq.html" title="class in 
org.apache.juneau.html">HtmlSerializer.Sq</a></li>
 <li><a href="org/apache/juneau/html/HtmlSerializer.SqReadable.html" 
title="class in org.apache.juneau.html">HtmlSerializer.SqReadable</a></li>
+<li><a href="org/apache/juneau/html/HtmlSerializerBuilder.html" title="class 
in org.apache.juneau.html">HtmlSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/html/HtmlSerializerContext.html" title="class 
in org.apache.juneau.html">HtmlSerializerContext</a></li>
 <li><a href="org/apache/juneau/html/HtmlSerializerSession.html" title="class 
in org.apache.juneau.html">HtmlSerializerSession</a></li>
 <li><a href="org/apache/juneau/html/HtmlStrippedDocSerializer.html" 
title="class in org.apache.juneau.html">HtmlStrippedDocSerializer</a></li>
@@ -261,24 +271,30 @@
 <li><a href="org/apache/juneau/internal/IOUtils.html" title="class in 
org.apache.juneau.internal">IOUtils</a></li>
 <li><a href="org/apache/juneau/dto/swagger/Items.html" title="class in 
org.apache.juneau.dto.swagger">Items</a></li>
 <li><a href="org/apache/juneau/transforms/IteratorSwap.html" title="class in 
org.apache.juneau.transforms">IteratorSwap</a></li>
-<li><a href="org/apache/juneau/jso/JavaSerializedObjectParser.html" 
title="class in org.apache.juneau.jso">JavaSerializedObjectParser</a></li>
-<li><a href="org/apache/juneau/jso/JavaSerializedObjectSerializer.html" 
title="class in org.apache.juneau.jso">JavaSerializedObjectSerializer</a></li>
 <li><a href="org/apache/juneau/json/annotation/Json.html" title="annotation in 
org.apache.juneau.json.annotation">Json</a></li>
 <li><a href="org/apache/juneau/json/JsonClassMeta.html" title="class in 
org.apache.juneau.json">JsonClassMeta</a></li>
 <li><a href="org/apache/juneau/json/JsonParser.html" title="class in 
org.apache.juneau.json">JsonParser</a></li>
+<li><a href="org/apache/juneau/json/JsonParser.Strict.html" title="class in 
org.apache.juneau.json">JsonParser.Strict</a></li>
+<li><a href="org/apache/juneau/json/JsonParserBuilder.html" title="class in 
org.apache.juneau.json">JsonParserBuilder</a></li>
 <li><a href="org/apache/juneau/json/JsonParserContext.html" title="class in 
org.apache.juneau.json">JsonParserContext</a></li>
 <li><a href="org/apache/juneau/json/JsonParserSession.html" title="class in 
org.apache.juneau.json">JsonParserSession</a></li>
 <li><a href="org/apache/juneau/json/JsonSchemaSerializer.html" title="class in 
org.apache.juneau.json">JsonSchemaSerializer</a></li>
+<li><a href="org/apache/juneau/json/JsonSchemaSerializerBuilder.html" 
title="class in org.apache.juneau.json">JsonSchemaSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/json/JsonSerializer.html" title="class in 
org.apache.juneau.json">JsonSerializer</a></li>
 <li><a href="org/apache/juneau/json/JsonSerializer.Readable.html" title="class 
in org.apache.juneau.json">JsonSerializer.Readable</a></li>
 <li><a href="org/apache/juneau/json/JsonSerializer.Simple.html" title="class 
in org.apache.juneau.json">JsonSerializer.Simple</a></li>
 <li><a href="org/apache/juneau/json/JsonSerializer.SimpleReadable.html" 
title="class in org.apache.juneau.json">JsonSerializer.SimpleReadable</a></li>
 <li><a href="org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html" 
title="class in 
org.apache.juneau.json">JsonSerializer.SimpleReadableSafe</a></li>
+<li><a href="org/apache/juneau/json/JsonSerializerBuilder.html" title="class 
in org.apache.juneau.json">JsonSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/json/JsonSerializerContext.html" title="class 
in org.apache.juneau.json">JsonSerializerContext</a></li>
 <li><a href="org/apache/juneau/json/JsonSerializerSession.html" title="class 
in org.apache.juneau.json">JsonSerializerSession</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/JsonType.html" title="enum in 
org.apache.juneau.dto.jsonschema">JsonType</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/JsonTypeArray.html" title="class 
in org.apache.juneau.dto.jsonschema">JsonTypeArray</a></li>
 <li><a href="org/apache/juneau/json/JsonWriter.html" title="class in 
org.apache.juneau.json">JsonWriter</a></li>
+<li><a href="org/apache/juneau/jso/JsoParser.html" title="class in 
org.apache.juneau.jso">JsoParser</a></li>
+<li><a href="org/apache/juneau/jso/JsoParserBuilder.html" title="class in 
org.apache.juneau.jso">JsoParserBuilder</a></li>
+<li><a href="org/apache/juneau/jso/JsoSerializer.html" title="class in 
org.apache.juneau.jso">JsoSerializer</a></li>
+<li><a href="org/apache/juneau/jso/JsoSerializerBuilder.html" title="class in 
org.apache.juneau.jso">JsoSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/internal/JuneauLogger.html" title="class in 
org.apache.juneau.internal">JuneauLogger</a></li>
 <li><a href="org/apache/juneau/rest/jaxrs/JuneauProvider.html" 
title="annotation in org.apache.juneau.rest.jaxrs">JuneauProvider</a></li>
 <li><a href="org/apache/juneau/dto/html5/Kbd.html" title="class in 
org.apache.juneau.dto.html5">Kbd</a></li>
@@ -292,8 +308,6 @@
 <li><a href="org/apache/juneau/dto/html5/Link.html" title="class in 
org.apache.juneau.dto.html5">Link</a></li>
 <li><a href="org/apache/juneau/dto/Link.html" title="class in 
org.apache.juneau.dto">Link</a></li>
 <li><a href="org/apache/juneau/rest/vars/LocalizationVar.html" title="class in 
org.apache.juneau.rest.vars">LocalizationVar</a></li>
-<li><a href="org/apache/juneau/Lockable.html" title="class in 
org.apache.juneau">Lockable</a></li>
-<li><a href="org/apache/juneau/LockedException.html" title="class in 
org.apache.juneau">LockedException</a></li>
 <li><a href="org/apache/juneau/microservice/resources/LogEntryFormatter.html" 
title="class in 
org.apache.juneau.microservice.resources">LogEntryFormatter</a></li>
 <li><a href="org/apache/juneau/dto/atom/Logo.html" title="class in 
org.apache.juneau.dto.atom">Logo</a></li>
 <li><a href="org/apache/juneau/microservice/resources/LogParser.html" 
title="class in org.apache.juneau.microservice.resources">LogParser</a></li>
@@ -318,9 +332,11 @@
 <li><a href="org/apache/juneau/msgpack/MsgPackInputStream.html" title="class 
in org.apache.juneau.msgpack">MsgPackInputStream</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackOutputStream.html" title="class 
in org.apache.juneau.msgpack">MsgPackOutputStream</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackParser.html" title="class in 
org.apache.juneau.msgpack">MsgPackParser</a></li>
+<li><a href="org/apache/juneau/msgpack/MsgPackParserBuilder.html" title="class 
in org.apache.juneau.msgpack">MsgPackParserBuilder</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackParserContext.html" title="class 
in org.apache.juneau.msgpack">MsgPackParserContext</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackParserSession.html" title="class 
in org.apache.juneau.msgpack">MsgPackParserSession</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackSerializer.html" title="class in 
org.apache.juneau.msgpack">MsgPackSerializer</a></li>
+<li><a href="org/apache/juneau/msgpack/MsgPackSerializerBuilder.html" 
title="class in org.apache.juneau.msgpack">MsgPackSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackSerializerContext.html" 
title="class in org.apache.juneau.msgpack">MsgPackSerializerContext</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackSerializerSession.html" 
title="class in org.apache.juneau.msgpack">MsgPackSerializerSession</a></li>
 <li><a href="org/apache/juneau/internal/MultiIterable.html" title="class in 
org.apache.juneau.internal">MultiIterable</a></li>
@@ -338,6 +354,7 @@
 <li><a href="org/apache/juneau/dto/html5/Object2.html" title="class in 
org.apache.juneau.dto.html5">Object2</a></li>
 <li><a href="org/apache/juneau/ObjectList.html" title="class in 
org.apache.juneau">ObjectList</a></li>
 <li><a href="org/apache/juneau/ObjectMap.html" title="class in 
org.apache.juneau">ObjectMap</a></li>
+<li><a href="org/apache/juneau/internal/ObjectUtils.html" title="class in 
org.apache.juneau.internal">ObjectUtils</a></li>
 <li><a href="org/apache/juneau/utils/ObjectUtils.html" title="class in 
org.apache.juneau.utils">ObjectUtils</a></li>
 <li><a href="org/apache/juneau/dto/html5/Ol.html" title="class in 
org.apache.juneau.dto.html5">Ol</a></li>
 <li><a href="org/apache/juneau/dto/swagger/Operation.html" title="class in 
org.apache.juneau.dto.swagger">Operation</a></li>
@@ -347,14 +364,17 @@
 <li><a href="org/apache/juneau/serializer/OutputStreamSerializer.html" 
title="class in org.apache.juneau.serializer">OutputStreamSerializer</a></li>
 <li><a href="org/apache/juneau/annotation/Overrideable.html" title="annotation 
in org.apache.juneau.annotation">Overrideable</a></li>
 <li><a href="org/apache/juneau/dto/html5/P.html" title="class in 
org.apache.juneau.dto.html5">P</a></li>
+<li><a href="org/apache/juneau/internal/Pair.html" title="class in 
org.apache.juneau.internal">Pair</a></li>
 <li><a href="org/apache/juneau/dto/html5/Param.html" title="class in 
org.apache.juneau.dto.html5">Param</a></li>
 <li><a href="org/apache/juneau/rest/annotation/Parameter.html" 
title="annotation in org.apache.juneau.rest.annotation">Parameter</a></li>
 <li><a href="org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in 
org.apache.juneau.dto.swagger">ParameterInfo</a></li>
 <li><a href="org/apache/juneau/annotation/ParentProperty.html" 
title="annotation in org.apache.juneau.annotation">ParentProperty</a></li>
 <li><a href="org/apache/juneau/parser/ParseException.html" title="class in 
org.apache.juneau.parser">ParseException</a></li>
 <li><a href="org/apache/juneau/parser/Parser.html" title="class in 
org.apache.juneau.parser">Parser</a></li>
+<li><a href="org/apache/juneau/parser/ParserBuilder.html" title="class in 
org.apache.juneau.parser">ParserBuilder</a></li>
 <li><a href="org/apache/juneau/parser/ParserContext.html" title="class in 
org.apache.juneau.parser">ParserContext</a></li>
 <li><a href="org/apache/juneau/parser/ParserGroup.html" title="class in 
org.apache.juneau.parser">ParserGroup</a></li>
+<li><a href="org/apache/juneau/parser/ParserGroupBuilder.html" title="class in 
org.apache.juneau.parser">ParserGroupBuilder</a></li>
 <li><a href="org/apache/juneau/parser/ParserListener.html" title="class in 
org.apache.juneau.parser">ParserListener</a></li>
 <li><a href="org/apache/juneau/parser/ParserMatch.html" title="class in 
org.apache.juneau.parser">ParserMatch</a></li>
 <li><a href="org/apache/juneau/parser/ParserReader.html" title="class in 
org.apache.juneau.parser">ParserReader</a></li>
@@ -363,7 +383,9 @@
 <li><a href="org/apache/juneau/rest/annotation/PathRemainder.html" 
title="annotation in org.apache.juneau.rest.annotation">PathRemainder</a></li>
 <li><a href="org/apache/juneau/dto/atom/Person.html" title="class in 
org.apache.juneau.dto.atom">Person</a></li>
 <li><a href="org/apache/juneau/plaintext/PlainTextParser.html" title="class in 
org.apache.juneau.plaintext">PlainTextParser</a></li>
+<li><a href="org/apache/juneau/plaintext/PlainTextParserBuilder.html" 
title="class in org.apache.juneau.plaintext">PlainTextParserBuilder</a></li>
 <li><a href="org/apache/juneau/plaintext/PlainTextSerializer.html" 
title="class in org.apache.juneau.plaintext">PlainTextSerializer</a></li>
+<li><a href="org/apache/juneau/plaintext/PlainTextSerializerBuilder.html" 
title="class in org.apache.juneau.plaintext">PlainTextSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/annotation/Pojo.html" title="annotation in 
org.apache.juneau.annotation">Pojo</a></li>
 <li><a href="org/apache/juneau/utils/PojoIntrospector.html" title="class in 
org.apache.juneau.utils">PojoIntrospector</a></li>
 <li><a href="org/apache/juneau/utils/PojoQuery.html" title="class in 
org.apache.juneau.utils">PojoQuery</a></li>
@@ -380,6 +402,7 @@
 <li><a href="org/apache/juneau/PropertyNamer.html" title="interface in 
org.apache.juneau"><span class="interfaceName">PropertyNamer</span></a></li>
 <li><a href="org/apache/juneau/PropertyNamerDashedLC.html" title="class in 
org.apache.juneau">PropertyNamerDashedLC</a></li>
 <li><a href="org/apache/juneau/PropertyNamerDefault.html" title="class in 
org.apache.juneau">PropertyNamerDefault</a></li>
+<li><a href="org/apache/juneau/PropertyStore.html" title="class in 
org.apache.juneau">PropertyStore</a></li>
 <li><a href="org/apache/juneau/dto/html5/Q.html" title="class in 
org.apache.juneau.dto.html5">Q</a></li>
 <li><a href="org/apache/juneau/rest/annotation/Query.html" title="annotation 
in org.apache.juneau.rest.annotation">Query</a></li>
 <li><a href="org/apache/juneau/rest/converters/Queryable.html" title="class in 
org.apache.juneau.rest.converters">Queryable</a></li>
@@ -396,6 +419,7 @@
 <li><a href="org/apache/juneau/jena/RdfParser.NTriple.html" title="class in 
org.apache.juneau.jena">RdfParser.NTriple</a></li>
 <li><a href="org/apache/juneau/jena/RdfParser.Turtle.html" title="class in 
org.apache.juneau.jena">RdfParser.Turtle</a></li>
 <li><a href="org/apache/juneau/jena/RdfParser.Xml.html" title="class in 
org.apache.juneau.jena">RdfParser.Xml</a></li>
+<li><a href="org/apache/juneau/jena/RdfParserBuilder.html" title="class in 
org.apache.juneau.jena">RdfParserBuilder</a></li>
 <li><a href="org/apache/juneau/jena/RdfParserContext.html" title="class in 
org.apache.juneau.jena">RdfParserContext</a></li>
 <li><a href="org/apache/juneau/jena/RdfParserSession.html" title="class in 
org.apache.juneau.jena">RdfParserSession</a></li>
 <li><a href="org/apache/juneau/jena/annotation/RdfSchema.html" 
title="annotation in org.apache.juneau.jena.annotation">RdfSchema</a></li>
@@ -405,6 +429,7 @@
 <li><a href="org/apache/juneau/jena/RdfSerializer.Turtle.html" title="class in 
org.apache.juneau.jena">RdfSerializer.Turtle</a></li>
 <li><a href="org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in 
org.apache.juneau.jena">RdfSerializer.Xml</a></li>
 <li><a href="org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html" title="class 
in org.apache.juneau.jena">RdfSerializer.XmlAbbrev</a></li>
+<li><a href="org/apache/juneau/jena/RdfSerializerBuilder.html" title="class in 
org.apache.juneau.jena">RdfSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/jena/RdfSerializerContext.html" title="class in 
org.apache.juneau.jena">RdfSerializerContext</a></li>
 <li><a href="org/apache/juneau/jena/RdfSerializerSession.html" title="class in 
org.apache.juneau.jena">RdfSerializerSession</a></li>
 <li><a href="org/apache/juneau/jena/RdfUtils.html" title="class in 
org.apache.juneau.jena">RdfUtils</a></li>
@@ -435,12 +460,20 @@
 <li><a href="org/apache/juneau/rest/client/ResponsePattern.html" title="class 
in org.apache.juneau.rest.client">ResponsePattern</a></li>
 <li><a href="org/apache/juneau/rest/client/RestCall.html" title="class in 
org.apache.juneau.rest.client">RestCall</a></li>
 <li><a href="org/apache/juneau/rest/client/RestCallException.html" 
title="class in org.apache.juneau.rest.client">RestCallException</a></li>
+<li><a href="org/apache/juneau/rest/RestCallHandler.html" title="class in 
org.apache.juneau.rest">RestCallHandler</a></li>
 <li><a href="org/apache/juneau/rest/client/RestCallInterceptor.html" 
title="class in org.apache.juneau.rest.client">RestCallInterceptor</a></li>
 <li><a href="org/apache/juneau/rest/client/RestCallLogger.html" title="class 
in org.apache.juneau.rest.client">RestCallLogger</a></li>
 <li><a href="org/apache/juneau/rest/client/RestClient.html" title="class in 
org.apache.juneau.rest.client">RestClient</a></li>
+<li><a href="org/apache/juneau/rest/client/RestClientBuilder.html" 
title="class in org.apache.juneau.rest.client">RestClientBuilder</a></li>
+<li><a href="org/apache/juneau/rest/RestConfig.html" title="class in 
org.apache.juneau.rest">RestConfig</a></li>
+<li><a href="org/apache/juneau/rest/RestContext.html" title="class in 
org.apache.juneau.rest">RestContext</a></li>
 <li><a href="org/apache/juneau/rest/RestConverter.html" title="interface in 
org.apache.juneau.rest"><span 
class="interfaceName">RestConverter</span></a></li>
 <li><a href="org/apache/juneau/rest/RestException.html" title="class in 
org.apache.juneau.rest">RestException</a></li>
 <li><a href="org/apache/juneau/rest/RestGuard.html" title="class in 
org.apache.juneau.rest">RestGuard</a></li>
+<li><a href="org/apache/juneau/rest/RestInfoProvider.html" title="class in 
org.apache.juneau.rest">RestInfoProvider</a></li>
+<li><a href="org/apache/juneau/rest/RestLogger.html" title="class in 
org.apache.juneau.rest">RestLogger</a></li>
+<li><a href="org/apache/juneau/rest/RestLogger.NoOp.html" title="class in 
org.apache.juneau.rest">RestLogger.NoOp</a></li>
+<li><a href="org/apache/juneau/rest/RestLogger.Normal.html" title="class in 
org.apache.juneau.rest">RestLogger.Normal</a></li>
 <li><a href="org/apache/juneau/rest/RestMatcher.html" title="class in 
org.apache.juneau.rest">RestMatcher</a></li>
 <li><a href="org/apache/juneau/rest/RestMatcherReflecting.html" title="class 
in org.apache.juneau.rest">RestMatcherReflecting</a></li>
 <li><a href="org/apache/juneau/rest/annotation/RestMethod.html" 
title="annotation in org.apache.juneau.rest.annotation">RestMethod</a></li>
@@ -448,9 +481,10 @@
 <li><a href="org/apache/juneau/rest/RestRequest.html" title="class in 
org.apache.juneau.rest">RestRequest</a></li>
 <li><a href="org/apache/juneau/rest/client/RestRequestEntity.html" 
title="class in org.apache.juneau.rest.client">RestRequestEntity</a></li>
 <li><a href="org/apache/juneau/rest/annotation/RestResource.html" 
title="annotation in org.apache.juneau.rest.annotation">RestResource</a></li>
+<li><a href="org/apache/juneau/rest/RestResourceResolver.html" title="class in 
org.apache.juneau.rest">RestResourceResolver</a></li>
+<li><a href="org/apache/juneau/rest/RestResourceResolver.DEFAULT.html" 
title="class in org.apache.juneau.rest">RestResourceResolver.DEFAULT</a></li>
 <li><a href="org/apache/juneau/rest/RestResponse.html" title="class in 
org.apache.juneau.rest">RestResponse</a></li>
 <li><a href="org/apache/juneau/rest/RestServlet.html" title="class in 
org.apache.juneau.rest">RestServlet</a></li>
-<li><a href="org/apache/juneau/rest/RestServletContext.html" title="class in 
org.apache.juneau.rest">RestServletContext</a></li>
 <li><a href="org/apache/juneau/rest/RestServletDefault.html" title="class in 
org.apache.juneau.rest">RestServletDefault</a></li>
 <li><a href="org/apache/juneau/rest/RestServletException.html" title="class in 
org.apache.juneau.rest">RestServletException</a></li>
 <li><a href="org/apache/juneau/rest/RestServletGroupDefault.html" title="class 
in org.apache.juneau.rest">RestServletGroupDefault</a></li>
@@ -487,8 +521,10 @@
 <li><a href="org/apache/juneau/rest/vars/SerializedRequestAttrVar.html" 
title="class in org.apache.juneau.rest.vars">SerializedRequestAttrVar</a></li>
 <li><a href="org/apache/juneau/serializer/SerializeException.html" 
title="class in org.apache.juneau.serializer">SerializeException</a></li>
 <li><a href="org/apache/juneau/serializer/Serializer.html" title="class in 
org.apache.juneau.serializer">Serializer</a></li>
+<li><a href="org/apache/juneau/serializer/SerializerBuilder.html" title="class 
in org.apache.juneau.serializer">SerializerBuilder</a></li>
 <li><a href="org/apache/juneau/serializer/SerializerContext.html" title="class 
in org.apache.juneau.serializer">SerializerContext</a></li>
 <li><a href="org/apache/juneau/serializer/SerializerGroup.html" title="class 
in org.apache.juneau.serializer">SerializerGroup</a></li>
+<li><a href="org/apache/juneau/serializer/SerializerGroupBuilder.html" 
title="class in org.apache.juneau.serializer">SerializerGroupBuilder</a></li>
 <li><a href="org/apache/juneau/serializer/SerializerMatch.html" title="class 
in org.apache.juneau.serializer">SerializerMatch</a></li>
 <li><a href="org/apache/juneau/serializer/SerializerSession.html" title="class 
in org.apache.juneau.serializer">SerializerSession</a></li>
 <li><a href="org/apache/juneau/serializer/SerializerWriter.html" title="class 
in org.apache.juneau.serializer">SerializerWriter</a></li>
@@ -501,6 +537,7 @@
 <li><a href="org/apache/juneau/rest/client/SimpleX509TrustManager.html" 
title="class in org.apache.juneau.rest.client">SimpleX509TrustManager</a></li>
 <li><a href="org/apache/juneau/dto/html5/Small.html" title="class in 
org.apache.juneau.dto.html5">Small</a></li>
 <li><a href="org/apache/juneau/soap/SoapXmlSerializer.html" title="class in 
org.apache.juneau.soap">SoapXmlSerializer</a></li>
+<li><a href="org/apache/juneau/soap/SoapXmlSerializerBuilder.html" 
title="class in org.apache.juneau.soap">SoapXmlSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/soap/SoapXmlSerializerContext.html" 
title="class in org.apache.juneau.soap">SoapXmlSerializerContext</a></li>
 <li><a href="org/apache/juneau/dto/atom/Source.html" title="class in 
org.apache.juneau.dto.atom">Source</a></li>
 <li><a href="org/apache/juneau/dto/html5/Source.html" title="class in 
org.apache.juneau.dto.html5">Source</a></li>
@@ -548,17 +585,19 @@
 <li><a href="org/apache/juneau/rest/converters/Traversable.html" title="class 
in org.apache.juneau.rest.converters">Traversable</a></li>
 <li><a href="org/apache/juneau/dto/html5/U.html" title="class in 
org.apache.juneau.dto.html5">U</a></li>
 <li><a href="org/apache/juneau/dto/html5/Ul.html" title="class in 
org.apache.juneau.dto.html5">Ul</a></li>
-<li><a href="org/apache/juneau/urlencoding/UonParser.html" title="class in 
org.apache.juneau.urlencoding">UonParser</a></li>
-<li><a href="org/apache/juneau/urlencoding/UonParser.Decoding.html" 
title="class in org.apache.juneau.urlencoding">UonParser.Decoding</a></li>
-<li><a href="org/apache/juneau/urlencoding/UonParserContext.html" title="class 
in org.apache.juneau.urlencoding">UonParserContext</a></li>
-<li><a href="org/apache/juneau/urlencoding/UonParserSession.html" title="class 
in org.apache.juneau.urlencoding">UonParserSession</a></li>
-<li><a href="org/apache/juneau/urlencoding/UonReader.html" title="class in 
org.apache.juneau.urlencoding">UonReader</a></li>
-<li><a href="org/apache/juneau/urlencoding/UonSerializer.html" title="class in 
org.apache.juneau.urlencoding">UonSerializer</a></li>
-<li><a href="org/apache/juneau/urlencoding/UonSerializer.Encoding.html" 
title="class in org.apache.juneau.urlencoding">UonSerializer.Encoding</a></li>
-<li><a href="org/apache/juneau/urlencoding/UonSerializer.Readable.html" 
title="class in org.apache.juneau.urlencoding">UonSerializer.Readable</a></li>
-<li><a href="org/apache/juneau/urlencoding/UonSerializerContext.html" 
title="class in org.apache.juneau.urlencoding">UonSerializerContext</a></li>
-<li><a href="org/apache/juneau/urlencoding/UonSerializerSession.html" 
title="class in org.apache.juneau.urlencoding">UonSerializerSession</a></li>
-<li><a href="org/apache/juneau/urlencoding/UonWriter.html" title="class in 
org.apache.juneau.urlencoding">UonWriter</a></li>
+<li><a href="org/apache/juneau/uon/UonParser.html" title="class in 
org.apache.juneau.uon">UonParser</a></li>
+<li><a href="org/apache/juneau/uon/UonParser.Decoding.html" title="class in 
org.apache.juneau.uon">UonParser.Decoding</a></li>
+<li><a href="org/apache/juneau/uon/UonParserBuilder.html" title="class in 
org.apache.juneau.uon">UonParserBuilder</a></li>
+<li><a href="org/apache/juneau/uon/UonParserContext.html" title="class in 
org.apache.juneau.uon">UonParserContext</a></li>
+<li><a href="org/apache/juneau/uon/UonParserSession.html" title="class in 
org.apache.juneau.uon">UonParserSession</a></li>
+<li><a href="org/apache/juneau/uon/UonReader.html" title="class in 
org.apache.juneau.uon">UonReader</a></li>
+<li><a href="org/apache/juneau/uon/UonSerializer.html" title="class in 
org.apache.juneau.uon">UonSerializer</a></li>
+<li><a href="org/apache/juneau/uon/UonSerializer.Encoding.html" title="class 
in org.apache.juneau.uon">UonSerializer.Encoding</a></li>
+<li><a href="org/apache/juneau/uon/UonSerializer.Readable.html" title="class 
in org.apache.juneau.uon">UonSerializer.Readable</a></li>
+<li><a href="org/apache/juneau/uon/UonSerializerBuilder.html" title="class in 
org.apache.juneau.uon">UonSerializerBuilder</a></li>
+<li><a href="org/apache/juneau/uon/UonSerializerContext.html" title="class in 
org.apache.juneau.uon">UonSerializerContext</a></li>
+<li><a href="org/apache/juneau/uon/UonSerializerSession.html" title="class in 
org.apache.juneau.uon">UonSerializerSession</a></li>
+<li><a href="org/apache/juneau/uon/UonWriter.html" title="class in 
org.apache.juneau.uon">UonWriter</a></li>
 <li><a href="org/apache/juneau/annotation/URI.html" title="annotation in 
org.apache.juneau.annotation">URI</a></li>
 <li><a href="org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html" 
title="class in org.apache.juneau.rest.matchers">UrlEncodedFormMatcher</a></li>
 <li><a href="org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in 
org.apache.juneau.rest.vars">UrlEncodeVar</a></li>
@@ -566,11 +605,13 @@
 <li><a href="org/apache/juneau/urlencoding/UrlEncodingClassMeta.html" 
title="class in org.apache.juneau.urlencoding">UrlEncodingClassMeta</a></li>
 <li><a href="org/apache/juneau/urlencoding/UrlEncodingContext.html" 
title="class in org.apache.juneau.urlencoding">UrlEncodingContext</a></li>
 <li><a href="org/apache/juneau/urlencoding/UrlEncodingParser.html" 
title="class in org.apache.juneau.urlencoding">UrlEncodingParser</a></li>
+<li><a href="org/apache/juneau/urlencoding/UrlEncodingParserBuilder.html" 
title="class in org.apache.juneau.urlencoding">UrlEncodingParserBuilder</a></li>
 <li><a href="org/apache/juneau/urlencoding/UrlEncodingParserContext.html" 
title="class in org.apache.juneau.urlencoding">UrlEncodingParserContext</a></li>
 <li><a href="org/apache/juneau/urlencoding/UrlEncodingParserSession.html" 
title="class in org.apache.juneau.urlencoding">UrlEncodingParserSession</a></li>
 <li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html" 
title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></li>
 <li><a 
href="org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" 
title="class in 
org.apache.juneau.urlencoding">UrlEncodingSerializer.Expanded</a></li>
 <li><a 
href="org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" 
title="class in 
org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></li>
+<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" 
title="class in 
org.apache.juneau.urlencoding">UrlEncodingSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html" 
title="class in 
org.apache.juneau.urlencoding">UrlEncodingSerializerContext</a></li>
 <li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html" 
title="class in 
org.apache.juneau.urlencoding">UrlEncodingSerializerSession</a></li>
 <li><a href="org/apache/juneau/rest/UrlPathPattern.html" title="class in 
org.apache.juneau.rest">UrlPathPattern</a></li>
@@ -578,6 +619,7 @@
 <li><a href="org/apache/juneau/dto/html5/Var.html" title="class in 
org.apache.juneau.dto.html5">Var</a></li>
 <li><a href="org/apache/juneau/svl/Var.html" title="class in 
org.apache.juneau.svl">Var</a></li>
 <li><a href="org/apache/juneau/svl/VarResolver.html" title="class in 
org.apache.juneau.svl">VarResolver</a></li>
+<li><a href="org/apache/juneau/svl/VarResolverBuilder.html" title="class in 
org.apache.juneau.svl">VarResolverBuilder</a></li>
 <li><a href="org/apache/juneau/svl/VarResolverContext.html" title="class in 
org.apache.juneau.svl">VarResolverContext</a></li>
 <li><a href="org/apache/juneau/svl/VarResolverSession.html" title="class in 
org.apache.juneau.svl">VarResolverSession</a></li>
 <li><a href="org/apache/juneau/internal/Version.html" title="class in 
org.apache.juneau.internal">Version</a></li>
@@ -594,22 +636,25 @@
 <li><a href="org/apache/juneau/xml/XmlBeanPropertyMeta.html" title="class in 
org.apache.juneau.xml">XmlBeanPropertyMeta</a></li>
 <li><a href="org/apache/juneau/xml/XmlClassMeta.html" title="class in 
org.apache.juneau.xml">XmlClassMeta</a></li>
 <li><a href="org/apache/juneau/xml/XmlDocSerializer.html" title="class in 
org.apache.juneau.xml">XmlDocSerializer</a></li>
-<li><a href="org/apache/juneau/xml/XmlDocSerializer.Simple.html" title="class 
in org.apache.juneau.xml">XmlDocSerializer.Simple</a></li>
+<li><a href="org/apache/juneau/xml/XmlDocSerializer.Ns.html" title="class in 
org.apache.juneau.xml">XmlDocSerializer.Ns</a></li>
 <li><a href="org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in 
org.apache.juneau.xml.annotation">XmlFormat</a></li>
 <li><a href="org/apache/juneau/transforms/XMLGregorianCalendarSwap.html" 
title="class in org.apache.juneau.transforms">XMLGregorianCalendarSwap</a></li>
 <li><a href="org/apache/juneau/xml/annotation/XmlNs.html" title="annotation in 
org.apache.juneau.xml.annotation">XmlNs</a></li>
 <li><a href="org/apache/juneau/xml/XmlParser.html" title="class in 
org.apache.juneau.xml">XmlParser</a></li>
+<li><a href="org/apache/juneau/xml/XmlParserBuilder.html" title="class in 
org.apache.juneau.xml">XmlParserBuilder</a></li>
 <li><a href="org/apache/juneau/xml/XmlParserContext.html" title="class in 
org.apache.juneau.xml">XmlParserContext</a></li>
 <li><a href="org/apache/juneau/xml/XmlParserSession.html" title="class in 
org.apache.juneau.xml">XmlParserSession</a></li>
 <li><a href="org/apache/juneau/xml/annotation/XmlSchema.html" 
title="annotation in org.apache.juneau.xml.annotation">XmlSchema</a></li>
 <li><a href="org/apache/juneau/xml/XmlSchemaDocSerializer.html" title="class 
in org.apache.juneau.xml">XmlSchemaDocSerializer</a></li>
 <li><a href="org/apache/juneau/xml/XmlSchemaSerializer.html" title="class in 
org.apache.juneau.xml">XmlSchemaSerializer</a></li>
+<li><a href="org/apache/juneau/xml/XmlSchemaSerializerBuilder.html" 
title="class in org.apache.juneau.xml">XmlSchemaSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/xml/XmlSerializer.html" title="class in 
org.apache.juneau.xml">XmlSerializer</a></li>
 <li><a href="org/apache/juneau/xml/XmlSerializer.Ns.html" title="class in 
org.apache.juneau.xml">XmlSerializer.Ns</a></li>
 <li><a href="org/apache/juneau/xml/XmlSerializer.NsSq.html" title="class in 
org.apache.juneau.xml">XmlSerializer.NsSq</a></li>
 <li><a href="org/apache/juneau/xml/XmlSerializer.NsSqReadable.html" 
title="class in org.apache.juneau.xml">XmlSerializer.NsSqReadable</a></li>
 <li><a href="org/apache/juneau/xml/XmlSerializer.Sq.html" title="class in 
org.apache.juneau.xml">XmlSerializer.Sq</a></li>
 <li><a href="org/apache/juneau/xml/XmlSerializer.SqReadable.html" title="class 
in org.apache.juneau.xml">XmlSerializer.SqReadable</a></li>
+<li><a href="org/apache/juneau/xml/XmlSerializerBuilder.html" title="class in 
org.apache.juneau.xml">XmlSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/xml/XmlSerializerContext.html" title="class in 
org.apache.juneau.xml">XmlSerializerContext</a></li>
 <li><a href="org/apache/juneau/xml/XmlSerializerSession.html" title="class in 
org.apache.juneau.xml">XmlSerializerSession</a></li>
 <li><a href="org/apache/juneau/xml/XmlUtils.html" title="class in 
org.apache.juneau.xml">XmlUtils</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/constant-values.html 
b/content/site/apidocs/constant-values.html
index 15d9324..c6a0949 100644
--- a/content/site/apidocs/constant-values.html
+++ b/content/site/apidocs/constant-values.html
@@ -1026,7 +1026,7 @@
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>org.apache.juneau.rest.<a 
href="org/apache/juneau/rest/RestServletContext.html" title="class in 
org.apache.juneau.rest">RestServletContext</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<caption><span>org.apache.juneau.rest.<a 
href="org/apache/juneau/rest/RestContext.html" title="class in 
org.apache.juneau.rest">RestContext</a></span><span 
class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th scope="col">Constant Field</th>
@@ -1034,122 +1034,122 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_allowBodyParam">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_allowBodyParam">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_allowBodyParam">REST_allowBodyParam</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_allowBodyParam">REST_allowBodyParam</a></code></td>
 <td class="colLast"><code>"RestServlet.allowBodyParam"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_allowHeaderParams">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_allowHeaderParams">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_allowHeaderParams">REST_allowHeaderParams</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_allowHeaderParams">REST_allowHeaderParams</a></code></td>
 <td class="colLast"><code>"RestServlet.allowHeaderParams"</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_allowMethodParam">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_allowMethodParam">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_allowMethodParam">REST_allowMethodParam</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_allowMethodParam">REST_allowMethodParam</a></code></td>
 <td class="colLast"><code>"RestServlet.allowMethodParam"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_defaultCharset">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_defaultCharset">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_defaultCharset">REST_defaultCharset</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_defaultCharset">REST_defaultCharset</a></code></td>
 <td class="colLast"><code>"RestServlet.defaultCharset"</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_method">
+<td class="colFirst"><a name="org.apache.juneau.rest.RestContext.REST_method">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_method">REST_method</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_method">REST_method</a></code></td>
 <td class="colLast"><code>"RestServlet.method"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_methodDescription">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_methodDescription">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_methodDescription">REST_methodDescription</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_methodDescription">REST_methodDescription</a></code></td>
 <td class="colLast"><code>"RestServlet.methodDescription"</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_methodSummary">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_methodSummary">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_methodSummary">REST_methodSummary</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_methodSummary">REST_methodSummary</a></code></td>
 <td class="colLast"><code>"RestServlet.methodSummary"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_paramFormat">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_paramFormat">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_paramFormat">REST_paramFormat</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_paramFormat">REST_paramFormat</a></code></td>
 <td class="colLast"><code>"RestServlet.paramFormat"</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_pathInfo">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_pathInfo">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_pathInfo">REST_pathInfo</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_pathInfo">REST_pathInfo</a></code></td>
 <td class="colLast"><code>"RestServlet.pathInfo"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_relativeServletURI">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_relativeServletURI">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_relativeServletURI">REST_relativeServletURI</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_relativeServletURI">REST_relativeServletURI</a></code></td>
 <td class="colLast"><code>"RestServlet.relativeServletURI"</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_renderResponseStackTraces">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_renderResponseStackTraces">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_renderResponseStackTraces">REST_renderResponseStackTraces</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_renderResponseStackTraces">REST_renderResponseStackTraces</a></code></td>
 <td class="colLast"><code>"RestServlet.renderResponseStackTraces"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_requestURI">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_requestURI">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_requestURI">REST_requestURI</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_requestURI">REST_requestURI</a></code></td>
 <td class="colLast"><code>"RestServlet.requestURI"</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_servletDescription">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_servletDescription">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_servletDescription">REST_servletDescription</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_servletDescription">REST_servletDescription</a></code></td>
 <td class="colLast"><code>"RestServlet.servletDescription"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_servletPath">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_servletPath">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_servletPath">REST_servletPath</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_servletPath">REST_servletPath</a></code></td>
 <td class="colLast"><code>"RestServlet.servletPath"</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_servletTitle">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_servletTitle">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_servletTitle">REST_servletTitle</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_servletTitle">REST_servletTitle</a></code></td>
 <td class="colLast"><code>"RestServlet.servletTitle"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_servletURI">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_servletURI">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_servletURI">REST_servletURI</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_servletURI">REST_servletURI</a></code></td>
 <td class="colLast"><code>"RestServlet.servletURI"</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.rest.RestServletContext.REST_useStackTraceHashes">
+<td class="colFirst"><a 
name="org.apache.juneau.rest.RestContext.REST_useStackTraceHashes">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/rest/RestServletContext.html#REST_useStackTraceHashes">REST_useStackTraceHashes</a></code></td>
+<td><code><a 
href="org/apache/juneau/rest/RestContext.html#REST_useStackTraceHashes">REST_useStackTraceHashes</a></code></td>
 <td class="colLast"><code>"RestServlet.useStackTraceHashes"</code></td>
 </tr>
 </tbody>
@@ -1424,55 +1424,6 @@
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>org.apache.juneau.svl.<a 
href="org/apache/juneau/svl/VarResolverContext.html" title="class in 
org.apache.juneau.svl">VarResolverContext</a></span><span 
class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.svl.VarResolverContext.SVL_context">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/svl/VarResolverContext.html#SVL_context">SVL_context</a></code></td>
-<td class="colLast"><code>"Svl.context.map"</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.juneau.svl.VarResolverContext.SVL_context_put">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/svl/VarResolverContext.html#SVL_context_put">SVL_context_put</a></code></td>
-<td class="colLast"><code>"Svl.context.map.put"</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.svl.VarResolverContext.SVL_vars">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/svl/VarResolverContext.html#SVL_vars">SVL_vars</a></code></td>
-<td class="colLast"><code>"Svl.vars.set"</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.juneau.svl.VarResolverContext.SVL_vars_add">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/svl/VarResolverContext.html#SVL_vars_add">SVL_vars_add</a></code></td>
-<td class="colLast"><code>"Svl.vars.set.add"</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.svl.VarResolverContext.SVL_vars_remove">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/svl/VarResolverContext.html#SVL_vars_remove">SVL_vars_remove</a></code></td>
-<td class="colLast"><code>"Svl.vars.set.remove"</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>org.apache.juneau.svl.vars.<a 
href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in 
org.apache.juneau.svl.vars">ArgsVar</a></span><span 
class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -1629,7 +1580,7 @@
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>org.apache.juneau.urlencoding.<a 
href="org/apache/juneau/urlencoding/UonParserContext.html" title="class in 
org.apache.juneau.urlencoding">UonParserContext</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<caption><span>org.apache.juneau.uon.<a 
href="org/apache/juneau/uon/UonParserContext.html" title="class in 
org.apache.juneau.uon">UonParserContext</a></span><span 
class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th scope="col">Constant Field</th>
@@ -1637,10 +1588,10 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.urlencoding.UonParserContext.UON_decodeChars">
+<td class="colFirst"><a 
name="org.apache.juneau.uon.UonParserContext.UON_decodeChars">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/urlencoding/UonParserContext.html#UON_decodeChars">UON_decodeChars</a></code></td>
+<td><code><a 
href="org/apache/juneau/uon/UonParserContext.html#UON_decodeChars">UON_decodeChars</a></code></td>
 <td class="colLast"><code>"UonParser.decodeChars"</code></td>
 </tr>
 </tbody>
@@ -1648,7 +1599,7 @@
 </li>
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>org.apache.juneau.urlencoding.<a 
href="org/apache/juneau/urlencoding/UonSerializerContext.html" title="class in 
org.apache.juneau.urlencoding">UonSerializerContext</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<caption><span>org.apache.juneau.uon.<a 
href="org/apache/juneau/uon/UonSerializerContext.html" title="class in 
org.apache.juneau.uon">UonSerializerContext</a></span><span 
class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th scope="col">Constant Field</th>
@@ -1656,22 +1607,24 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.urlencoding.UonSerializerContext.UON_addBeanTypeProperties">
+<td class="colFirst"><a 
name="org.apache.juneau.uon.UonSerializerContext.UON_addBeanTypeProperties">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/urlencoding/UonSerializerContext.html#UON_addBeanTypeProperties">UON_addBeanTypeProperties</a></code></td>
+<td><code><a 
href="org/apache/juneau/uon/UonSerializerContext.html#UON_addBeanTypeProperties">UON_addBeanTypeProperties</a></code></td>
 <td class="colLast"><code>"UonSerializer.addBeanTypeProperties"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.juneau.urlencoding.UonSerializerContext.UON_encodeChars">
+<td class="colFirst"><a 
name="org.apache.juneau.uon.UonSerializerContext.UON_encodeChars">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/urlencoding/UonSerializerContext.html#UON_encodeChars">UON_encodeChars</a></code></td>
+<td><code><a 
href="org/apache/juneau/uon/UonSerializerContext.html#UON_encodeChars">UON_encodeChars</a></code></td>
 <td class="colLast"><code>"UonSerializer.encodeChars"</code></td>
 </tr>
 </tbody>
 </table>
 </li>
+</ul>
+<ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>org.apache.juneau.urlencoding.<a 
href="org/apache/juneau/urlencoding/UrlEncodingContext.html" title="class in 
org.apache.juneau.urlencoding">UrlEncodingContext</a></span><span 
class="tabEnd">&nbsp;</span></caption>
@@ -1691,44 +1644,6 @@
 </tbody>
 </table>
 </li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>org.apache.juneau.urlencoding.<a 
href="org/apache/juneau/urlencoding/UrlEncodingParserContext.html" title="class 
in org.apache.juneau.urlencoding">UrlEncodingParserContext</a></span><span 
class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.urlencoding.UrlEncodingParserContext.URLENC_expandedParams">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/urlencoding/UrlEncodingParserContext.html#URLENC_expandedParams">URLENC_expandedParams</a></code></td>
-<td class="colLast"><code>"UrlEncoding.expandedParams"</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>org.apache.juneau.urlencoding.<a 
href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html" 
title="class in 
org.apache.juneau.urlencoding">UrlEncodingSerializerContext</a></span><span 
class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.juneau.urlencoding.UrlEncodingSerializerContext.URLENC_expandedParams">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&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></code></td>
-<td><code><a 
href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_expandedParams">URLENC_expandedParams</a></code></td>
-<td class="colLast"><code>"UrlEncoding.expandedParams"</code></td>
-</tr>
-</tbody>
-</table>
-</li>
 </ul>
 <ul class="blockList">
 <li class="blockList">

Reply via email to