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 2016/10/10 00:33:12 UTC

[50/51] [partial] incubator-juneau-website git commit: Update website with info about Swagger docs.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2fd81719/content/about.html
----------------------------------------------------------------------
diff --git a/content/about.html b/content/about.html
index 362fc2b..6902a54 100644
--- a/content/about.html
+++ b/content/about.html
@@ -245,7 +245,6 @@
 	</p>
 	<p>
 		Auto-generated OPTIONS pages are constructed from Swagger DTO beans.
-		The information can be provided through annotations (as above), resource bundles, or Swagger JSON files.
 	</p>
 	<img class='bordered' src='images/Swagger.png'>
 	<p>
@@ -256,7 +255,7 @@
 	</p> 
 	<ul>
 		<li>Extremely simple debuggability using nothing more than your browser.
-		<li>Auto-generated Swagger-based OPTIONS pages.
+		<li>Auto-generated Swagger-based OPTIONS pages from data provided through annotations (as above), resource bundles, or Swagger JSON files.
 		<li>Configurability through external INI files.
 		<li>Client-versioned responses (and other heuristic matching APIs).
 		<li>Servlet and method level guards.
@@ -271,20 +270,18 @@
 	RestClient client = <jk>new</jk> RestClient(JsonSerializer.<jk>class</jk>, JsonParser.<jk>class</jk>);
 	
 	<jc>// The address of the root resource.</jc>
-	String url = <js>"http://localhost:9080/sample/addressBook"</js>;
+	String url = <js>"http://localhost:10000/systemProperties"</js>;
 	
 	<jc>// Do a REST GET against a remote REST interface and convert
 	// the response to an unstructured ObjectMap object.</jc>
-	ObjectMap m1 = client.doGet(url).getResponse(ObjectMap.<jk>class</jk>);
+	Map m1 = client.doGet(url).getResponse(TreeMap.<jk>class</jk>);
 	
-	<jc>// Same as above, except parse the JSON as a bean.</jc>
-	AddressBook a2 = client.doGet(url).getResponse(AddressBook.<jk>class</jk>);
-	
-	<jc>// Add a person to the address book.
+	<jc>// Add some new system properties.
 	// Use XML as the transport medium.</jc>
 	client = <jk>new</jk> RestClient(XmlSerializer.<jk>class</jk>, XmlParser.<jk>class</jk>);
-	Person p = <jk>new</jk> Person(<js>"Joe Smith"</js>, 21);
-	<jk>int</jk> returnCode = client.doPost(url + <js>"/entries"</js>, p).execute();
+	Properties p = <jk>new</jk> Properties();
+	p.load(reader);
+	<jk>int</jk> returnCode = client.doPost(url + <js>"/systemProperties"</js>, p).execute();
 	</p>
 	<p>
 		The remote proxy interface API allows you to invoke POJO methods using REST...
@@ -375,6 +372,9 @@
 		<li>An executable jar file that starts up a REST interface in milliseconds.
 		<li>An external INI file that can be used to configure your REST resources on the fly.
 	</ul>
+	<p>
+		The microservice API was originally designed for and particularly suited for use as Docker images.
+	</p>
 
 	<h5 class='toc'>Serialization languages</h5>
 	<p>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2fd81719/content/site/apidocs/allclasses-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/allclasses-frame.html b/content/site/apidocs/allclasses-frame.html
index 57ca09c..b297703 100644
--- a/content/site/apidocs/allclasses-frame.html
+++ b/content/site/apidocs/allclasses-frame.html
@@ -18,7 +18,6 @@
 <li><a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">ArgsVar</a></li>
 <li><a href="org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal" target="classFrame">ArrayUtils</a></li>
 <li><a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal" target="classFrame">AsciiSet</a></li>
-<li><a href="org/apache/juneau/server/annotation/Attr.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Attr</a></li>
 <li><a href="org/apache/juneau/server/jaxrs/BaseProvider.html" title="class in org.apache.juneau.server.jaxrs" target="classFrame">BaseProvider</a></li>
 <li><a href="org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation" target="classFrame">Bean</a></li>
 <li><a href="org/apache/juneau/annotation/BeanConstructor.html" title="annotation in org.apache.juneau.annotation" target="classFrame">BeanConstructor</a></li>
@@ -42,6 +41,7 @@
 <li><a href="org/apache/juneau/BeanProxyInvocationHandler.html" title="class in org.apache.juneau" target="classFrame">BeanProxyInvocationHandler</a></li>
 <li><a href="org/apache/juneau/BeanRuntimeException.html" title="class in org.apache.juneau" target="classFrame">BeanRuntimeException</a></li>
 <li><a href="org/apache/juneau/transforms/BeanStringSwap.html" title="class in org.apache.juneau.transforms" target="classFrame">BeanStringSwap</a></li>
+<li><a href="org/apache/juneau/server/annotation/Body.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Body</a></li>
 <li><a href="org/apache/juneau/transforms/ByteArrayBase64Swap.html" title="class in org.apache.juneau.transforms" target="classFrame">ByteArrayBase64Swap</a></li>
 <li><a href="org/apache/juneau/internal/ByteArrayCache.html" title="class in org.apache.juneau.internal" target="classFrame">ByteArrayCache</a></li>
 <li><a href="org/apache/juneau/internal/ByteArrayInOutStream.html" title="class in org.apache.juneau.internal" target="classFrame">ByteArrayInOutStream</a></li>
@@ -79,8 +79,8 @@
 <li><a href="org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigUtils</a></li>
 <li><a href="org/apache/juneau/jena/Constants.html" title="class in org.apache.juneau.jena" target="classFrame">Constants</a></li>
 <li><a href="org/apache/juneau/annotation/Consumes.html" title="annotation in org.apache.juneau.annotation" target="classFrame">Consumes</a></li>
+<li><a href="org/apache/juneau/dto/swagger/Contact.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">Contact</a></li>
 <li><a href="org/apache/juneau/dto/atom/Content.html" title="class in org.apache.juneau.dto.atom" target="classFrame">Content</a></li>
-<li><a href="org/apache/juneau/server/annotation/Content.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Content</a></li>
 <li><a href="org/apache/juneau/Context.html" title="class in org.apache.juneau" target="classFrame">Context</a></li>
 <li><a href="org/apache/juneau/ContextFactory.html" title="class in org.apache.juneau" target="classFrame">ContextFactory</a></li>
 <li><a href="org/apache/juneau/ContextFactory.NormalizingHashCode.html" title="class in org.apache.juneau" target="classFrame">ContextFactory.NormalizingHashCode</a></li>
@@ -109,7 +109,6 @@
 <li><a href="org/apache/juneau/server/response/DefaultHandler.html" title="class in org.apache.juneau.server.response" target="classFrame">DefaultHandler</a></li>
 <li><a href="org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl" target="classFrame">DefaultingVar</a></li>
 <li><a href="org/apache/juneau/server/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.server.jaxrs.rdf" target="classFrame">DefaultJenaProvider</a></li>
-<li><a href="org/apache/juneau/server/labels/DefaultLabels.html" title="class in org.apache.juneau.server.labels" target="classFrame">DefaultLabels</a></li>
 <li><a href="org/apache/juneau/server/jaxrs/DefaultProvider.html" title="class in org.apache.juneau.server.jaxrs" target="classFrame">DefaultProvider</a></li>
 <li><a href="org/apache/juneau/Delegate.html" title="interface in org.apache.juneau" target="classFrame"><span class="interfaceName">Delegate</span></a></li>
 <li><a href="org/apache/juneau/internal/DelegateBeanMap.html" title="class in org.apache.juneau.internal" target="classFrame">DelegateBeanMap</a></li>
@@ -123,17 +122,20 @@
 <li><a href="org/apache/juneau/ini/EntryListener.html" title="class in org.apache.juneau.ini" target="classFrame">EntryListener</a></li>
 <li><a href="org/apache/juneau/transforms/EnumerationSwap.html" title="class in org.apache.juneau.transforms" target="classFrame">EnumerationSwap</a></li>
 <li><a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">EnvVariablesVar</a></li>
+<li><a href="org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">ExternalDocumentation</a></li>
 <li><a href="org/apache/juneau/dto/atom/Feed.html" title="class in org.apache.juneau.dto.atom" target="classFrame">Feed</a></li>
 <li><a href="org/apache/juneau/internal/FileUtils.html" title="class in org.apache.juneau.internal" target="classFrame">FileUtils</a></li>
 <li><a href="org/apache/juneau/internal/FilteredMap.html" title="class in org.apache.juneau.internal" target="classFrame">FilteredMap</a></li>
 <li><a href="org/apache/juneau/FormattedException.html" title="class in org.apache.juneau" target="classFrame">FormattedException</a></li>
 <li><a href="org/apache/juneau/FormattedRuntimeException.html" title="class in org.apache.juneau" target="classFrame">FormattedRuntimeException</a></li>
+<li><a href="org/apache/juneau/server/annotation/FormData.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">FormData</a></li>
 <li><a href="org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom" target="classFrame">Generator</a></li>
 <li><a href="org/apache/juneau/encoders/GzipEncoder.html" title="class in org.apache.juneau.encoders" target="classFrame">GzipEncoder</a></li>
+<li><a href="org/apache/juneau/server/annotation/HasFormData.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">HasFormData</a></li>
 <li><a href="org/apache/juneau/internal/HashCode.html" title="class in org.apache.juneau.internal" target="classFrame">HashCode</a></li>
-<li><a href="org/apache/juneau/server/annotation/HasParam.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">HasParam</a></li>
-<li><a href="org/apache/juneau/server/annotation/HasQParam.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">HasQParam</a></li>
+<li><a href="org/apache/juneau/server/annotation/HasQuery.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">HasQuery</a></li>
 <li><a href="org/apache/juneau/server/annotation/Header.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Header</a></li>
+<li><a href="org/apache/juneau/dto/swagger/HeaderInfo.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">HeaderInfo</a></li>
 <li><a href="org/apache/juneau/html/annotation/Html.html" title="annotation in org.apache.juneau.html.annotation" target="classFrame">Html</a></li>
 <li><a href="org/apache/juneau/html/HtmlBeanPropertyMeta.html" title="class in org.apache.juneau.html" target="classFrame">HtmlBeanPropertyMeta</a></li>
 <li><a href="org/apache/juneau/html/HtmlClassMeta.html" title="class in org.apache.juneau.html" target="classFrame">HtmlClassMeta</a></li>
@@ -157,6 +159,7 @@
 <li><a href="org/apache/juneau/dto/atom/Id.html" title="class in org.apache.juneau.dto.atom" target="classFrame">Id</a></li>
 <li><a href="org/apache/juneau/encoders/IdentityEncoder.html" title="class in org.apache.juneau.encoders" target="classFrame">IdentityEncoder</a></li>
 <li><a href="org/apache/juneau/internal/IdentityList.html" title="class in org.apache.juneau.internal" target="classFrame">IdentityList</a></li>
+<li><a href="org/apache/juneau/dto/swagger/Info.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">Info</a></li>
 <li><a href="org/apache/juneau/server/annotation/Inherit.html" title="enum in org.apache.juneau.server.annotation" target="classFrame">Inherit</a></li>
 <li><a href="org/apache/juneau/server/response/InputStreamHandler.html" title="class in org.apache.juneau.server.response" target="classFrame">InputStreamHandler</a></li>
 <li><a href="org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser" target="classFrame">InputStreamParser</a></li>
@@ -166,6 +169,7 @@
 <li><a href="org/apache/juneau/utils/IOPipe.html" title="class in org.apache.juneau.utils" target="classFrame">IOPipe</a></li>
 <li><a href="org/apache/juneau/utils/IOPipe.LineProcessor.html" title="interface in org.apache.juneau.utils" target="classFrame"><span class="interfaceName">IOPipe.LineProcessor</span></a></li>
 <li><a href="org/apache/juneau/internal/IOUtils.html" title="class in org.apache.juneau.internal" target="classFrame">IOUtils</a></li>
+<li><a href="org/apache/juneau/dto/swagger/Items.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">Items</a></li>
 <li><a href="org/apache/juneau/transforms/IteratorSwap.html" title="class in org.apache.juneau.transforms" target="classFrame">IteratorSwap</a></li>
 <li><a href="org/apache/juneau/jso/JavaSerializedObjectParser.html" title="class in org.apache.juneau.jso" target="classFrame">JavaSerializedObjectParser</a></li>
 <li><a href="org/apache/juneau/jso/JavaSerializedObjectSerializer.html" title="class in org.apache.juneau.jso" target="classFrame">JavaSerializedObjectSerializer</a></li>
@@ -188,6 +192,7 @@
 <li><a href="org/apache/juneau/internal/JuneauLogger.html" title="class in org.apache.juneau.internal" target="classFrame">JuneauLogger</a></li>
 <li><a href="org/apache/juneau/server/jaxrs/JuneauProvider.html" title="annotation in org.apache.juneau.server.jaxrs" target="classFrame">JuneauProvider</a></li>
 <li><a href="org/apache/juneau/internal/KeywordSet.html" title="class in org.apache.juneau.internal" target="classFrame">KeywordSet</a></li>
+<li><a href="org/apache/juneau/dto/swagger/License.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">License</a></li>
 <li><a href="org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom" target="classFrame">Link</a></li>
 <li><a href="org/apache/juneau/dto/Link.html" title="class in org.apache.juneau.dto" target="classFrame">Link</a></li>
 <li><a href="org/apache/juneau/server/vars/LocalizationVar.html" title="class in org.apache.juneau.server.vars" target="classFrame">LocalizationVar</a></li>
@@ -206,8 +211,6 @@
 <li><a href="org/apache/juneau/server/annotation/Messages.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Messages</a></li>
 <li><a href="org/apache/juneau/utils/MetadataMap.html" title="class in org.apache.juneau.utils" target="classFrame">MetadataMap</a></li>
 <li><a href="org/apache/juneau/server/annotation/Method.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Method</a></li>
-<li><a href="org/apache/juneau/server/labels/MethodDescription.html" title="class in org.apache.juneau.server.labels" target="classFrame">MethodDescription</a></li>
-<li><a href="org/apache/juneau/server/labels/MethodDescription.Response.html" title="class in org.apache.juneau.server.labels" target="classFrame">MethodDescription.Response</a></li>
 <li><a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice" target="classFrame">Microservice</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackInputStream.html" title="class in org.apache.juneau.msgpack" target="classFrame">MsgPackInputStream</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackOutputStream.html" title="class in org.apache.juneau.msgpack" target="classFrame">MsgPackOutputStream</a></li>
@@ -229,9 +232,10 @@
 <li><a href="org/apache/juneau/internal/Null.html" title="class in org.apache.juneau.internal" target="classFrame">Null</a></li>
 <li><a href="org/apache/juneau/ObjectList.html" title="class in org.apache.juneau" target="classFrame">ObjectList</a></li>
 <li><a href="org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau" target="classFrame">ObjectMap</a></li>
+<li><a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">Operation</a></li>
 <li><a href="org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer" target="classFrame">OutputStreamSerializer</a></li>
-<li><a href="org/apache/juneau/server/annotation/Param.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Param</a></li>
-<li><a href="org/apache/juneau/server/labels/ParamDescription.html" title="class in org.apache.juneau.server.labels" target="classFrame">ParamDescription</a></li>
+<li><a href="org/apache/juneau/server/annotation/Parameter.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Parameter</a></li>
+<li><a href="org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">ParameterInfo</a></li>
 <li><a href="org/apache/juneau/annotation/ParentProperty.html" title="annotation in org.apache.juneau.annotation" target="classFrame">ParentProperty</a></li>
 <li><a href="org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser" target="classFrame">ParseException</a></li>
 <li><a href="org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser" target="classFrame">Parser</a></li>
@@ -240,6 +244,7 @@
 <li><a href="org/apache/juneau/parser/ParserListener.html" title="class in org.apache.juneau.parser" target="classFrame">ParserListener</a></li>
 <li><a href="org/apache/juneau/parser/ParserReader.html" title="class in org.apache.juneau.parser" target="classFrame">ParserReader</a></li>
 <li><a href="org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser" target="classFrame">ParserSession</a></li>
+<li><a href="org/apache/juneau/server/annotation/Path.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Path</a></li>
 <li><a href="org/apache/juneau/server/annotation/PathRemainder.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">PathRemainder</a></li>
 <li><a href="org/apache/juneau/dto/atom/Person.html" title="class in org.apache.juneau.dto.atom" target="classFrame">Person</a></li>
 <li><a href="org/apache/juneau/plaintext/PlainTextParser.html" title="class in org.apache.juneau.plaintext" target="classFrame">PlainTextParser</a></li>
@@ -258,7 +263,7 @@
 <li><a href="org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau" target="classFrame"><span class="interfaceName">PropertyNamer</span></a></li>
 <li><a href="org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau" target="classFrame">PropertyNamerDashedLC</a></li>
 <li><a href="org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau" target="classFrame">PropertyNamerDefault</a></li>
-<li><a href="org/apache/juneau/server/annotation/QParam.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">QParam</a></li>
+<li><a href="org/apache/juneau/server/annotation/Query.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Query</a></li>
 <li><a href="org/apache/juneau/server/converters/Queryable.html" title="class in org.apache.juneau.server.converters" target="classFrame">Queryable</a></li>
 <li><a href="org/apache/juneau/jena/annotation/Rdf.html" title="annotation in org.apache.juneau.jena.annotation" target="classFrame">Rdf</a></li>
 <li><a href="org/apache/juneau/jena/RdfBeanMeta.html" title="class in org.apache.juneau.jena" target="classFrame">RdfBeanMeta</a></li>
@@ -298,17 +303,15 @@
 <li><a href="org/apache/juneau/annotation/Remoteable.html" title="annotation in org.apache.juneau.annotation" target="classFrame">Remoteable</a></li>
 <li><a href="org/apache/juneau/server/remoteable/RemoteableServiceProperties.html" title="class in org.apache.juneau.server.remoteable" target="classFrame">RemoteableServiceProperties</a></li>
 <li><a href="org/apache/juneau/server/remoteable/RemoteableServlet.html" title="class in org.apache.juneau.server.remoteable" target="classFrame">RemoteableServlet</a></li>
-<li><a href="org/apache/juneau/server/vars/RequestAttrVar.html" title="class in org.apache.juneau.server.vars" target="classFrame">RequestAttrVar</a></li>
-<li><a href="org/apache/juneau/server/vars/RequestParamVar.html" title="class in org.apache.juneau.server.vars" target="classFrame">RequestParamVar</a></li>
 <li><a href="org/apache/juneau/server/vars/RequestVar.html" title="class in org.apache.juneau.server.vars" target="classFrame">RequestVar</a></li>
 <li><a href="org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice" target="classFrame">Resource</a></li>
 <li><a href="org/apache/juneau/server/labels/ResourceDescription.html" title="class in org.apache.juneau.server.labels" target="classFrame">ResourceDescription</a></li>
 <li><a href="org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice" target="classFrame">ResourceGroup</a></li>
 <li><a href="org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice" target="classFrame">ResourceJena</a></li>
 <li><a href="org/apache/juneau/server/labels/ResourceLink.html" title="class in org.apache.juneau.server.labels" target="classFrame">ResourceLink</a></li>
-<li><a href="org/apache/juneau/server/labels/ResourceOptions.html" title="class in org.apache.juneau.server.labels" target="classFrame">ResourceOptions</a></li>
 <li><a href="org/apache/juneau/server/annotation/Response.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Response</a></li>
 <li><a href="org/apache/juneau/server/ResponseHandler.html" title="interface in org.apache.juneau.server" target="classFrame"><span class="interfaceName">ResponseHandler</span></a></li>
+<li><a href="org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">ResponseInfo</a></li>
 <li><a href="org/apache/juneau/client/ResponsePattern.html" title="class in org.apache.juneau.client" target="classFrame">ResponsePattern</a></li>
 <li><a href="org/apache/juneau/client/RestCall.html" title="class in org.apache.juneau.client" target="classFrame">RestCall</a></li>
 <li><a href="org/apache/juneau/client/RestCallException.html" title="class in org.apache.juneau.client" target="classFrame">RestCallException</a></li>
@@ -343,15 +346,16 @@
 <li><a href="org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html" title="class in org.apache.juneau.dto.jsonschema" target="classFrame">Schema.JsonTypeOrJsonTypeArraySwap</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html" title="class in org.apache.juneau.dto.jsonschema" target="classFrame">Schema.SchemaOrSchemaArraySwap</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/SchemaArray.html" title="class in org.apache.juneau.dto.jsonschema" target="classFrame">SchemaArray</a></li>
+<li><a href="org/apache/juneau/dto/swagger/SchemaInfo.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">SchemaInfo</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/SchemaMap.html" title="class in org.apache.juneau.dto.jsonschema" target="classFrame">SchemaMap</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/SchemaProperty.html" title="class in org.apache.juneau.dto.jsonschema" target="classFrame">SchemaProperty</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/SchemaPropertySimpleArray.html" title="class in org.apache.juneau.dto.jsonschema" target="classFrame">SchemaPropertySimpleArray</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/SchemaRef.html" title="class in org.apache.juneau.dto.jsonschema" target="classFrame">SchemaRef</a></li>
 <li><a href="org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini" target="classFrame">Section</a></li>
 <li><a href="org/apache/juneau/ini/SectionListener.html" title="class in org.apache.juneau.ini" target="classFrame">SectionListener</a></li>
+<li><a href="org/apache/juneau/dto/swagger/SecurityScheme.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">SecurityScheme</a></li>
 <li><a href="org/apache/juneau/client/SerializedNameValuePair.html" title="class in org.apache.juneau.client" target="classFrame">SerializedNameValuePair</a></li>
 <li><a href="org/apache/juneau/server/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.server.vars" target="classFrame">SerializedRequestAttrVar</a></li>
-<li><a href="org/apache/juneau/server/vars/SerializedRequestParamVar.html" title="class in org.apache.juneau.server.vars" target="classFrame">SerializedRequestParamVar</a></li>
 <li><a href="org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer" target="classFrame">SerializeException</a></li>
 <li><a href="org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer" target="classFrame">Serializer</a></li>
 <li><a href="org/apache/juneau/serializer/SerializerContext.html" title="class in org.apache.juneau.serializer" target="classFrame">SerializerContext</a></li>
@@ -379,7 +383,9 @@
 <li><a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer" target="classFrame">StringObject</a></li>
 <li><a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal" target="classFrame">StringUtils</a></li>
 <li><a href="org/apache/juneau/transform/SurrogateSwap.html" title="class in org.apache.juneau.transform" target="classFrame">SurrogateSwap</a></li>
+<li><a href="org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">Swagger</a></li>
 <li><a href="org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">SystemPropertiesVar</a></li>
+<li><a href="org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">Tag</a></li>
 <li><a href="org/apache/juneau/internal/TeeOutputStream.html" title="class in org.apache.juneau.internal" target="classFrame">TeeOutputStream</a></li>
 <li><a href="org/apache/juneau/internal/TeeWriter.html" title="class in org.apache.juneau.internal" target="classFrame">TeeWriter</a></li>
 <li><a href="org/apache/juneau/dto/atom/Text.html" title="class in org.apache.juneau.dto.atom" target="classFrame">Text</a></li>
@@ -417,10 +423,7 @@
 <li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializerSession</a></li>
 <li><a href="org/apache/juneau/server/UrlPathPattern.html" title="class in org.apache.juneau.server" target="classFrame">UrlPathPattern</a></li>
 <li><a href="org/apache/juneau/internal/Utils.html" title="class in org.apache.juneau.internal" target="classFrame">Utils</a></li>
-<li><a href="org/apache/juneau/server/annotation/Var.html" title="annotation in org.apache.juneau.server.annotation" target="classFrame">Var</a></li>
-<li><a href="org/apache/juneau/server/labels/Var.html" title="class in org.apache.juneau.server.labels" target="classFrame">Var</a></li>
 <li><a href="org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl" target="classFrame">Var</a></li>
-<li><a href="org/apache/juneau/server/annotation/VarCategory.html" title="class in org.apache.juneau.server.annotation" target="classFrame">VarCategory</a></li>
 <li><a href="org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl" target="classFrame">VarResolver</a></li>
 <li><a href="org/apache/juneau/svl/VarResolverContext.html" title="class in org.apache.juneau.svl" target="classFrame">VarResolverContext</a></li>
 <li><a href="org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl" target="classFrame">VarResolverSession</a></li>
@@ -430,6 +433,7 @@
 <li><a href="org/apache/juneau/Writable.html" title="interface in org.apache.juneau" target="classFrame"><span class="interfaceName">Writable</span></a></li>
 <li><a href="org/apache/juneau/server/response/WritableHandler.html" title="class in org.apache.juneau.server.response" target="classFrame">WritableHandler</a></li>
 <li><a href="org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer" target="classFrame">WriterSerializer</a></li>
+<li><a href="org/apache/juneau/dto/swagger/Xml.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">Xml</a></li>
 <li><a href="org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation" target="classFrame">Xml</a></li>
 <li><a href="org/apache/juneau/xml/XmlBeanMeta.html" title="class in org.apache.juneau.xml" target="classFrame">XmlBeanMeta</a></li>
 <li><a href="org/apache/juneau/xml/XmlBeanPropertyMeta.html" title="class in org.apache.juneau.xml" target="classFrame">XmlBeanPropertyMeta</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2fd81719/content/site/apidocs/allclasses-noframe.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/allclasses-noframe.html b/content/site/apidocs/allclasses-noframe.html
index 4325efc..4df5751 100644
--- a/content/site/apidocs/allclasses-noframe.html
+++ b/content/site/apidocs/allclasses-noframe.html
@@ -18,7 +18,6 @@
 <li><a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a></li>
 <li><a href="org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal">ArrayUtils</a></li>
 <li><a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a></li>
-<li><a href="org/apache/juneau/server/annotation/Attr.html" title="annotation in org.apache.juneau.server.annotation">Attr</a></li>
 <li><a href="org/apache/juneau/server/jaxrs/BaseProvider.html" title="class in org.apache.juneau.server.jaxrs">BaseProvider</a></li>
 <li><a href="org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation">Bean</a></li>
 <li><a href="org/apache/juneau/annotation/BeanConstructor.html" title="annotation in org.apache.juneau.annotation">BeanConstructor</a></li>
@@ -42,6 +41,7 @@
 <li><a href="org/apache/juneau/BeanProxyInvocationHandler.html" title="class in org.apache.juneau">BeanProxyInvocationHandler</a></li>
 <li><a href="org/apache/juneau/BeanRuntimeException.html" title="class in org.apache.juneau">BeanRuntimeException</a></li>
 <li><a href="org/apache/juneau/transforms/BeanStringSwap.html" title="class in org.apache.juneau.transforms">BeanStringSwap</a></li>
+<li><a href="org/apache/juneau/server/annotation/Body.html" title="annotation in org.apache.juneau.server.annotation">Body</a></li>
 <li><a href="org/apache/juneau/transforms/ByteArrayBase64Swap.html" title="class in org.apache.juneau.transforms">ByteArrayBase64Swap</a></li>
 <li><a href="org/apache/juneau/internal/ByteArrayCache.html" title="class in org.apache.juneau.internal">ByteArrayCache</a></li>
 <li><a href="org/apache/juneau/internal/ByteArrayInOutStream.html" title="class in org.apache.juneau.internal">ByteArrayInOutStream</a></li>
@@ -79,8 +79,8 @@
 <li><a href="org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini">ConfigUtils</a></li>
 <li><a href="org/apache/juneau/jena/Constants.html" title="class in org.apache.juneau.jena">Constants</a></li>
 <li><a href="org/apache/juneau/annotation/Consumes.html" title="annotation in org.apache.juneau.annotation">Consumes</a></li>
+<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/server/annotation/Content.html" title="annotation in org.apache.juneau.server.annotation">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/ContextFactory.NormalizingHashCode.html" title="class in org.apache.juneau">ContextFactory.NormalizingHashCode</a></li>
@@ -109,7 +109,6 @@
 <li><a href="org/apache/juneau/server/response/DefaultHandler.html" title="class in org.apache.juneau.server.response">DefaultHandler</a></li>
 <li><a href="org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></li>
 <li><a href="org/apache/juneau/server/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.server.jaxrs.rdf">DefaultJenaProvider</a></li>
-<li><a href="org/apache/juneau/server/labels/DefaultLabels.html" title="class in org.apache.juneau.server.labels">DefaultLabels</a></li>
 <li><a href="org/apache/juneau/server/jaxrs/DefaultProvider.html" title="class in org.apache.juneau.server.jaxrs">DefaultProvider</a></li>
 <li><a href="org/apache/juneau/Delegate.html" title="interface in org.apache.juneau"><span class="interfaceName">Delegate</span></a></li>
 <li><a href="org/apache/juneau/internal/DelegateBeanMap.html" title="class in org.apache.juneau.internal">DelegateBeanMap</a></li>
@@ -123,17 +122,20 @@
 <li><a href="org/apache/juneau/ini/EntryListener.html" title="class in org.apache.juneau.ini">EntryListener</a></li>
 <li><a href="org/apache/juneau/transforms/EnumerationSwap.html" title="class in org.apache.juneau.transforms">EnumerationSwap</a></li>
 <li><a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars">EnvVariablesVar</a></li>
+<li><a href="org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger">ExternalDocumentation</a></li>
 <li><a href="org/apache/juneau/dto/atom/Feed.html" title="class in org.apache.juneau.dto.atom">Feed</a></li>
 <li><a href="org/apache/juneau/internal/FileUtils.html" title="class in org.apache.juneau.internal">FileUtils</a></li>
 <li><a href="org/apache/juneau/internal/FilteredMap.html" title="class in org.apache.juneau.internal">FilteredMap</a></li>
 <li><a href="org/apache/juneau/FormattedException.html" title="class in org.apache.juneau">FormattedException</a></li>
 <li><a href="org/apache/juneau/FormattedRuntimeException.html" title="class in org.apache.juneau">FormattedRuntimeException</a></li>
+<li><a href="org/apache/juneau/server/annotation/FormData.html" title="annotation in org.apache.juneau.server.annotation">FormData</a></li>
 <li><a href="org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a></li>
 <li><a href="org/apache/juneau/encoders/GzipEncoder.html" title="class in org.apache.juneau.encoders">GzipEncoder</a></li>
+<li><a href="org/apache/juneau/server/annotation/HasFormData.html" title="annotation in org.apache.juneau.server.annotation">HasFormData</a></li>
 <li><a href="org/apache/juneau/internal/HashCode.html" title="class in org.apache.juneau.internal">HashCode</a></li>
-<li><a href="org/apache/juneau/server/annotation/HasParam.html" title="annotation in org.apache.juneau.server.annotation">HasParam</a></li>
-<li><a href="org/apache/juneau/server/annotation/HasQParam.html" title="annotation in org.apache.juneau.server.annotation">HasQParam</a></li>
+<li><a href="org/apache/juneau/server/annotation/HasQuery.html" title="annotation in org.apache.juneau.server.annotation">HasQuery</a></li>
 <li><a href="org/apache/juneau/server/annotation/Header.html" title="annotation in org.apache.juneau.server.annotation">Header</a></li>
+<li><a href="org/apache/juneau/dto/swagger/HeaderInfo.html" title="class in org.apache.juneau.dto.swagger">HeaderInfo</a></li>
 <li><a href="org/apache/juneau/html/annotation/Html.html" title="annotation in org.apache.juneau.html.annotation">Html</a></li>
 <li><a href="org/apache/juneau/html/HtmlBeanPropertyMeta.html" title="class in org.apache.juneau.html">HtmlBeanPropertyMeta</a></li>
 <li><a href="org/apache/juneau/html/HtmlClassMeta.html" title="class in org.apache.juneau.html">HtmlClassMeta</a></li>
@@ -157,6 +159,7 @@
 <li><a href="org/apache/juneau/dto/atom/Id.html" title="class in org.apache.juneau.dto.atom">Id</a></li>
 <li><a href="org/apache/juneau/encoders/IdentityEncoder.html" title="class in org.apache.juneau.encoders">IdentityEncoder</a></li>
 <li><a href="org/apache/juneau/internal/IdentityList.html" title="class in org.apache.juneau.internal">IdentityList</a></li>
+<li><a href="org/apache/juneau/dto/swagger/Info.html" title="class in org.apache.juneau.dto.swagger">Info</a></li>
 <li><a href="org/apache/juneau/server/annotation/Inherit.html" title="enum in org.apache.juneau.server.annotation">Inherit</a></li>
 <li><a href="org/apache/juneau/server/response/InputStreamHandler.html" title="class in org.apache.juneau.server.response">InputStreamHandler</a></li>
 <li><a href="org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a></li>
@@ -166,6 +169,7 @@
 <li><a href="org/apache/juneau/utils/IOPipe.html" title="class in org.apache.juneau.utils">IOPipe</a></li>
 <li><a href="org/apache/juneau/utils/IOPipe.LineProcessor.html" title="interface in org.apache.juneau.utils"><span class="interfaceName">IOPipe.LineProcessor</span></a></li>
 <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>
@@ -188,6 +192,7 @@
 <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/server/jaxrs/JuneauProvider.html" title="annotation in org.apache.juneau.server.jaxrs">JuneauProvider</a></li>
 <li><a href="org/apache/juneau/internal/KeywordSet.html" title="class in org.apache.juneau.internal">KeywordSet</a></li>
+<li><a href="org/apache/juneau/dto/swagger/License.html" title="class in org.apache.juneau.dto.swagger">License</a></li>
 <li><a href="org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">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/server/vars/LocalizationVar.html" title="class in org.apache.juneau.server.vars">LocalizationVar</a></li>
@@ -206,8 +211,6 @@
 <li><a href="org/apache/juneau/server/annotation/Messages.html" title="annotation in org.apache.juneau.server.annotation">Messages</a></li>
 <li><a href="org/apache/juneau/utils/MetadataMap.html" title="class in org.apache.juneau.utils">MetadataMap</a></li>
 <li><a href="org/apache/juneau/server/annotation/Method.html" title="annotation in org.apache.juneau.server.annotation">Method</a></li>
-<li><a href="org/apache/juneau/server/labels/MethodDescription.html" title="class in org.apache.juneau.server.labels">MethodDescription</a></li>
-<li><a href="org/apache/juneau/server/labels/MethodDescription.Response.html" title="class in org.apache.juneau.server.labels">MethodDescription.Response</a></li>
 <li><a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></li>
 <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>
@@ -229,9 +232,10 @@
 <li><a href="org/apache/juneau/internal/Null.html" title="class in org.apache.juneau.internal">Null</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/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></li>
 <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/server/annotation/Param.html" title="annotation in org.apache.juneau.server.annotation">Param</a></li>
-<li><a href="org/apache/juneau/server/labels/ParamDescription.html" title="class in org.apache.juneau.server.labels">ParamDescription</a></li>
+<li><a href="org/apache/juneau/server/annotation/Parameter.html" title="annotation in org.apache.juneau.server.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>
@@ -240,6 +244,7 @@
 <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/ParserReader.html" title="class in org.apache.juneau.parser">ParserReader</a></li>
 <li><a href="org/apache/juneau/parser/ParserSession.html" title="class in org.apache.juneau.parser">ParserSession</a></li>
+<li><a href="org/apache/juneau/server/annotation/Path.html" title="annotation in org.apache.juneau.server.annotation">Path</a></li>
 <li><a href="org/apache/juneau/server/annotation/PathRemainder.html" title="annotation in org.apache.juneau.server.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>
@@ -258,7 +263,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/server/annotation/QParam.html" title="annotation in org.apache.juneau.server.annotation">QParam</a></li>
+<li><a href="org/apache/juneau/server/annotation/Query.html" title="annotation in org.apache.juneau.server.annotation">Query</a></li>
 <li><a href="org/apache/juneau/server/converters/Queryable.html" title="class in org.apache.juneau.server.converters">Queryable</a></li>
 <li><a href="org/apache/juneau/jena/annotation/Rdf.html" title="annotation in org.apache.juneau.jena.annotation">Rdf</a></li>
 <li><a href="org/apache/juneau/jena/RdfBeanMeta.html" title="class in org.apache.juneau.jena">RdfBeanMeta</a></li>
@@ -298,17 +303,15 @@
 <li><a href="org/apache/juneau/annotation/Remoteable.html" title="annotation in org.apache.juneau.annotation">Remoteable</a></li>
 <li><a href="org/apache/juneau/server/remoteable/RemoteableServiceProperties.html" title="class in org.apache.juneau.server.remoteable">RemoteableServiceProperties</a></li>
 <li><a href="org/apache/juneau/server/remoteable/RemoteableServlet.html" title="class in org.apache.juneau.server.remoteable">RemoteableServlet</a></li>
-<li><a href="org/apache/juneau/server/vars/RequestAttrVar.html" title="class in org.apache.juneau.server.vars">RequestAttrVar</a></li>
-<li><a href="org/apache/juneau/server/vars/RequestParamVar.html" title="class in org.apache.juneau.server.vars">RequestParamVar</a></li>
 <li><a href="org/apache/juneau/server/vars/RequestVar.html" title="class in org.apache.juneau.server.vars">RequestVar</a></li>
 <li><a href="org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a></li>
 <li><a href="org/apache/juneau/server/labels/ResourceDescription.html" title="class in org.apache.juneau.server.labels">ResourceDescription</a></li>
 <li><a href="org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice">ResourceGroup</a></li>
 <li><a href="org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice">ResourceJena</a></li>
 <li><a href="org/apache/juneau/server/labels/ResourceLink.html" title="class in org.apache.juneau.server.labels">ResourceLink</a></li>
-<li><a href="org/apache/juneau/server/labels/ResourceOptions.html" title="class in org.apache.juneau.server.labels">ResourceOptions</a></li>
 <li><a href="org/apache/juneau/server/annotation/Response.html" title="annotation in org.apache.juneau.server.annotation">Response</a></li>
 <li><a href="org/apache/juneau/server/ResponseHandler.html" title="interface in org.apache.juneau.server"><span class="interfaceName">ResponseHandler</span></a></li>
+<li><a href="org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a></li>
 <li><a href="org/apache/juneau/client/ResponsePattern.html" title="class in org.apache.juneau.client">ResponsePattern</a></li>
 <li><a href="org/apache/juneau/client/RestCall.html" title="class in org.apache.juneau.client">RestCall</a></li>
 <li><a href="org/apache/juneau/client/RestCallException.html" title="class in org.apache.juneau.client">RestCallException</a></li>
@@ -343,15 +346,16 @@
 <li><a href="org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html" title="class in org.apache.juneau.dto.jsonschema">Schema.JsonTypeOrJsonTypeArraySwap</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html" title="class in org.apache.juneau.dto.jsonschema">Schema.SchemaOrSchemaArraySwap</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/SchemaArray.html" title="class in org.apache.juneau.dto.jsonschema">SchemaArray</a></li>
+<li><a href="org/apache/juneau/dto/swagger/SchemaInfo.html" title="class in org.apache.juneau.dto.swagger">SchemaInfo</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/SchemaMap.html" title="class in org.apache.juneau.dto.jsonschema">SchemaMap</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/SchemaProperty.html" title="class in org.apache.juneau.dto.jsonschema">SchemaProperty</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/SchemaPropertySimpleArray.html" title="class in org.apache.juneau.dto.jsonschema">SchemaPropertySimpleArray</a></li>
 <li><a href="org/apache/juneau/dto/jsonschema/SchemaRef.html" title="class in org.apache.juneau.dto.jsonschema">SchemaRef</a></li>
 <li><a href="org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a></li>
 <li><a href="org/apache/juneau/ini/SectionListener.html" title="class in org.apache.juneau.ini">SectionListener</a></li>
+<li><a href="org/apache/juneau/dto/swagger/SecurityScheme.html" title="class in org.apache.juneau.dto.swagger">SecurityScheme</a></li>
 <li><a href="org/apache/juneau/client/SerializedNameValuePair.html" title="class in org.apache.juneau.client">SerializedNameValuePair</a></li>
 <li><a href="org/apache/juneau/server/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.server.vars">SerializedRequestAttrVar</a></li>
-<li><a href="org/apache/juneau/server/vars/SerializedRequestParamVar.html" title="class in org.apache.juneau.server.vars">SerializedRequestParamVar</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/SerializerContext.html" title="class in org.apache.juneau.serializer">SerializerContext</a></li>
@@ -379,7 +383,9 @@
 <li><a href="org/apache/juneau/serializer/StringObject.html" title="class in org.apache.juneau.serializer">StringObject</a></li>
 <li><a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></li>
 <li><a href="org/apache/juneau/transform/SurrogateSwap.html" title="class in org.apache.juneau.transform">SurrogateSwap</a></li>
+<li><a href="org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a></li>
 <li><a href="org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars">SystemPropertiesVar</a></li>
+<li><a href="org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a></li>
 <li><a href="org/apache/juneau/internal/TeeOutputStream.html" title="class in org.apache.juneau.internal">TeeOutputStream</a></li>
 <li><a href="org/apache/juneau/internal/TeeWriter.html" title="class in org.apache.juneau.internal">TeeWriter</a></li>
 <li><a href="org/apache/juneau/dto/atom/Text.html" title="class in org.apache.juneau.dto.atom">Text</a></li>
@@ -417,10 +423,7 @@
 <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/server/UrlPathPattern.html" title="class in org.apache.juneau.server">UrlPathPattern</a></li>
 <li><a href="org/apache/juneau/internal/Utils.html" title="class in org.apache.juneau.internal">Utils</a></li>
-<li><a href="org/apache/juneau/server/annotation/Var.html" title="annotation in org.apache.juneau.server.annotation">Var</a></li>
-<li><a href="org/apache/juneau/server/labels/Var.html" title="class in org.apache.juneau.server.labels">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/server/annotation/VarCategory.html" title="class in org.apache.juneau.server.annotation">VarCategory</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/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>
@@ -430,6 +433,7 @@
 <li><a href="org/apache/juneau/Writable.html" title="interface in org.apache.juneau"><span class="interfaceName">Writable</span></a></li>
 <li><a href="org/apache/juneau/server/response/WritableHandler.html" title="class in org.apache.juneau.server.response">WritableHandler</a></li>
 <li><a href="org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a></li>
+<li><a href="org/apache/juneau/dto/swagger/Xml.html" title="class in org.apache.juneau.dto.swagger">Xml</a></li>
 <li><a href="org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">Xml</a></li>
 <li><a href="org/apache/juneau/xml/XmlBeanMeta.html" title="class in org.apache.juneau.xml">XmlBeanMeta</a></li>
 <li><a href="org/apache/juneau/xml/XmlBeanPropertyMeta.html" title="class in org.apache.juneau.xml">XmlBeanPropertyMeta</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2fd81719/content/site/apidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/constant-values.html b/content/site/apidocs/constant-values.html
index 99512ec..112173d 100644
--- a/content/site/apidocs/constant-values.html
+++ b/content/site/apidocs/constant-values.html
@@ -425,62 +425,69 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a name="org.apache.juneau.html.HtmlSerializerContext.HTML_addKeyValueTableHeaders">
+<!--   -->
+</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/html/HtmlSerializerContext.html#HTML_addKeyValueTableHeaders">HTML_addKeyValueTableHeaders</a></code></td>
+<td class="colLast"><code>"HtmlSerializer.addKeyValueTableHeaders"</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a name="org.apache.juneau.html.HtmlSerializerContext.HTML_detectLinksInStrings">
 <!--   -->
 </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/html/HtmlSerializerContext.html#HTML_detectLinksInStrings">HTML_detectLinksInStrings</a></code></td>
 <td class="colLast"><code>"HtmlSerializer.detectLinksInStrings"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.apache.juneau.html.HtmlSerializerContext.HTML_labelParameter">
 <!--   -->
 </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/html/HtmlSerializerContext.html#HTML_labelParameter">HTML_labelParameter</a></code></td>
 <td class="colLast"><code>"HtmlSerializer.labelParameter"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="org.apache.juneau.html.HtmlSerializerContext.HTML_lookForLabelParameters">
 <!--   -->
 </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/html/HtmlSerializerContext.html#HTML_lookForLabelParameters">HTML_lookForLabelParameters</a></code></td>
 <td class="colLast"><code>"HtmlSerializer.lookForLabelParameters"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.apache.juneau.html.HtmlSerializerContext.HTML_uriAnchorText">
 <!--   -->
 </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/html/HtmlSerializerContext.html#HTML_uriAnchorText">HTML_uriAnchorText</a></code></td>
 <td class="colLast"><code>"HtmlSerializer.uriAnchorText"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="org.apache.juneau.html.HtmlSerializerContext.LAST_TOKEN">
 <!--   -->
 </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/html/HtmlSerializerContext.html#LAST_TOKEN">LAST_TOKEN</a></code></td>
 <td class="colLast"><code>"LAST_TOKEN"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.apache.juneau.html.HtmlSerializerContext.PROPERTY_NAME">
 <!--   -->
 </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/html/HtmlSerializerContext.html#PROPERTY_NAME">PROPERTY_NAME</a></code></td>
 <td class="colLast"><code>"PROPERTY_NAME"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="org.apache.juneau.html.HtmlSerializerContext.TO_STRING">
 <!--   -->
 </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/html/HtmlSerializerContext.html#TO_STRING">TO_STRING</a></code></td>
 <td class="colLast"><code>"TO_STRING"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.apache.juneau.html.HtmlSerializerContext.URI">
 <!--   -->
 </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/html/HtmlSerializerContext.html#URI">URI</a></code></td>
 <td class="colLast"><code>"URI"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="org.apache.juneau.html.HtmlSerializerContext.URI_ANCHOR">
 <!--   -->
 </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>
@@ -1096,11 +1103,11 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a name="org.apache.juneau.server.RestServletContext.REST_allowContentParam">
+<td class="colFirst"><a name="org.apache.juneau.server.RestServletContext.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/server/RestServletContext.html#REST_allowContentParam">REST_allowContentParam</a></code></td>
-<td class="colLast"><code>"RestServlet.allowContentParam"</code></td>
+<td><code><a href="org/apache/juneau/server/RestServletContext.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.server.RestServletContext.REST_allowHeaderParams">
@@ -1131,6 +1138,20 @@
 <td class="colLast"><code>"RestServlet.method"</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a name="org.apache.juneau.server.RestServletContext.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/server/RestServletContext.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.server.RestServletContext.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/server/RestServletContext.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.server.RestServletContext.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>
@@ -1166,12 +1187,26 @@
 <td class="colLast"><code>"RestServlet.requestURI"</code></td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a name="org.apache.juneau.server.RestServletContext.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/server/RestServletContext.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.server.RestServletContext.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/server/RestServletContext.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.server.RestServletContext.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/server/RestServletContext.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.server.RestServletContext.REST_servletURI">
 <!--   -->
@@ -1193,55 +1228,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.server.annotation.<a href="org/apache/juneau/server/annotation/VarCategory.html" title="class in org.apache.juneau.server.annotation">VarCategory</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.server.annotation.VarCategory.ATTR">
-<!--   -->
-</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/server/annotation/VarCategory.html#ATTR">ATTR</a></code></td>
-<td class="colLast"><code>"attr"</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.apache.juneau.server.annotation.VarCategory.CONTENT">
-<!--   -->
-</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/server/annotation/VarCategory.html#CONTENT">CONTENT</a></code></td>
-<td class="colLast"><code>"content"</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.apache.juneau.server.annotation.VarCategory.HEADER">
-<!--   -->
-</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/server/annotation/VarCategory.html#HEADER">HEADER</a></code></td>
-<td class="colLast"><code>"header"</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.apache.juneau.server.annotation.VarCategory.OTHER">
-<!--   -->
-</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/server/annotation/VarCategory.html#OTHER">OTHER</a></code></td>
-<td class="colLast"><code>"other"</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.apache.juneau.server.annotation.VarCategory.PARAM">
-<!--   -->
-</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/server/annotation/VarCategory.html#PARAM">PARAM</a></code></td>
-<td class="colLast"><code>"param"</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.server.remoteable.<a href="org/apache/juneau/server/remoteable/RemoteableServiceProperties.html" title="class in org.apache.juneau.server.remoteable">RemoteableServiceProperties</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2fd81719/content/site/apidocs/doc-files/Samples.AddressBookResource.Options.png
----------------------------------------------------------------------
diff --git a/content/site/apidocs/doc-files/Samples.AddressBookResource.Options.png b/content/site/apidocs/doc-files/Samples.AddressBookResource.Options.png
new file mode 100644
index 0000000..8b87cb3
Binary files /dev/null and b/content/site/apidocs/doc-files/Samples.AddressBookResource.Options.png differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2fd81719/content/site/apidocs/doc-files/Samples.MethodExampleResource.2.png
----------------------------------------------------------------------
diff --git a/content/site/apidocs/doc-files/Samples.MethodExampleResource.2.png b/content/site/apidocs/doc-files/Samples.MethodExampleResource.2.png
index a621767..89c1360 100644
Binary files a/content/site/apidocs/doc-files/Samples.MethodExampleResource.2.png and b/content/site/apidocs/doc-files/Samples.MethodExampleResource.2.png differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2fd81719/content/site/apidocs/doc-files/Server.Html.png
----------------------------------------------------------------------
diff --git a/content/site/apidocs/doc-files/Server.Html.png b/content/site/apidocs/doc-files/Server.Html.png
index 87565c5..b8881d8 100644
Binary files a/content/site/apidocs/doc-files/Server.Html.png and b/content/site/apidocs/doc-files/Server.Html.png differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2fd81719/content/site/apidocs/doc-files/Server.Options.png
----------------------------------------------------------------------
diff --git a/content/site/apidocs/doc-files/Server.Options.png b/content/site/apidocs/doc-files/Server.Options.png
index f89fea0..fee32de 100644
Binary files a/content/site/apidocs/doc-files/Server.Options.png and b/content/site/apidocs/doc-files/Server.Options.png differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2fd81719/content/site/apidocs/doc-files/Server.SystemPropertiesResource.png
----------------------------------------------------------------------
diff --git a/content/site/apidocs/doc-files/Server.SystemPropertiesResource.png b/content/site/apidocs/doc-files/Server.SystemPropertiesResource.png
new file mode 100644
index 0000000..5cce399
Binary files /dev/null and b/content/site/apidocs/doc-files/Server.SystemPropertiesResource.png differ