juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Move JettyMicroservice into separate jetty package.
Date Fri, 07 Dec 2018 16:29:50 GMT
This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 5228cac  Move JettyMicroservice into separate jetty package.
5228cac is described below

commit 5228cacbb10f8b7abe8ce4161aadaf2a043c3477
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Fri Dec 7 11:29:36 2018 -0500

    Move JettyMicroservice into separate jetty package.
---
 .../org/apache/juneau/utils/MessageBundle.java     |   2 +
 juneau-doc/docs/ReleaseNotes/5.2.0.0.html          |   2 +-
 juneau-doc/docs/ReleaseNotes/6.2.0.html            |   6 +-
 juneau-doc/docs/ReleaseNotes/6.4.0.html            |  18 +-
 .../02.GettingStarted/01.Installing.html           |   2 +-
 .../11.juneau-microservice-core/03.Manifest.html   |   4 +-
 .../docs/Topics/12.juneau-microservice-jetty.html  |   2 +-
 .../02.GettingStarted/01.Installing.html           |   2 +-
 .../12.juneau-microservice-jetty/03.Manifest.html  |   4 +-
 .../13.juneau-microservice-jetty-template.html     |   2 +-
 juneau-doc/juneau-doc.jar                          | Bin 23533 -> 23784 bytes
 .../apache/juneau/doc/internal/DocGenerator.java   |   6 +-
 .../main/javadoc/doc-files/ReleaseNotes.630.1.png  | Bin 0 -> 60161 bytes
 .../main/javadoc/doc-files/ReleaseNotes.630.2.png  | Bin 0 -> 426946 bytes
 .../ReleaseNotes.631.ContentTypeMenuItem.png       | Bin 0 -> 166904 bytes
 .../doc-files/ReleaseNotes.631.DevopsStyle.png     | Bin 0 -> 173865 bytes
 .../doc-files/ReleaseNotes.631.LightStyle.png      | Bin 0 -> 187319 bytes
 .../doc-files/ReleaseNotes.631.OriginalStyle.png   | Bin 0 -> 146147 bytes
 .../doc-files/ReleaseNotes.631.QueryMenuItem.png   | Bin 0 -> 68307 bytes
 .../doc-files/ReleaseNotes.631.StyleMenuItem.png   | Bin 0 -> 74135 bytes
 .../doc-files/ReleaseNotes.632.DarkStyle.png       | Bin 0 -> 221326 bytes
 .../doc-files/ReleaseNotes.632.PetStoreAdd.png     | Bin 0 -> 97319 bytes
 .../main/javadoc/doc-files/ReleaseNotes.711.1.png  | Bin 0 -> 51582 bytes
 .../doc-files/juneau-config.Serializing.1.png      | Bin 0 -> 39851 bytes
 .../doc-files/juneau-config.Serializing.2.png      | Bin 0 -> 48881 bytes
 .../doc-files/juneau-config.Serializing.3.png      | Bin 0 -> 59095 bytes
 .../javadoc/doc-files/juneau-examples-core.1.png   | Bin 0 -> 84524 bytes
 .../javadoc/doc-files/juneau-examples-core.2.png   | Bin 0 -> 91900 bytes
 .../javadoc/doc-files/juneau-examples-core.3.png   | Bin 0 -> 133875 bytes
 .../javadoc/doc-files/juneau-examples-rest.1.png   | Bin 0 -> 84524 bytes
 .../javadoc/doc-files/juneau-examples-rest.2.png   | Bin 0 -> 91461 bytes
 .../javadoc/doc-files/juneau-examples-rest.3.png   | Bin 0 -> 55969 bytes
 .../javadoc/doc-files/juneau-examples-rest.4.png   | Bin 0 -> 98777 bytes
 .../juneau-examples-rest.AtomFeedResource.1.png    | Bin 0 -> 176439 bytes
 .../juneau-examples-rest.AtomFeedResource.2.png    | Bin 0 -> 266611 bytes
 .../juneau-examples-rest.AtomFeedResource.3.png    | Bin 0 -> 147615 bytes
 .../juneau-examples-rest.ConfigResource.1.png      | Bin 0 -> 153114 bytes
 .../juneau-examples-rest.ConfigResource.2.png      | Bin 0 -> 269953 bytes
 ...neau-examples-rest.DockerRegistryResource.1.png | Bin 0 -> 90236 bytes
 .../juneau-examples-rest.HelloWorldResource.1.png  | Bin 0 -> 71562 bytes
 .../juneau-examples-rest.HelloWorldResource.2.png  | Bin 0 -> 15098 bytes
 .../juneau-examples-rest.JsonSchemaResource.1.png  | Bin 0 -> 172354 bytes
 .../juneau-examples-rest.JsonSchemaResource.2.png  | Bin 0 -> 110715 bytes
 .../juneau-examples-rest.LogsResource.1.png        | Bin 0 -> 206285 bytes
 ...uneau-examples-rest.MethodExampleResource.1.png | Bin 0 -> 195777 bytes
 ...uneau-examples-rest.MethodExampleResource.2.png | Bin 0 -> 191703 bytes
 ...uneau-examples-rest.MethodExampleResource.3.png | Bin 0 -> 270821 bytes
 .../juneau-examples-rest.PetStoreResource.1.png    | Bin 0 -> 1878139 bytes
 .../juneau-examples-rest.PetStoreResource.10a.png  | Bin 0 -> 48069 bytes
 .../juneau-examples-rest.PetStoreResource.10b.png  | Bin 0 -> 383659 bytes
 .../juneau-examples-rest.PetStoreResource.10c.png  | Bin 0 -> 44965 bytes
 .../juneau-examples-rest.PetStoreResource.11a.png  | Bin 0 -> 54673 bytes
 .../juneau-examples-rest.PetStoreResource.11b.png  | Bin 0 -> 116960 bytes
 .../juneau-examples-rest.PetStoreResource.2a.png   | Bin 0 -> 20939 bytes
 .../juneau-examples-rest.PetStoreResource.2b.png   | Bin 0 -> 21099 bytes
 .../juneau-examples-rest.PetStoreResource.2c.png   | Bin 0 -> 18792 bytes
 .../juneau-examples-rest.PetStoreResource.2d.png   | Bin 0 -> 29067 bytes
 .../juneau-examples-rest.PetStoreResource.3a.png   | Bin 0 -> 196893 bytes
 .../juneau-examples-rest.PetStoreResource.3b.png   | Bin 0 -> 376985 bytes
 .../juneau-examples-rest.PetStoreResource.4a.png   | Bin 0 -> 108151 bytes
 .../juneau-examples-rest.PetStoreResource.4b.png   | Bin 0 -> 70385 bytes
 .../juneau-examples-rest.PetStoreResource.5a.png   | Bin 0 -> 79909 bytes
 .../juneau-examples-rest.PetStoreResource.5b.png   | Bin 0 -> 20719 bytes
 .../juneau-examples-rest.PetStoreResource.6a.png   | Bin 0 -> 74215 bytes
 .../juneau-examples-rest.PetStoreResource.6b.png   | Bin 0 -> 73533 bytes
 .../juneau-examples-rest.PetStoreResource.7a.png   | Bin 0 -> 62296 bytes
 .../juneau-examples-rest.PetStoreResource.7b.png   | Bin 0 -> 69269 bytes
 .../juneau-examples-rest.PetStoreResource.8a.png   | Bin 0 -> 73445 bytes
 .../juneau-examples-rest.PetStoreResource.9a.png   | Bin 0 -> 90539 bytes
 .../juneau-examples-rest.PetStoreResource.9b.png   | Bin 0 -> 62821 bytes
 .../juneau-examples-rest.PetStoreResource.9c.png   | Bin 0 -> 68444 bytes
 .../juneau-examples-rest.PetStoreResource.9d.png   | Bin 0 -> 93241 bytes
 .../juneau-examples-rest.PetStoreResource.9e.png   | Bin 0 -> 34398 bytes
 .../juneau-examples-rest.PetStoreResource.9f.png   | Bin 0 -> 51092 bytes
 .../juneau-examples-rest.PetStoreResource.9g.png   | Bin 0 -> 57639 bytes
 .../juneau-examples-rest.PetStoreResource.9h.png   | Bin 0 -> 46782 bytes
 .../juneau-examples-rest.PhotosResource.1.png      | Bin 0 -> 108693 bytes
 .../juneau-examples-rest.PhotosResource.2.png      | Bin 0 -> 3006830 bytes
 .../juneau-examples-rest.RequestEchoResource.1.png | Bin 0 -> 151959 bytes
 .../juneau-examples-rest.RootResources.1.png       | Bin 0 -> 98777 bytes
 .../juneau-examples-rest.SqlQueryResource.1.png    | Bin 0 -> 99530 bytes
 .../juneau-examples-rest.SqlQueryResource.2.png    | Bin 0 -> 246365 bytes
 ...au-examples-rest.SystemPropertiesResource.1.png | Bin 0 -> 162195 bytes
 ...au-examples-rest.SystemPropertiesResource.2.png | Bin 0 -> 197935 bytes
 ...au-examples-rest.SystemPropertiesResource.3.png | Bin 0 -> 90408 bytes
 .../juneau-examples-rest.TempDirResource.1.png     | Bin 0 -> 163742 bytes
 .../juneau-examples-rest.TempDirResource.2.png     | Bin 0 -> 92437 bytes
 .../juneau-examples-rest.TempDirResource.3.png     | Bin 0 -> 193078 bytes
 ...juneau-examples-rest.TumblrParserResource.1.png | Bin 0 -> 201475 bytes
 ...neau-examples-rest.UrlEncodedFormResource.1.png | Bin 0 -> 102545 bytes
 ...neau-examples-rest.UrlEncodedFormResource.2.png | Bin 0 -> 131215 bytes
 .../juneau-rest-server.HelloWorldExample.1.png     | Bin 0 -> 73686 bytes
 ...erver.HtmlDocAnnotation.PredefinedWidgets.1.png | Bin 0 -> 137327 bytes
 ...erver.HtmlDocAnnotation.PredefinedWidgets.2.png | Bin 0 -> 68449 bytes
 ...erver.HtmlDocAnnotation.PredefinedWidgets.3.png | Bin 0 -> 253370 bytes
 ...erver.HtmlDocAnnotation.PredefinedWidgets.4.png | Bin 0 -> 5081 bytes
 .../juneau-rest-server.OptionsPages.1.png          | Bin 0 -> 281814 bytes
 .../juneau-rest-server.PredefinedLabelBeans.1.png  | Bin 0 -> 23665 bytes
 .../juneau-rest-server.PredefinedLabelBeans.2.png  | Bin 0 -> 72375 bytes
 .../juneau-rest-server.PredefinedLabelBeans.3.png  | Bin 0 -> 7975 bytes
 .../juneau-rest-server.PredefinedLabelBeans.4.png  | Bin 0 -> 102963 bytes
 .../doc-files/juneau-rest-server.RouterPages.1.png | Bin 0 -> 233223 bytes
 .../doc-files/juneau-rest-server.Stylesheets.0.png | Bin 0 -> 233293 bytes
 .../doc-files/juneau-rest-server.Stylesheets.1.png | Bin 0 -> 26898 bytes
 .../doc-files/juneau-rest-server.Stylesheets.2.png | Bin 0 -> 334340 bytes
 .../doc-files/juneau-rest-server.Stylesheets.3.png | Bin 0 -> 298163 bytes
 .../doc-files/juneau-rest-server.Swagger.1.png     | Bin 0 -> 174380 bytes
 .../doc-files/juneau-rest-server.Swagger.2.png     | Bin 0 -> 194455 bytes
 .../doc-files/juneau-rest-server.Swagger.3.png     | Bin 0 -> 79498 bytes
 .../doc-files/juneau-rest-server.Swagger.4.png     | Bin 0 -> 99968 bytes
 .../doc-files/juneau-rest-server.Swagger.5.png     | Bin 0 -> 63056 bytes
 .../juneau-rest-server.Swagger.Models.1.png        | Bin 0 -> 176855 bytes
 .../juneau-rest-server.Swagger.Models.2.png        | Bin 0 -> 131057 bytes
 .../juneau-rest-server.Swagger.Models.3.png        | Bin 0 -> 59691 bytes
 .../juneau-rest-server.Swagger.Operations.1.png    | Bin 0 -> 168211 bytes
 .../juneau-rest-server.Swagger.Operations.2.png    | Bin 0 -> 82846 bytes
 .../juneau-rest-server.Swagger.Operations.3.png    | Bin 0 -> 303830 bytes
 .../juneau-rest-server.Swagger.Operations.4.png    | Bin 0 -> 137041 bytes
 .../juneau-rest-server.Swagger.Parameters.1.png    | Bin 0 -> 92998 bytes
 .../juneau-rest-server.Swagger.Parameters.2.png    | Bin 0 -> 138574 bytes
 .../juneau-rest-server.Swagger.Parameters.3.png    | Bin 0 -> 150192 bytes
 .../juneau-rest-server.Swagger.Parameters.4.png    | Bin 0 -> 73142 bytes
 ...neau-rest-server.Swagger.ResponseExamples.1.png | Bin 0 -> 105746 bytes
 ...neau-rest-server.Swagger.ResponseExamples.2.png | Bin 0 -> 35135 bytes
 ...neau-rest-server.Swagger.ResponseExamples.3.png | Bin 0 -> 32920 bytes
 ...neau-rest-server.Swagger.ResponseExamples.4.png | Bin 0 -> 73190 bytes
 .../juneau-rest-server.UiCustomization.1.png       | Bin 0 -> 267773 bytes
 .../juneau-rest-server.UiCustomization.2.png       | Bin 0 -> 7196 bytes
 .../juneau-rest-server.UiCustomization.3.png       | Bin 0 -> 6957 bytes
 .../doc-files/juneau-rest-server.restRPC.1.png     | Bin 0 -> 231550 bytes
 .../doc-files/juneau-rest-server.restRPC.2.png     | Bin 0 -> 130661 bytes
 .../doc-files/juneau-rest-server.restRPC.3.png     | Bin 0 -> 170873 bytes
 .../doc-files/juneau-rest-server.restRPC.4.png     | Bin 0 -> 96014 bytes
 .../doc-files/juneau-rest-server.restRPC.5.png     | Bin 0 -> 62998 bytes
 .../doc-files/juneau-rest-server.restRPC.6.png     | Bin 0 -> 158415 bytes
 .../doc-files/juneau-rest-server.restRPC.7.png     | Bin 0 -> 110931 bytes
 .../doc-files/juneau-rest-server.restRPC.8.png     | Bin 0 -> 122164 bytes
 .../doc-files/juneau-rest-server.restRPC.9.png     | Bin 0 -> 114351 bytes
 juneau-doc/src/main/javadoc/overview.html          | 144 +++++--
 juneau-doc/src/main/javadoc/resources/docs.txt     |   2 +-
 .../main/javadoc/resources/fragments/about.html    |  36 ++
 .../src/main/javadoc/resources/fragments/toc.html  | 416 +++++++++++++++++++++
 .../juneau-examples-rest-jetty/examples.cfg        |   2 +-
 .../org/apache/juneau/examples/rest/jetty/App.java |   2 +-
 .../juneau/examples/rest/SamplesMicroservice.java  |   2 +-
 .../juneau-examples-rest-springboot/examples.cfg   |   2 +-
 .../apache/juneau/examples/rest/RootResources.java |   1 +
 .../juneau-microservice-core/pom.xml               |  11 -
 .../juneau/microservice/MicroserviceBuilder.java   |   1 -
 .../microservice/console/ConsoleCommand.java       |   2 +-
 .../build-overlay/my-microservice.launch           |   2 +-
 .../build-overlay/pom.xml                          |   2 +-
 .../my-microservice.cfg                            |   2 +-
 .../my-microservice.launch                         |   2 +-
 .../juneau-microservice-jetty/pom.xml              |   2 +-
 .../BasicJettyMicroserviceListener.java            |   4 +-
 .../{ => jetty}/BasicJettyServerFactory.java       |   2 +-
 .../microservice/{ => jetty}/JettyLogger.java      |   4 +-
 .../{ => jetty}/JettyMicroservice.java             |   5 +-
 .../{ => jetty}/JettyMicroserviceBuilder.java      |   3 +-
 .../{ => jetty}/JettyMicroserviceListener.java     |   4 +-
 .../{ => jetty}/JettyServerFactory.java            |   2 +-
 .../microservice/{ => jetty}/package-info.java     |   2 +-
 .../{ => jetty}/resources/DebugResource.java       |   4 +-
 .../{ => jetty}/JettyMicroservice.properties       |   0
 .../build-overlay/my-microservice.launch           |   2 +-
 .../build-overlay/pom.xml                          |   2 +-
 .../my-microservice.launch                         |   2 +-
 .../juneau-microservice-test.cfg                   |   2 +-
 .../juneau-microservice-test.launch                |   2 +-
 .../java/org/apache/juneau/rest/test/Root.java     |   1 +
 .../apache/juneau/rest/test/TestMicroservice.java  |   4 +-
 172 files changed, 623 insertions(+), 103 deletions(-)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java
index 429f519..8d2a88a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java
@@ -158,6 +158,8 @@ public class MessageBundle extends ResourceBundle {
 	private MessageBundle(Class<?> forClass, String bundlePath, Locale locale) {
 		this.forClass = forClass;
 		this.className = forClass.getSimpleName();
+		if (bundlePath == null)
+			throw new RuntimeException("Bundle path was null.");
 		if (bundlePath.endsWith(".properties"))
 			throw new RuntimeException("Bundle path should not end with '.properties'");
 		this.bundlePath = bundlePath;
diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
index 7c51bd7..a3d0ea5 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
@@ -384,7 +384,7 @@
 	<li>Completely revamped API.
 	<li>New {@link oaj.microservice.Microservice} class that serves as a generic
 		interface for microservices and their lifecycles.
-	<li>New {@link oaj.microservice.RestMicroservice} class that implements a microservice
+	<li>New <code><del>RestMicroservice</del></code> class that implements a microservice
 		consisting of a REST interface.
 		<ul>
 			<li>REST resources and configuration settings can be defined through either manifest files
diff --git a/juneau-doc/docs/ReleaseNotes/6.2.0.html b/juneau-doc/docs/ReleaseNotes/6.2.0.html
index 7c653a0..7735cce 100644
--- a/juneau-doc/docs/ReleaseNotes/6.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.2.0.html
@@ -294,10 +294,10 @@
 <ul class='spaced-list'>
 	<li><js>"REST/port"</js> configuration setting can now be a comma-limited list of port numbers to try.
 		<br>You can also specify one or more <code>0</code>s to try a random port.
-	<li>Methods added to {@link oaj.microservice.RestMicroservice} class:
+	<li>Methods added to <code><del>RestMicroservice</del></code> class:
 	<ul>
-		<li>{@link oaj.microservice.RestMicroservice#getPort()}
-		<li>{@link oaj.microservice.RestMicroservice#getURI()}
+		<li><code><del>getPort()</del></code>
+		<li><code><del>getURI()</del></code>
 		<li>Override methods added from {@link oaj.microservice.Microservice} class for easier method chaining.
 	</ul>
 </ul>		
diff --git a/juneau-doc/docs/ReleaseNotes/6.4.0.html b/juneau-doc/docs/ReleaseNotes/6.4.0.html
index 1ee219b..06f1523 100644
--- a/juneau-doc/docs/ReleaseNotes/6.4.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.4.0.html
@@ -472,16 +472,16 @@
 		for maximum flexibility instead of the hodge-podge of support in the config file.
 		<br>Top-level servlets should now be defined in the provided <code>jetty.xml</code> file.
 	<li>
-		New methods on {@link oaj.microservice.RestMicroservice}:
+		New methods on <code><del>RestMicroservice</del></code>:
 		<ul>
-			<li>{@link oaj.microservice.RestMicroservice#addServlet(Servlet,String) addServlet(Servlet,String)}
-			<li>{@link oaj.microservice.RestMicroservice#addServletAttribute(String,Object) addServletAttribute(String,Object)}
-			<li>{@link oaj.microservice.RestMicroservice#getServer() getServer()}
-			<li>{@link oaj.microservice.RestMicroservice#getInstance() getInstance()}
-			<li>{@link oaj.microservice.RestMicroservice#getPort() getPort()}
-			<li>{@link oaj.microservice.RestMicroservice#getContextPath() getContextPath()}
-			<li>{@link oaj.microservice.RestMicroservice#getProtocol() getProtocol()}
-			<li>{@link oaj.microservice.RestMicroservice#getHostName() getHostName()}
+			<li><code><del>addServlet(Servlet,String)</del></code>
+			<li><code><del>addServletAttribute(String,Object)</del></code>
+			<li><code><del>getServer()</del></code>
+			<li><code><del>getInstance()</del></code>
+			<li><code><del>getPort()</del></code>
+			<li><code><del>getContextPath()</del></code>
+			<li><code><del>getProtocol()</del></code>
+			<li><code><del>getHostName()</del></code>
 		</ul>
 	<li>
 		New methods on {@link oaj.microservice.Microservice}:
diff --git a/juneau-doc/docs/Topics/11.juneau-microservice-core/02.GettingStarted/01.Installing.html b/juneau-doc/docs/Topics/11.juneau-microservice-core/02.GettingStarted/01.Installing.html
index 349d5de..ab7bdb2 100644
--- a/juneau-doc/docs/Topics/11.juneau-microservice-core/02.GettingStarted/01.Installing.html
+++ b/juneau-doc/docs/Topics/11.juneau-microservice-core/02.GettingStarted/01.Installing.html
@@ -147,7 +147,7 @@ Installing in Eclipse
 	# org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StrErrLog</cc>
 	
 	<cc># Configure Jetty to log using java-util logging</cc>
-	<ck>org.eclipse.jetty.util.log.class</ck> = <cv>org.apache.juneau.microservice.JettyLogger</cv>
+	<ck>org.eclipse.jetty.util.log.class</ck> = <cv>org.apache.juneau.microservice.jetty.JettyLogger</cv>
 	
 	<cc># Jetty logging level
 	# Possible values:  ALL, DEBUG, INFO, WARN, OFF</cc>
diff --git a/juneau-doc/docs/Topics/11.juneau-microservice-core/03.Manifest.html b/juneau-doc/docs/Topics/11.juneau-microservice-core/03.Manifest.html
index ba558e4..3f2d849 100644
--- a/juneau-doc/docs/Topics/11.juneau-microservice-core/03.Manifest.html
+++ b/juneau-doc/docs/Topics/11.juneau-microservice-core/03.Manifest.html
@@ -20,11 +20,11 @@
 	<br>If you open it, you'll see the following:
 </p>
 <p class='bpcode w800'>
-	<mk>Main-Class</mk>: <mv>org.apache.juneau.microservice.RestMicroservice</mv>
+	<mk>Main-Class</mk>: <mv>org.apache.juneau.microservice.jetty.RestMicroservice</mv>
 	<mk>Main-ConfigFile</mk>: <mv>my-microservice.cfg</mv>
 <p>
  	The <mk>Main-Class</mk> entry is the standard manifest entry describing the entry point for the executable jar.
- 	<br>In most cases, this value will always be <l>org.apache.juneau.microservice.RestMicroservice</l>.
+ 	<br>In most cases, this value will always be <l>org.apache.juneau.microservice.jetty.RestMicroservice</l>.
  	<br>However, it is possible to extend this class or implement your own microservice, in which case you'll need
  	to modify this value to point to the new class.
 </p>
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-jetty.html b/juneau-doc/docs/Topics/12.juneau-microservice-jetty.html
index 17d02ab..7d15277 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-jetty.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-jetty.html
@@ -31,7 +31,7 @@
 
 <h5 class='figure'>OSGi Module</h5>
 <p class='bpcode w500'>
-	org.apache.juneau.microservice.server_{@property juneauVersion}.jar 
+	org.apache.juneau.microservice.jetty.server_{@property juneauVersion}.jar 
 </p>	
 
 <h5 class='figure'>Microservice Starter Project</h5>
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/02.GettingStarted/01.Installing.html b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/02.GettingStarted/01.Installing.html
index 349d5de..ab7bdb2 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/02.GettingStarted/01.Installing.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/02.GettingStarted/01.Installing.html
@@ -147,7 +147,7 @@ Installing in Eclipse
 	# org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StrErrLog</cc>
 	
 	<cc># Configure Jetty to log using java-util logging</cc>
-	<ck>org.eclipse.jetty.util.log.class</ck> = <cv>org.apache.juneau.microservice.JettyLogger</cv>
+	<ck>org.eclipse.jetty.util.log.class</ck> = <cv>org.apache.juneau.microservice.jetty.JettyLogger</cv>
 	
 	<cc># Jetty logging level
 	# Possible values:  ALL, DEBUG, INFO, WARN, OFF</cc>
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.Manifest.html b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.Manifest.html
index ba558e4..3f2d849 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.Manifest.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.Manifest.html
@@ -20,11 +20,11 @@
 	<br>If you open it, you'll see the following:
 </p>
 <p class='bpcode w800'>
-	<mk>Main-Class</mk>: <mv>org.apache.juneau.microservice.RestMicroservice</mv>
+	<mk>Main-Class</mk>: <mv>org.apache.juneau.microservice.jetty.RestMicroservice</mv>
 	<mk>Main-ConfigFile</mk>: <mv>my-microservice.cfg</mv>
 <p>
  	The <mk>Main-Class</mk> entry is the standard manifest entry describing the entry point for the executable jar.
- 	<br>In most cases, this value will always be <l>org.apache.juneau.microservice.RestMicroservice</l>.
+ 	<br>In most cases, this value will always be <l>org.apache.juneau.microservice.jetty.RestMicroservice</l>.
  	<br>However, it is possible to extend this class or implement your own microservice, in which case you'll need
  	to modify this value to point to the new class.
 </p>
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template.html
index 04c0e5f..98e5ee3 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template.html
+++ b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template.html
@@ -31,7 +31,7 @@
 
 <h5 class='figure'>OSGi Module</h5>
 <p class='bpcode w500'>
-	org.apache.juneau.microservice.server_{@property juneauVersion}.jar 
+	org.apache.juneau.microservice.jetty.server_{@property juneauVersion}.jar 
 </p>	
 
 <h5 class='figure'>Microservice Starter Project</h5>
diff --git a/juneau-doc/juneau-doc.jar b/juneau-doc/juneau-doc.jar
index c4eaec6..ebd65f5 100644
Binary files a/juneau-doc/juneau-doc.jar and b/juneau-doc/juneau-doc.jar differ
diff --git a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
index 94f075a..2e45c7b 100644
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
@@ -163,15 +163,15 @@ public class DocGenerator {
 				Files.delete(f.toPath());
 
 			for (File f : topics.docFiles)
-				Files.copy(f.toPath(), Paths.get("src/main/javadoc/doc-files", f.getName()));
+				Files.copy(f.toPath(), Paths.get("src/main/javadoc/doc-files", f.getName()), StandardCopyOption.REPLACE_EXISTING);
 			for (File f : releaseNotes.docFiles)
-				Files.copy(f.toPath(), Paths.get("src/main/javadoc/doc-files", f.getName()));
+				Files.copy(f.toPath(), Paths.get("src/main/javadoc/doc-files", f.getName()), StandardCopyOption.REPLACE_EXISTING);
 
 			String toc2 = new StringBuilder().append("<!--").append(COPYRIGHT).append("\n-->\n").append(toc).toString();
 			IOUtils.writeFile("src/main/javadoc/resources/fragments/toc.html", toc2);
 
 			for (File f : new File("docs/Fragments").listFiles())
-				Files.copy(f.toPath(), Paths.get("src/main/javadoc/resources/fragments", f.getName()));
+				Files.copy(f.toPath(), Paths.get("src/main/javadoc/resources/fragments", f.getName()), StandardCopyOption.REPLACE_EXISTING);
 
 			info("Copied doc-files in {0}ms", System.currentTimeMillis()-startTime);
 
diff --git a/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.630.1.png b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.630.1.png
new file mode 100644
index 0000000..f070aea
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.630.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.630.2.png b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.630.2.png
new file mode 100644
index 0000000..265e727
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.630.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.ContentTypeMenuItem.png b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.ContentTypeMenuItem.png
new file mode 100644
index 0000000..02cc672
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.ContentTypeMenuItem.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.DevopsStyle.png b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.DevopsStyle.png
new file mode 100644
index 0000000..9675ac8
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.DevopsStyle.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.LightStyle.png b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.LightStyle.png
new file mode 100644
index 0000000..600ee47
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.LightStyle.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.OriginalStyle.png b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.OriginalStyle.png
new file mode 100644
index 0000000..6edcc5b
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.OriginalStyle.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.QueryMenuItem.png b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.QueryMenuItem.png
new file mode 100644
index 0000000..92b6d7c
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.QueryMenuItem.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.StyleMenuItem.png b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.StyleMenuItem.png
new file mode 100644
index 0000000..e3d1ff3
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.631.StyleMenuItem.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.632.DarkStyle.png b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.632.DarkStyle.png
new file mode 100644
index 0000000..73732dc
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.632.DarkStyle.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.632.PetStoreAdd.png b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.632.PetStoreAdd.png
new file mode 100644
index 0000000..3052050
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.632.PetStoreAdd.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.711.1.png b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.711.1.png
new file mode 100644
index 0000000..784c479
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/ReleaseNotes.711.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-config.Serializing.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-config.Serializing.1.png
new file mode 100644
index 0000000..531f280
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-config.Serializing.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-config.Serializing.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-config.Serializing.2.png
new file mode 100644
index 0000000..7f5a4b3
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-config.Serializing.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-config.Serializing.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-config.Serializing.3.png
new file mode 100644
index 0000000..749da14
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-config.Serializing.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.1.png
new file mode 100644
index 0000000..3b9b4e1
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.2.png
new file mode 100644
index 0000000..dc73f29
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.3.png
new file mode 100644
index 0000000..6c8521c
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.1.png
new file mode 100644
index 0000000..3b9b4e1
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.2.png
new file mode 100644
index 0000000..bb30587
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.3.png
new file mode 100644
index 0000000..320fc6e
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.4.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.4.png
new file mode 100644
index 0000000..3eff3a5
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.4.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.AtomFeedResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.AtomFeedResource.1.png
new file mode 100644
index 0000000..89ad0cb
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.AtomFeedResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.AtomFeedResource.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.AtomFeedResource.2.png
new file mode 100644
index 0000000..3f7ff40
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.AtomFeedResource.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.AtomFeedResource.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.AtomFeedResource.3.png
new file mode 100644
index 0000000..1c6aebd
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.AtomFeedResource.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.ConfigResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.ConfigResource.1.png
new file mode 100644
index 0000000..38fb734
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.ConfigResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.ConfigResource.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.ConfigResource.2.png
new file mode 100644
index 0000000..0a33d35
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.ConfigResource.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.DockerRegistryResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.DockerRegistryResource.1.png
new file mode 100644
index 0000000..3937264
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.DockerRegistryResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.HelloWorldResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.HelloWorldResource.1.png
new file mode 100644
index 0000000..a826c98
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.HelloWorldResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.HelloWorldResource.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.HelloWorldResource.2.png
new file mode 100644
index 0000000..9772635
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.HelloWorldResource.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.JsonSchemaResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.JsonSchemaResource.1.png
new file mode 100644
index 0000000..e275534
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.JsonSchemaResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.JsonSchemaResource.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.JsonSchemaResource.2.png
new file mode 100644
index 0000000..68c65d3
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.JsonSchemaResource.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.LogsResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.LogsResource.1.png
new file mode 100644
index 0000000..f6cea03
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.LogsResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.MethodExampleResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.MethodExampleResource.1.png
new file mode 100644
index 0000000..3cb4322
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.MethodExampleResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.MethodExampleResource.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.MethodExampleResource.2.png
new file mode 100644
index 0000000..c69e18c
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.MethodExampleResource.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.MethodExampleResource.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.MethodExampleResource.3.png
new file mode 100644
index 0000000..8552e3d
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.MethodExampleResource.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.1.png
new file mode 100644
index 0000000..fc65f06
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.10a.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.10a.png
new file mode 100644
index 0000000..6ca5314
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.10a.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.10b.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.10b.png
new file mode 100644
index 0000000..86c1242
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.10b.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.10c.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.10c.png
new file mode 100644
index 0000000..b58bde2
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.10c.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.11a.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.11a.png
new file mode 100644
index 0000000..54db86f
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.11a.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.11b.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.11b.png
new file mode 100644
index 0000000..9c4f3a8
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.11b.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2a.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2a.png
new file mode 100644
index 0000000..9515c5c
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2a.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2b.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2b.png
new file mode 100644
index 0000000..2afcbcf
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2b.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2c.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2c.png
new file mode 100644
index 0000000..7e27708
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2c.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2d.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2d.png
new file mode 100644
index 0000000..014fcf6
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.2d.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.3a.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.3a.png
new file mode 100644
index 0000000..ae029d8
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.3a.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.3b.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.3b.png
new file mode 100644
index 0000000..9193b1d
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.3b.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.4a.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.4a.png
new file mode 100644
index 0000000..dd91a17
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.4a.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.4b.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.4b.png
new file mode 100644
index 0000000..76f1378
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.4b.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.5a.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.5a.png
new file mode 100644
index 0000000..bedf2c0
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.5a.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.5b.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.5b.png
new file mode 100644
index 0000000..46cd848
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.5b.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.6a.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.6a.png
new file mode 100644
index 0000000..ebf918f
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.6a.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.6b.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.6b.png
new file mode 100644
index 0000000..ca6edcd
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.6b.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.7a.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.7a.png
new file mode 100644
index 0000000..d31cc91
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.7a.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.7b.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.7b.png
new file mode 100644
index 0000000..5275642
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.7b.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.8a.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.8a.png
new file mode 100644
index 0000000..a7ea65e
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.8a.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9a.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9a.png
new file mode 100644
index 0000000..b6a96d8
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9a.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9b.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9b.png
new file mode 100644
index 0000000..73a7129
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9b.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9c.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9c.png
new file mode 100644
index 0000000..d229cc1
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9c.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9d.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9d.png
new file mode 100644
index 0000000..7735103
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9d.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9e.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9e.png
new file mode 100644
index 0000000..ff0d72b
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9e.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9f.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9f.png
new file mode 100644
index 0000000..971affd
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9f.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9g.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9g.png
new file mode 100644
index 0000000..0e25185
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9g.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9h.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9h.png
new file mode 100644
index 0000000..3c11f64
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.9h.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PhotosResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PhotosResource.1.png
new file mode 100644
index 0000000..e20ac0c
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PhotosResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PhotosResource.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PhotosResource.2.png
new file mode 100644
index 0000000..c6278d5
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PhotosResource.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.RequestEchoResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.RequestEchoResource.1.png
new file mode 100644
index 0000000..c28f184
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.RequestEchoResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.RootResources.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.RootResources.1.png
new file mode 100644
index 0000000..3eff3a5
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.RootResources.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SqlQueryResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SqlQueryResource.1.png
new file mode 100644
index 0000000..2e8d95a
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SqlQueryResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SqlQueryResource.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SqlQueryResource.2.png
new file mode 100644
index 0000000..dd1d38b
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SqlQueryResource.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SystemPropertiesResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SystemPropertiesResource.1.png
new file mode 100644
index 0000000..6779ace
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SystemPropertiesResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SystemPropertiesResource.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SystemPropertiesResource.2.png
new file mode 100644
index 0000000..5e79a4d
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SystemPropertiesResource.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SystemPropertiesResource.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SystemPropertiesResource.3.png
new file mode 100644
index 0000000..a40ac54
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.SystemPropertiesResource.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TempDirResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TempDirResource.1.png
new file mode 100644
index 0000000..0cdbaca
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TempDirResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TempDirResource.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TempDirResource.2.png
new file mode 100644
index 0000000..42ba0ea
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TempDirResource.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TempDirResource.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TempDirResource.3.png
new file mode 100644
index 0000000..125edb0
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TempDirResource.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TumblrParserResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TumblrParserResource.1.png
new file mode 100644
index 0000000..b11b2e4
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.TumblrParserResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.UrlEncodedFormResource.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.UrlEncodedFormResource.1.png
new file mode 100644
index 0000000..49e8dfe
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.UrlEncodedFormResource.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.UrlEncodedFormResource.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.UrlEncodedFormResource.2.png
new file mode 100644
index 0000000..f1684c8
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.UrlEncodedFormResource.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HelloWorldExample.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HelloWorldExample.1.png
new file mode 100644
index 0000000..d7d0684
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HelloWorldExample.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.1.png
new file mode 100644
index 0000000..6c8db5c
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.2.png
new file mode 100644
index 0000000..a577695
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.3.png
new file mode 100644
index 0000000..71679f9
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.4.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.4.png
new file mode 100644
index 0000000..7273413
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.4.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.OptionsPages.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.OptionsPages.1.png
new file mode 100644
index 0000000..82ca9d6
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.OptionsPages.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.1.png
new file mode 100644
index 0000000..76a85e2
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.2.png
new file mode 100644
index 0000000..9a56c43
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.3.png
new file mode 100644
index 0000000..0ccbc37
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.4.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.4.png
new file mode 100644
index 0000000..35c0c27
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.PredefinedLabelBeans.4.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.RouterPages.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.RouterPages.1.png
new file mode 100644
index 0000000..40918c4
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.RouterPages.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.0.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.0.png
new file mode 100644
index 0000000..6b59ab4
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.0.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.1.png
new file mode 100644
index 0000000..ab4d89f
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.2.png
new file mode 100644
index 0000000..3e2bf37
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.3.png
new file mode 100644
index 0000000..f37dd2c
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Stylesheets.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.1.png
new file mode 100644
index 0000000..69b656f
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.2.png
new file mode 100644
index 0000000..284fa85
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.3.png
new file mode 100644
index 0000000..c642c41
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.4.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.4.png
new file mode 100644
index 0000000..42762e0
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.4.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.5.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.5.png
new file mode 100644
index 0000000..d889fa7
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.5.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Models.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Models.1.png
new file mode 100644
index 0000000..56f02b3
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Models.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Models.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Models.2.png
new file mode 100644
index 0000000..d57032f
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Models.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Models.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Models.3.png
new file mode 100644
index 0000000..01df721
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Models.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.1.png
new file mode 100644
index 0000000..b565c45
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.2.png
new file mode 100644
index 0000000..9cbc361
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.3.png
new file mode 100644
index 0000000..4bc1127
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.4.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.4.png
new file mode 100644
index 0000000..2ce33be
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Operations.4.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.1.png
new file mode 100644
index 0000000..9ce4970
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.2.png
new file mode 100644
index 0000000..50c3426
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.3.png
new file mode 100644
index 0000000..e95de2c
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.4.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.4.png
new file mode 100644
index 0000000..2b47cd1
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.Parameters.4.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png
new file mode 100644
index 0000000..160a0a4
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.2.png
new file mode 100644
index 0000000..408241b
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png
new file mode 100644
index 0000000..0ed1318
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.4.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.4.png
new file mode 100644
index 0000000..ca6002f
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.Swagger.ResponseExamples.4.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.UiCustomization.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.UiCustomization.1.png
new file mode 100644
index 0000000..f05d0f5
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.UiCustomization.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.UiCustomization.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.UiCustomization.2.png
new file mode 100644
index 0000000..a2a6a07
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.UiCustomization.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.UiCustomization.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.UiCustomization.3.png
new file mode 100644
index 0000000..e196d1a
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.UiCustomization.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.1.png
new file mode 100644
index 0000000..e052e7b
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.1.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.2.png
new file mode 100644
index 0000000..f880d51
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.2.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.3.png
new file mode 100644
index 0000000..e3f25df
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.4.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.4.png
new file mode 100644
index 0000000..c9c0f1c
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.4.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.5.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.5.png
new file mode 100644
index 0000000..bf38b24
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.5.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.6.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.6.png
new file mode 100644
index 0000000..c42c775
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.6.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.7.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.7.png
new file mode 100644
index 0000000..ef4b7ab
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.7.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.8.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.8.png
new file mode 100644
index 0000000..9b3a139
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.8.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.9.png b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.9.png
new file mode 100644
index 0000000..2d6ff54
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.9.png differ
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index 750189b..4c34535 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -395,55 +395,55 @@
 	</ol>
 	<li><p class='toc2 todo'><a class='doclink' href='#juneau-microservice-core'>juneau-microservice-server</a></p>
 	<ol>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-core.Introduction'>Microservice Introduction</a></p>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-core.GettingStarted'>Getting Started</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-core.Introduction'>Microservice Introduction</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-core.GettingStarted'>Getting Started</a></p>
 		<ol>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-core.GettingStarted.Installing'>Installing in Eclipse</a></p>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-core.GettingStarted.Running'>Running in Eclipse</a></p>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-core.GettingStarted.Building'>Building and Running from Command-Line</a></p>
 		</ol>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-core.Manifest'>Manifest File</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-core.Manifest'>Manifest File</a></p>
 		<ol>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-core.Manifest.ManifestApi'>Manifest API</a></p>
 		</ol>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-core.Config'>Config</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-core.Config'>Config</a></p>
 		<ol>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-core.Config.ConfigApi'>Config File API</a></p>
 		</ol>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-core.ResourceClasses'>Resource Classes</a></p>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-core.PredefinedResourceClasses'>Predefined Resource Classes</a></p>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-core.RestMicroservice'>RestMicroservice</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-core.ResourceClasses'>Resource Classes</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-core.PredefinedResourceClasses'>Predefined Resource Classes</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-core.RestMicroservice'>RestMicroservice</a></p>
 		<ol>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-core.RestMicroservice.Extending'>Extending RestMicroservice</a></p>
 		</ol>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-core.UiCustomization'>UI Customization</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-core.UiCustomization'>UI Customization</a></p>
 	</ol>
 	<li><p class='toc2 todo'><a class='doclink' href='#juneau-microservice-jetty'>juneau-microservice-server</a></p>
 	<ol>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.Introduction'>Microservice Introduction</a></p>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.GettingStarted'>Getting Started</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-jetty.Introduction'>Microservice Introduction</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-jetty.GettingStarted'>Getting Started</a></p>
 		<ol>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.GettingStarted.Installing'>Installing in Eclipse</a></p>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.GettingStarted.Running'>Running in Eclipse</a></p>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.GettingStarted.Building'>Building and Running from Command-Line</a></p>
 		</ol>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.Manifest'>Manifest File</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-jetty.Manifest'>Manifest File</a></p>
 		<ol>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.Manifest.ManifestApi'>Manifest API</a></p>
 		</ol>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.Config'>Config</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-jetty.Config'>Config</a></p>
 		<ol>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.Config.ConfigApi'>Config File API</a></p>
 		</ol>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.ResourceClasses'>Resource Classes</a></p>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.PredefinedResourceClasses'>Predefined Resource Classes</a></p>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.RestMicroservice'>RestMicroservice</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-jetty.ResourceClasses'>Resource Classes</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-jetty.PredefinedResourceClasses'>Predefined Resource Classes</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-jetty.RestMicroservice'>RestMicroservice</a></p>
 		<ol>
 			<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.RestMicroservice.Extending'>Extending RestMicroservice</a></p>
 		</ol>
-		<li><p class=''><a class='doclink' href='#juneau-microservice-jetty.UiCustomization'>UI Customization</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-microservice-jetty.UiCustomization'>UI Customization</a></p>
 	</ol>
-	<li><p class='toc2 todo'><a class='doclink' href='#juneau-microservice-jetty-template'>juneau-microservice-server</a></p>
+	<li><p class='toc2 todo'><a class='doclink' href='#juneau-microservice-jetty-template'>juneau-microservice-jetty-template</a></p>
 	<li><p class='toc2 '><a class='doclink' href='#juneau-examples-core'>juneau-examples-core</a></p>
 	<li><p class='toc2 todo'><a class='doclink' href='#juneau-examples-rest'>juneau-examples-rest</a></p>
 	<ol>
@@ -456,7 +456,7 @@
 	</ol>
 	<li><p class='toc2 todo'><a class='doclink' href='#juneau-examples-rest-jetty'>juneau-examples-rest</a></p>
 	<ol>
-		<li><p class='new'><a class='doclink' href='#juneau-examples-rest-jetty.Classes'>Classes</a></p>
+		<li><p class='todo'><a class='doclink' href='#juneau-examples-rest-jetty.Classes'>Classes</a></p>
 		<li><p class='todo'><a class='doclink' href='#juneau-examples-rest-jetty.DeployingToHeroku'>Deploying to Heroku</a></p>
 	</ol>
 	<li><p class='toc2 todo'><a class='doclink' href='#juneau-examples-rest-springboot'>juneau-examples-rest-springboot</a></p>
@@ -23457,7 +23457,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-core.Introduction' id='juneau-microservice-core.Introduction'>11.1 - Microservice Introduction</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-core.Introduction' id='juneau-microservice-core.Introduction'>11.1 - Microservice Introduction</a></h3>
 <div class='topic'><!-- START: 11.1 - juneau-microservice-core.Introduction -->
 <p>
 	The Microservice API consists of a combination of the Juneau Core, Server, and Client APIs and an embedded
@@ -23502,7 +23502,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-core.GettingStarted' id='juneau-microservice-core.GettingStarted'>11.2 - Getting Started</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-core.GettingStarted' id='juneau-microservice-core.GettingStarted'>11.2 - Getting Started</a></h3>
 <div class='topic'><!-- START: 11.2 - juneau-microservice-core.GettingStarted -->
 <p>
 	The <l>my-microservice.zip</l> file is a zipped eclipse project that includes everything you 
@@ -23812,7 +23812,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-core.Manifest' id='juneau-microservice-core.Manifest'>11.3 - Manifest File</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-core.Manifest' id='juneau-microservice-core.Manifest'>11.3 - Manifest File</a></h3>
 <div class='topic'><!-- START: 11.3 - juneau-microservice-core.Manifest -->
 <p>
 	The generated <l>META-INF/MANIFEST.MF</l> file is used to describe the microservice. 
@@ -23857,7 +23857,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-core.Config' id='juneau-microservice-core.Config'>11.4 - Config</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-core.Config' id='juneau-microservice-core.Config'>11.4 - Config</a></h3>
 <div class='topic'><!-- START: 11.4 - juneau-microservice-core.Config -->
 <p>
 	The microservice config file is an external INI-style configuration file that is used to configure
@@ -23989,7 +23989,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-core.ResourceClasses' id='juneau-microservice-core.ResourceClasses'>11.5 - Resource Classes</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-core.ResourceClasses' id='juneau-microservice-core.ResourceClasses'>11.5 - Resource Classes</a></h3>
 <div class='topic'><!-- START: 11.5 - juneau-microservice-core.ResourceClasses -->
 <p>
 	Now let's take a look at the resource classes themselves.  
@@ -24063,7 +24063,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-core.PredefinedResourceClasses' id='juneau-microservice-core.PredefinedResourceClasses'>11.6 - Predefined Resource Classes</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-core.PredefinedResourceClasses' id='juneau-microservice-core.PredefinedResourceClasses'>11.6 - Predefined Resource Classes</a></h3>
 <div class='topic'><!-- START: 11.6 - juneau-microservice-core.PredefinedResourceClasses -->
 <p>
 	The following predefined resource classes are also provided for easy inclusion into your microservice:
@@ -24084,7 +24084,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-core.RestMicroservice' id='juneau-microservice-core.RestMicroservice'>11.7 - RestMicroservice</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-core.RestMicroservice' id='juneau-microservice-core.RestMicroservice'>11.7 - RestMicroservice</a></h3>
 <div class='topic'><!-- START: 11.7 - juneau-microservice-core.RestMicroservice -->
 <p>
 	The {@link org.apache.juneau.microservice.RestMicroservice} class is the main application entry-point for REST 
@@ -24166,7 +24166,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-core.UiCustomization' id='juneau-microservice-core.UiCustomization'>11.8 - UI Customization</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-core.UiCustomization' id='juneau-microservice-core.UiCustomization'>11.8 - UI Customization</a></h3>
 <div class='topic'><!-- START: 11.8 - juneau-microservice-core.UiCustomization -->
 <p>
 	The Microservice project contains a <code>files/htdocs</code> working directly folder with predefined stylesheets and
@@ -24315,7 +24315,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-jetty.Introduction' id='juneau-microservice-jetty.Introduction'>12.1 - Microservice Introduction</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-jetty.Introduction' id='juneau-microservice-jetty.Introduction'>12.1 - Microservice Introduction</a></h3>
 <div class='topic'><!-- START: 12.1 - juneau-microservice-jetty.Introduction -->
 <p>
 	The Microservice API consists of a combination of the Juneau Core, Server, and Client APIs and an embedded
@@ -24360,7 +24360,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-jetty.GettingStarted' id='juneau-microservice-jetty.GettingStarted'>12.2 - Getting Started</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-jetty.GettingStarted' id='juneau-microservice-jetty.GettingStarted'>12.2 - Getting Started</a></h3>
 <div class='topic'><!-- START: 12.2 - juneau-microservice-jetty.GettingStarted -->
 <p>
 	The <l>my-microservice.zip</l> file is a zipped eclipse project that includes everything you 
@@ -24670,7 +24670,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-jetty.Manifest' id='juneau-microservice-jetty.Manifest'>12.3 - Manifest File</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-jetty.Manifest' id='juneau-microservice-jetty.Manifest'>12.3 - Manifest File</a></h3>
 <div class='topic'><!-- START: 12.3 - juneau-microservice-jetty.Manifest -->
 <p>
 	The generated <l>META-INF/MANIFEST.MF</l> file is used to describe the microservice. 
@@ -24715,7 +24715,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-jetty.Config' id='juneau-microservice-jetty.Config'>12.4 - Config</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-jetty.Config' id='juneau-microservice-jetty.Config'>12.4 - Config</a></h3>
 <div class='topic'><!-- START: 12.4 - juneau-microservice-jetty.Config -->
 <p>
 	The microservice config file is an external INI-style configuration file that is used to configure
@@ -24847,7 +24847,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-jetty.ResourceClasses' id='juneau-microservice-jetty.ResourceClasses'>12.5 - Resource Classes</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-jetty.ResourceClasses' id='juneau-microservice-jetty.ResourceClasses'>12.5 - Resource Classes</a></h3>
 <div class='topic'><!-- START: 12.5 - juneau-microservice-jetty.ResourceClasses -->
 <p>
 	Now let's take a look at the resource classes themselves.  
@@ -24921,7 +24921,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-jetty.PredefinedResourceClasses' id='juneau-microservice-jetty.PredefinedResourceClasses'>12.6 - Predefined Resource Classes</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-jetty.PredefinedResourceClasses' id='juneau-microservice-jetty.PredefinedResourceClasses'>12.6 - Predefined Resource Classes</a></h3>
 <div class='topic'><!-- START: 12.6 - juneau-microservice-jetty.PredefinedResourceClasses -->
 <p>
 	The following predefined resource classes are also provided for easy inclusion into your microservice:
@@ -24942,7 +24942,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-jetty.RestMicroservice' id='juneau-microservice-jetty.RestMicroservice'>12.7 - RestMicroservice</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-jetty.RestMicroservice' id='juneau-microservice-jetty.RestMicroservice'>12.7 - RestMicroservice</a></h3>
 <div class='topic'><!-- START: 12.7 - juneau-microservice-jetty.RestMicroservice -->
 <p>
 	The {@link org.apache.juneau.microservice.RestMicroservice} class is the main application entry-point for REST 
@@ -25024,7 +25024,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-jetty.UiCustomization' id='juneau-microservice-jetty.UiCustomization'>12.8 - UI Customization</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-jetty.UiCustomization' id='juneau-microservice-jetty.UiCustomization'>12.8 - UI Customization</a></h3>
 <div class='topic'><!-- START: 12.8 - juneau-microservice-jetty.UiCustomization -->
 <p>
 	The Microservice project contains a <code>files/htdocs</code> working directly folder with predefined stylesheets and
@@ -25140,7 +25140,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h2 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-jetty-template' id='juneau-microservice-jetty-template'>13 - juneau-microservice-server</a></h2>
+<h2 class='topic todo' onclick='toggle(this)'><a href='#juneau-microservice-jetty-template' id='juneau-microservice-jetty-template'>13 - juneau-microservice-jetty-template</a></h2>
 <div class='topic'><!-- START: 13 - juneau-microservice-jetty-template -->
 <h5 class='figure'>Maven Dependency</h5>
 <p class='bpcode w500'>
@@ -27273,7 +27273,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic new' onclick='toggle(this)'><a href='#juneau-examples-rest-jetty.Classes' id='juneau-examples-rest-jetty.Classes'>16.1 - Classes</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-examples-rest-jetty.Classes' id='juneau-examples-rest-jetty.Classes'>16.1 - Classes</a></h3>
 <div class='topic'><!-- START: 16.1 - juneau-examples-rest-jetty.Classes -->
 <p>
 	The <code>juneau-examples-rest-springboot</code> project contains the same classes as found in <code>juneau-examples-rest</code>
@@ -33658,6 +33658,36 @@
 	This release primarily cleans up deprecated APIs from the 7.2.0 release.
 </p>
 
+<p>
+	The project structures of the REST, Microservice, and Examples have been modified to fit new Spring Boot
+	integration support.
+	The structure is now as follows:
+</p>
+<ul>
+	<li><code>juneau-rest</code>
+	<ul>
+		<li><code>juneau-rest-client</code>
+		<li><code>juneau-rest-server</code>
+		<li><code>juneau-rest-server-jaxrs</code>
+		<li><code>juneau-rest-server-rdf</code>
+		<li><b><code>juneau-rest-server-springboot</code></b> - New Spring Boot integration support classes. 
+	</ul>
+	<li><code>juneau-microservice</code>
+	<ul>
+		<li><b><code>juneau-microservice-core</code></b> - New.  Contains base {@link org.apache.juneau.microservice.Microservice} class.
+		<li><b><code>juneau-microservice-jetty</code></b> - New.  Contains new {@link org.apache.juneau.microservice.JettyMicroservice} class.
+		<li><b><code>juneau-microservice-jetty-template</code></b> - New.  Template starter project for Jetty-based microservices.
+		<li><b><code>juneau-microservice-springboot-template</code></b> - New.  Template starter project for Spring-Boot-based microservices.
+	</ul>
+	<li><code>juneau-<examples/code>
+	<ul>
+		<li><code>juneau-core</code>
+		<li><b><code>juneau-microservice-rest</code></b> - Now contains only servlet example classes.  No Jetty configuration.
+		<li><b><code>juneau-microservice-rest-jetty</code></b> - Servlet examples deployed using Jetty.
+		<li><b><code>juneau-microservice-rest-springboot</code></b> - Servlet examples deployed using Spring Boot.
+	</ul>
+</ul>
+
 <h5 class='topic w800'>juneau-svl</h5>
 <ul class='spaced-list'>
 	<li>
@@ -33670,6 +33700,32 @@
 		</ul>
 </ul>
 
+<h5 class='topic w800'>juneau-config</h5>
+<ul class='spaced-list'>
+	<li>
+		New methods for setting a system default configuration:
+		<ul class='doctree'>
+			<li class='jc'>{@link org.apache.juneau.config.Config}
+			<ul>
+				<li class='jm'>{@link org.apache.juneau.config.Config#getSystemDefault() getSystemDefault()}
+				<li class='jm'>{@link org.apache.juneau.config.Config#setSystemDefault(Config) setSystemDefault(Config)}
+			</ul>
+		</ul>
+	<li>
+		New classpath store.
+		<ul class='doctree'>
+			<li class='jc'>{@link org.apache.juneau.config.store.ConfigClasspathStore}
+		</ul>
+	<li>
+		New API method:
+		<ul class='doctree'>
+			<li class='jc'>{@link org.apache.juneau.config.ConfigStore}
+			<ul>
+				<li class='jm'>{@link org.apache.juneau.config.ConfigStore#exists(String) exists(String)}
+			</ul>
+			
+</ul>
+
 <h5 class='topic w800'>juneau-server</h5>
 <ul class='spaced-list'>
 	<li>
@@ -33683,12 +33739,26 @@
 		<br>This allows for any of those instance to be injectable beans.
 </ul>
 
-<h5 class='topic w800'>juneau-microservice-server</h5>
+<h5 class='topic w800'>juneau-microservice-core</h5>
 <ul class='spaced-list'>
 	<li>
+		New project that consist of just the core {@link org.apache.juneau.microservice.Microservice} class and console support.
+	<li>
+		The Microservice API has been revamped to use a builder-based approach to creating microservices.
+		<br>The new API is considerably more flexible in design and allows for the configuration and external
+		files to be located in either the home directory or inside the jar classpath.
+	<li>
 		If the microservice cannot find a config file in the home directory with the same name as the jar and
 		the <js>"juneau.configFile"</js> system property is not found, it will try to find any file in the home
 		directory that ends with <js>".cfg"</js>.
+	<li>
+		New {@link org.apache.juneau.microservice.MicroserviceListener} API for defining lifecycle event listeners.
+</ul>
+
+<h5 class='topic w800'>juneau-microservice-jetty</h5>
+<ul class='spaced-list'>
+	<li>
+		New {@link org.apache.juneau.microservice.JettyMicroservice} class replaces the previous <code>RestMicroservice</code>.
 </ul>
 
 <h5 class='topic w800'>juneau-examples-rest</h5>
diff --git a/juneau-doc/src/main/javadoc/resources/docs.txt b/juneau-doc/src/main/javadoc/resources/docs.txt
index 87ad529..774753b 100644
--- a/juneau-doc/src/main/javadoc/resources/docs.txt
+++ b/juneau-doc/src/main/javadoc/resources/docs.txt
@@ -212,7 +212,7 @@ juneau-microservice-core.RestMicroservice = #juneau-microservice-core.RestMicros
 juneau-microservice-core.RestMicroservice.Extending = #juneau-microservice-core.RestMicroservice.Extending, Overview > juneau-microservice-server > RestMicroservice > Extending RestMicroservice
 juneau-microservice-core.UiCustomization = #juneau-microservice-core.UiCustomization, Overview > juneau-microservice-server > UI Customization
 juneau-microservice-jetty = #juneau-microservice-jetty, Overview > juneau-microservice-server
-juneau-microservice-jetty-template = #juneau-microservice-jetty-template, Overview > juneau-microservice-server
+juneau-microservice-jetty-template = #juneau-microservice-jetty-template, Overview > juneau-microservice-jetty-template
 juneau-microservice-jetty.Config = #juneau-microservice-jetty.Config, Overview > juneau-microservice-server > Config
 juneau-microservice-jetty.Config.ConfigApi = #juneau-microservice-jetty.Config.ConfigApi, Overview > juneau-microservice-server > Config > Config File API
 juneau-microservice-jetty.GettingStarted = #juneau-microservice-jetty.GettingStarted, Overview > juneau-microservice-server > Getting Started
diff --git a/juneau-doc/src/main/javadoc/resources/fragments/about.html b/juneau-doc/src/main/javadoc/resources/fragments/about.html
new file mode 100644
index 0000000..bc8175c
--- /dev/null
+++ b/juneau-doc/src/main/javadoc/resources/fragments/about.html
@@ -0,0 +1,36 @@
+<!--
+/***************************************************************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *  
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ ***************************************************************************************************************************/
+ -->
+<p>
+	Apache Juneau&trade; is a single cohesive Java ecosystem consisting of the following parts:
+</p>
+<ul class='spaced-list'>
+	<li><b>juneau-marshall</b><br>A universal toolkit for marshalling POJOs to a wide variety of content types using a common framework with no external library dependencies.
+	<li><b>juneau-dto</b><br>A variety of predefined DTOs for serializing and parsing languages such as HTML5, Swagger and ATOM.
+	<li><b>juneau-svl</b><br>A simple yet powerful variable replacement language API.
+	<li><b>juneau-config</b><br>A sophisticated configuration file API.
+	<li><b>juneau-rest-server</b><br>A universal REST server API for creating Swagger-based self-documenting REST interfaces using POJOs, simply deployed as 
+		one or more top-level servlets in any Servlet 3.1.0+ container.
+	<li><b>juneau-rest-client</b><br>A universal REST client API for interacting with Juneau or 3rd-party REST interfaces using POJOs and proxy interfaces.
+	<li><b>juneau-microservice</b><br>A REST microservice API that combines all the features above with a simple configurable Jetty server for 
+		creating lightweight standalone REST interfaces that start up in milliseconds.
+</ul>
+<p>
+	Questions via email to <a class='doclink' href='mailto:dev@juneau.apache.org?Subject=Apache%20Juneau%20question'>dev@juneau.apache.org</a> are always welcome.
+</p>
+<p>
+	Juneau is packed with features that may not be obvious at first.  
+	Users are encouraged to ask for code reviews by providing links to specific source files such as through GitHub.
+	Not only can we help you with feedback, but it helps us understand usage patterns to further improve the product.
+</p>
diff --git a/juneau-doc/src/main/javadoc/resources/fragments/toc.html b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
new file mode 100644
index 0000000..99f1c20
--- /dev/null
+++ b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
@@ -0,0 +1,416 @@
+<!--
+/***************************************************************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *  
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ ***************************************************************************************************************************/
+-->
+<ol class='toc'>
+	<li><p class='toc2 '><a class='doclink' href='{OVERVIEW_URL}#Introduction'>Introduction</a></p>
+	<ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#Introduction.Features'>Features</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#Introduction.Components'>Components</a></p>
+	</ol>
+	<li><p class='toc2 '><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall'>juneau-marshall</a></p>
+	<ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Serializers'>Serializers</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Parsers'>Parsers</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Marshalls'>Marshalls</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HttpPartSerializers'>HTTP Part Serializers</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HttpPartParsers'>HTTP Part Parsers</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ConfigurableProperties'>Configurable Properties</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ConfigurableProperties.Common'>Common Serializer Properties</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ConfigurableProperties.CommonSerializer'>Common Serializer Properties</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ConfigurableProperties.CommonParser'>Common Parser Properties</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ObjectMap'>ObjectMap and ObjectList</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Groups'>SerializerGroups and ParserGroups</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ContextsBuildersSessionsPropertyStores'>Contexts, Builders, Sessions, and PropertyStores</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms'>Transforms</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.PojoSwaps'>PojoSwaps</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.PerMediaTypePojoSwaps'>Per-media-type PojoSwaps</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.OneWayPojoSwaps'>One-way PojoSwaps</a></p>
+			<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.SwapAnnotation'>@Swap Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.TemplatedSwaps'>Templated Swaps</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.SwapMethods'>Swap Methods</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.SurrogateClasses'>Surrogate Classes</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.BeanAnnotation'>@BeanProperty Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.BeanPropertyAnnotation'>@BeanProperty Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.BeanConstructorAnnotation'>@BeanConstructor Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.BeanIgnoreAnnotation'>@BeanIgnore Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.NamePropertyAnnotation'>@NameProperty Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.ParentPropertyAnnotation'>@ParentProperty Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.PojoBuilders'>POJO Builders</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.BeanFilters'>BeanFilter Class</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.InterfaceFilters'>Interface Filters</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.StopClasses'>Stop Classes</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Transforms.BypassSerialization'>Bypass Serialization using Readers and InputStreams</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.BeanDictionaries'>Bean Names and Dictionaries</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.BeanDictionaries.BeanSubTypes'>Bean Subtypes</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.VirtualBeans'>Virtual Beans</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Recursion'>Non-Tree Models and Recursion Detection</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ParsingIntoGenericModels'>Parsing into Generic Models</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ReadingContinuousStreams'>Reading Continuous Streams</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.URIs'>URIs</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.JacksonComparison'>Comparison with Jackson</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.PojoCategories'>POJO Categories</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.JsonDetails'>JSON Details</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.JsonDetails.Methodology'>JSON Methodology</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.JsonDetails.Serializers'>JSON Serializers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.JsonDetails.SimplifiedJson'>Simplified JSON</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.JsonDetails.Parsers'>JSON Parsers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.JsonDetails.JsonAnnotation'>@Json Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.JsonDetails.JsonSchema'>JSON-Schema Support</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.XmlDetails'>XML Details</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.XmlDetails.Methodology'>XML Methodology</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.XmlDetails.Serializers'>XML Serializers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.XmlDetails.Parsers'>XML Parsers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.XmlDetails.BeanTypeNameAnnotation'>@Bean(typeName) Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.XmlDetails.XmlChildNameAnnotation'>@Xml(childName) Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.XmlDetails.XmlFormatAnnotation'>@Xml(format) Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.XmlDetails.Namespaces'>Namespaces</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.XmlDetails.XmlSchema'>XML-Schema Support</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HtmlDetails'>HTML Details</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HtmlDetails.Methodology'>HTML Methodology</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HtmlDetails.Serializers'>HTML Serializers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HtmlDetails.Parsers'>HTML Parsers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HtmlDetails.HtmlAnnotation'>@Html Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HtmlDetails.HtmlRenderAnnotation'>@Html(render) Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HtmlDetails.HtmlDocSerializer'>HtmlDocSerializer</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HtmlDetails.BasicHtmlDocTemplate'>BasicHtmlDocTemplate</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HtmlDetails.CustomTemplates'>Custom Templates</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HtmlDetails.HtmlSchema'>HTML-Schema Support</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.UonDetails'>UON Details</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.UonDetails.Methodology'>UON Methodology</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.UonDetails.Serializers'>UON Serializers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.UonDetails.Parsers'>UON Parsers</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.UrlEncodingDetails'>URL-Encoding Details</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.UrlEncodingDetails.Methodology'>URL-Encoding Methodology</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.UrlEncodingDetails.Serializers'>URL-Encoding Serializers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.UrlEncodingDetails.Parsers'>URL-Encoding Parsers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.UrlEncodingDetails.UrlEncodingAnnotation'>@UrlEncoding Annotation</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.MsgPackDetails'>MessagePack Details</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.MsgPackDetails.Serializers'>MessagePack Serializers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.MsgPackDetails.Parsers'>MessagePack Parsers</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.OpenApiDetails'>OpenAPI Details</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.OpenApiDetails.Methodology'>OpenAPI Methodology</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.OpenApiDetails.Serializers'>OpenAPI Serializers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.OpenApiDetails.Parsers'>OpenAPI Parsers</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.BestPractices'>Best Practices</a></p>
+	</ol>
+	<li><p class='toc2 '><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf'>juneau-marshall-rdf</a></p>
+	<ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.RdfDetails'>RDF Details</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.RdfDetails.Serializers'>RDF Serializers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.RdfDetails.Parsers'>RDF Parsers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.RdfDetails.RdfAnnotation'>@Rdf Annotation</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.RdfDetails.Namespaces'>Namespaces</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.RdfDetails.UriProperties'>URI Properties</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.RdfDetails.RootProperty'>Root Property</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.RdfDetails.TypedLiterals'>Typed Literals</a></p>
+		</ol>
+	</ol>
+	<li><p class='toc2 '><a class='doclink' href='{OVERVIEW_URL}#juneau-dto'>juneau-dto</a></p>
+	<ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-dto.HTML5'>HTML5</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-dto.Atom'>Atom</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-dto.Swagger'>Swagger</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-dto.SwaggerUI'>Swagger UI</a></p>
+	</ol>
+	<li><p class='toc2 '><a class='doclink' href='{OVERVIEW_URL}#juneau-svl'>juneau-svl</a></p>
+	<ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-svl.SimpleVarLanguage'>Simple Variable Language</a></p>
+		<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-svl.SvlVariables'>SVL Variables</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-svl.VarResolvers'>VarResolvers and VarResolverSessions</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-svl.OtherNotes'>Other Notes</a></p>
+	</ol>
+	<li><p class='toc2 '><a class='doclink' href='{OVERVIEW_URL}#juneau-config'>juneau-config</a></p>
+	<ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.Overview'>Overview</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.Overview.SyntaxRules'>Syntax Rules</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.EntryTypes'>Entry Types</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.EntryTypes.PrimitiveTypes'>Primitive Types</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.EntryTypes.POJOs'>POJOs</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.EntryTypes.Arrays'>Arrays</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.EntryTypes.Collections'>Collections</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.EntryTypes.BinaryData'>Binary Data</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.Variables'>Variables</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.Variables.LogicVariables'>Logic Variables</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.EncodedEntries'>Encoded Entries</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.SectionMaps'>Section Maps</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.SectionBeans'>Section Beans</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.SectionInterfaces'>Section Interfaces</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.SettingValues'>Setting Values</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.SettingValues.FileSystemChanges'>File System Changes</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.SettingValues.CustomEntrySerialization'>Custom Entry Serialization</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.SettingValues.BulkSettingValues'>Setting Values in Bulk</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.Listeners'>Listeners</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.Serializing'>Serializing</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.ConfigStores'>Config Stores</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.ConfigStores.ConfigMemoryStore'>ConfigMemoryStore</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.ConfigStores.ConfigFileStore'>ConfigFileStore</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.ConfigStores.CustomConfigStores'>Custom ConfigStores</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.ConfigStores.ConfigStoreListeners'>ConfigStore Listeners</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.ReadOnlyConfigs'>Read-only Configs</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-config.ClosingConfigs'>Closing Configs</a></p>
+		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-config.SystemDefaultConfig'>System Default Config</a></p>
+	</ol>
+	<li><p class='toc2 '><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server'>juneau-rest-server</a></p>
+	<ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HelloWorldExample'>Hello World Example</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.ClassHierarchy'>Class Hierarchy</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Instantiation'>Instantiation</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Instantiation.RestServlet'>RestServlet</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Instantiation.BasicRestServlet'>BasicRestServlet</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Instantiation.Children'>Children</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Instantiation.RouterPages'>Router Pages</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Instantiation.ResourceResolvers'>Resource Resolvers</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Instantiation.LifecycleHooks'>Lifecycle Hooks</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestResource'>@RestResource</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestResource.AnnotationInheritance'>Annotation Inheritance</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestContext'>RestContext</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod'>@RestMethod</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.MethodParameters'>Java Method Parameters</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.RestRequest'>RestRequest</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.RestResponse'>RestResponse</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.RequestBody'>RequestBody</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.RequestHeaders'>RequestHeaders</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.RequestQuery'>RequestQuery</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.RequestFormData'>RequestFormData</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.RestMethodPath'>@RestMethod(path)</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.RequestPathMatch'>RequestPathMatch</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.MethodReturnTypes'>Method Return Types</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.ReaderResource'>ReaderResource</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.StreamResource'>StreamResource</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.RestMethodMatchers'>@RestMethod(matchers)</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.PredefinedResponses'>Predefined Responses</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.PredefinedExceptions'>Predefined Exceptions</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestMethod.PredefinedHelperBeans'>Predefined Helper Beans</a></p>
+		</ol>
+		<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.restRPC'>restRPC</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.OpenApiSchemaPartParsing'>OpenAPI Schema Part Parsing</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.OpenApiSchemaPartSerializing'>OpenAPI Schema Part Serializing</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations'>HTTP-Part Annotations</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations.Body'>@Body</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations.FormData'>@FormData</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations.HasFormData'>@HasFormData</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations.Query'>@Query</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations.HasQuery'>@HasQuery</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations.Header'>@Header</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations.Path'>@Path</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations.Request'>@Request</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations.Response'>@Response</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations.ResponseHeader'>@ResponseHeader</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpPartAnnotations.ResponseStatus'>@ResponseStatus</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HandlingFormPosts'>Handling Form Posts</a></p>
+		<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HandlingMultiPartFormPosts'>Handling Multi-Part Form Posts</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Serializers'>Serializers</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Parsers'>Parsers</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Properties'>Properties</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Transforms'>Transforms</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.URIs'>URIs</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Guards'>Guards</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Converters'>Converters</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Messages'>Messages</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Encoders'>Encoders</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.SvlVariables'>SVL Variables</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.ConfigurationFiles'>Configuration Files</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.StaticFiles'>Static files</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.ClientVersioning'>Client Versioning</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestInfoProvider'>RestInfoProvider</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.RestInfoProvider.BasicRestInfoProvider'>BasicRestInfoProvider</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Swagger'>Swagger</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Swagger.BasicRestServlet'>BasicRestServlet</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Swagger.BasicSwaggerInfo'>Basic Swagger Info</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Swagger.Tags'>Tags</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Swagger.Operations'>Operations</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Swagger.Parameters'>Parameters</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Swagger.ParameterExamples'>Parameter Examples</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Swagger.Responses'>Responses</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Swagger.ResponseExamples'>Response Examples</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Swagger.Models'>Models</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Swagger.Stylesheet'>SwaggerUI.css</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HtmlDocAnnotation'>@HtmlDoc</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HtmlDocAnnotation.UIvsDI'>User Interfaces (UI) vs. Developer Interfaces (DI)</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HtmlDocAnnotation.Widgets'>Widgets</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets'>Predefined Widgets</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HtmlDocAnnotation.UiCustomization'>UI Customization</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HtmlDocAnnotation.Stylesheets'>Stylesheets</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.DefaultHeaders'>Default Headers</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.LoggingAndErrorHandling'>Logging and Error Handling</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpStatusCodes'>HTTP Status Codes</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.OverloadingHttpMethods'>Overloading HTTP Methods</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.BuiltInParameters'>Built-in Parameters</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.CustomSerializersAndParsers'>Custom Serializers and Parsers</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.UsingWithOsgi'>Using with OSGi</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.UnitTesting'>Serverless Unit Testing</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.Injection'>Using with Spring and Injection frameworks</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HTTP2'>Using HTTP/2 features</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.OtherNotes'>Other Notes</a></p>
+	</ol>
+	<li><p class='toc2 '><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server-jaxrs'>juneau-rest-server-jaxrs</a></p>
+	<ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server-jaxrs.BaseProvider'>Juneau JAX-RS Provider</a></p>
+	</ol>
+	<li><p class='toc2 todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server-springboot'>juneau-rest-server-springboot</a></p>
+	<ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server-springboot.TODO'>TODO</a></p>
+	</ol>
+	<li><p class='toc2 '><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client'>juneau-rest-client</a></p>
+	<ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.RestProxies'>REST Proxies</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.RemoteResource'>@RemoteResource</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.RemoteMethod'>@RemoteMethod</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.Body'>@Body</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.FormData'>@FormData</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.Query'>@Query</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.Header'>@Header</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.Path'>@Path</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.Request'>@Request</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.Response'>@Response</a></p>
+			<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.DualPurposeInterfaces'>Dual-purpose (end-to-end) interfaces</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.SSL'>SSL Support</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.Authentication'>Authentication</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.Authentication.BASIC'>BASIC Authentication</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.Authentication.FORM'>FORM-based Authentication</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.Authentication.OIDC'>OIDC Authentication</a></p>
+		</ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.ResponsePatterns'>Using Response Patterns</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.PipingOutput'>Piping Response Output</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.Debugging'>Debugging</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.Logging'>Logging</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.Interceptors'>Interceptors</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.UnitTesting'>Serverless Unit Testing</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-client.Other'>Other Useful Methods</a></p>
+	</ol>
+	<li><p class='toc2 todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core'>juneau-microservice-server</a></p>
+	<ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.Introduction'>Microservice Introduction</a></p>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.GettingStarted'>Getting Started</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.GettingStarted.Installing'>Installing in Eclipse</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.GettingStarted.Running'>Running in Eclipse</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.GettingStarted.Building'>Building and Running from Command-Line</a></p>
+		</ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.Manifest'>Manifest File</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.Manifest.ManifestApi'>Manifest API</a></p>
+		</ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.Config'>Config</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.Config.ConfigApi'>Config File API</a></p>
+		</ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.ResourceClasses'>Resource Classes</a></p>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.PredefinedResourceClasses'>Predefined Resource Classes</a></p>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.RestMicroservice'>RestMicroservice</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.RestMicroservice.Extending'>Extending RestMicroservice</a></p>
+		</ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-core.UiCustomization'>UI Customization</a></p>
+	</ol>
+	<li><p class='toc2 todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty'>juneau-microservice-server</a></p>
+	<ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.Introduction'>Microservice Introduction</a></p>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.GettingStarted'>Getting Started</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.GettingStarted.Installing'>Installing in Eclipse</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.GettingStarted.Running'>Running in Eclipse</a></p>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.GettingStarted.Building'>Building and Running from Command-Line</a></p>
+		</ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.Manifest'>Manifest File</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.Manifest.ManifestApi'>Manifest API</a></p>
+		</ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.Config'>Config</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.Config.ConfigApi'>Config File API</a></p>
+		</ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.ResourceClasses'>Resource Classes</a></p>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.PredefinedResourceClasses'>Predefined Resource Classes</a></p>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.RestMicroservice'>RestMicroservice</a></p>
+		<ol>
+			<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.RestMicroservice.Extending'>Extending RestMicroservice</a></p>
+		</ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.UiCustomization'>UI Customization</a></p>
+	</ol>
+	<li><p class='toc2 todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty-template'>juneau-microservice-jetty-template</a></p>
+	<li><p class='toc2 '><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-core'>juneau-examples-core</a></p>
+	<li><p class='toc2 todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest'>juneau-examples-rest</a></p>
+	<ol>
+		<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest.RootResources'>RootResources</a></p>
+		<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest.HelloWorldResource'>HelloWorldResource</a></p>
+		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest.PetStoreResource'>PetStore</a></p>
+		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest.DtoExamples'>DtoExamples</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest.ConfigResource'>ConfigResource</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest.LogsResource'>LogsResource</a></p>
+	</ol>
+	<li><p class='toc2 todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest-jetty'>juneau-examples-rest</a></p>
+	<ol>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest-jetty.Classes'>Classes</a></p>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest-jetty.DeployingToHeroku'>Deploying to Heroku</a></p>
+	</ol>
+	<li><p class='toc2 todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest-springboot'>juneau-examples-rest-springboot</a></p>
+	<ol>
+		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest-springboot.Classes'>Classes</a></p>
+		<li><p class='todo'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-rest-springboot.DeployingToHeroku'>Deploying to Heroku</a></p>
+	</ol>
+	<li><p class='toc2 '><a class='doclink' href='{OVERVIEW_URL}#Security'>Security Best-Practices</a></p>
+	<ol>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#Security.juneau-marshall'>juneau-marshall</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#Security.juneau-svl'>juneau-svl</a></p>
+		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#Security.juneau-rest-server'>juneau-rest-server</a></p>
+	</ol>
+</ol>
diff --git a/juneau-examples/juneau-examples-rest-jetty/examples.cfg b/juneau-examples/juneau-examples-rest-jetty/examples.cfg
index 48cb4d0..a8e0844 100755
--- a/juneau-examples/juneau-examples-rest-jetty/examples.cfg
+++ b/juneau-examples/juneau-examples-rest-jetty/examples.cfg
@@ -149,7 +149,7 @@ fileLevel = INFO
 # org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StrErrLog
 
 # Configure Jetty to log using java-util logging
-org.eclipse.jetty.util.log.class = org.apache.juneau.microservice.JettyLogger
+org.eclipse.jetty.util.log.class = org.apache.juneau.microservice.jetty.JettyLogger
 
 # Jetty logging level
 org.eclipse.jetty.LEVEL = WARN
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/main/java/org/apache/juneau/examples/rest/jetty/App.java b/juneau-examples/juneau-examples-rest-jetty/src/main/java/org/apache/juneau/examples/rest/jetty/App.java
index 629fe71..13fa48d 100644
--- a/juneau-examples/juneau-examples-rest-jetty/src/main/java/org/apache/juneau/examples/rest/jetty/App.java
+++ b/juneau-examples/juneau-examples-rest-jetty/src/main/java/org/apache/juneau/examples/rest/jetty/App.java
@@ -13,7 +13,7 @@
 package org.apache.juneau.examples.rest.jetty;
 
 import org.apache.juneau.examples.rest.*;
-import org.apache.juneau.microservice.*;
+import org.apache.juneau.microservice.jetty.*;
 
 /**
  * An example of an extended REST microservice.
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java b/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
index 8a2f0bb..3f715f8 100644
--- a/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
+++ b/juneau-examples/juneau-examples-rest-jetty/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
@@ -15,7 +15,7 @@ package org.apache.juneau.examples.rest;
 import java.net.*;
 import java.util.*;
 
-import org.apache.juneau.microservice.*;
+import org.apache.juneau.microservice.jetty.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.rest.client.*;
 import org.apache.juneau.serializer.*;
diff --git a/juneau-examples/juneau-examples-rest-springboot/examples.cfg b/juneau-examples/juneau-examples-rest-springboot/examples.cfg
index 9a9428d..0012741 100755
--- a/juneau-examples/juneau-examples-rest-springboot/examples.cfg
+++ b/juneau-examples/juneau-examples-rest-springboot/examples.cfg
@@ -155,7 +155,7 @@ fileLevel = INFO
 # org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StrErrLog
 
 # Configure Jetty to log using java-util logging
-org.eclipse.jetty.util.log.class = org.apache.juneau.microservice.JettyLogger
+org.eclipse.jetty.util.log.class = org.apache.juneau.microservice.jetty.JettyLogger
 
 # Jetty logging level
 org.eclipse.jetty.LEVEL = WARN
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
index 79ded68..1a20beb 100644
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
@@ -16,6 +16,7 @@ import static org.apache.juneau.serializer.WriterSerializer.*;
 
 import org.apache.juneau.examples.rest.dto.*;
 import org.apache.juneau.examples.rest.petstore.rest.*;
+import org.apache.juneau.microservice.jetty.resources.*;
 import org.apache.juneau.microservice.resources.*;
 import org.apache.juneau.rest.*;
 import org.apache.juneau.rest.annotation.*;
diff --git a/juneau-microservice/juneau-microservice-core/pom.xml b/juneau-microservice/juneau-microservice-core/pom.xml
index d83d8a7..ea11eae 100644
--- a/juneau-microservice/juneau-microservice-core/pom.xml
+++ b/juneau-microservice/juneau-microservice-core/pom.xml
@@ -68,17 +68,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<mainClass>org.apache.juneau.microservice.RestMicroservice</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
 			<!--plugin>
 				<groupId>com.github.siom79.japicmp</groupId>
 				<artifactId>japicmp-maven-plugin</artifactId>
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java
index 5aecca7..170ec88 100644
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java
@@ -172,7 +172,6 @@ public class MicroserviceBuilder {
 		else
 			throw new RuntimeException("Invalid type passed to MicroserviceBuilder.manifest(Object).  Type=["+value.getClass().getName()+"]");
 
-		System.err.println("ManifestFile=\n" + this.manifest);
 		return this;
 	}
 
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConsoleCommand.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConsoleCommand.java
index 60b41d1..df0ee66 100644
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConsoleCommand.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConsoleCommand.java
@@ -39,7 +39,7 @@ import org.apache.juneau.utils.*;
  * For example, the {@link HelpCommand} is used to provide help on other commands.
  *
  * <p class='bcode w800'>
- * 	Running class 'RestMicroservice' using config file 'examples.cfg'.
+ * 	Running class 'JettyMicroservice' using config file 'examples.cfg'.
  * 	Server started on port 10000
  *
  * 	List of available commands:
diff --git a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/my-microservice.launch b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/my-microservice.launch
index 9a8b2b2..2adc719 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/my-microservice.launch
+++ b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/my-microservice.launch
@@ -5,7 +5,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.RestMicroservice"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.jetty.JettyMicroservice"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="my-microservice.cfg"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="my-microservice"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
diff --git a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
index 0d2946d..4622e03 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
@@ -85,7 +85,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>org.apache.juneau.microservice.RestMicroservice
+							<mainClass>org.apache.juneau.microservice.jetty.JettyMicroservice
 							</mainClass>
 						</manifest>
 						<manifestEntries>
diff --git a/juneau-microservice/juneau-microservice-jetty-template/my-microservice.cfg b/juneau-microservice/juneau-microservice-jetty-template/my-microservice.cfg
index ba39cd7..3c010d9 100755
--- a/juneau-microservice/juneau-microservice-jetty-template/my-microservice.cfg
+++ b/juneau-microservice/juneau-microservice-jetty-template/my-microservice.cfg
@@ -161,7 +161,7 @@ fileLevel = INFO
 # org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StrErrLog
 
 # Configure Jetty to log using java-util logging
-org.eclipse.jetty.util.log.class = org.apache.juneau.microservice.JettyLogger
+org.eclipse.jetty.util.log.class = org.apache.juneau.microservice.jetty.JettyLogger
 
 # Jetty logging level
 # Possible values:  ALL, DEBUG, INFO, WARN, OFF
diff --git a/juneau-microservice/juneau-microservice-jetty-template/my-microservice.launch b/juneau-microservice/juneau-microservice-jetty-template/my-microservice.launch
index b1bdb66..b6b5ae4 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/my-microservice.launch
+++ b/juneau-microservice/juneau-microservice-jetty-template/my-microservice.launch
@@ -11,7 +11,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.RestMicroservice"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.jetty.JettyMicroservice"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="my-microservice.cfg"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-microservice-jetty-template"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
diff --git a/juneau-microservice/juneau-microservice-jetty/pom.xml b/juneau-microservice/juneau-microservice-jetty/pom.xml
index eaf1ede..7642a1d 100644
--- a/juneau-microservice/juneau-microservice-jetty/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty/pom.xml
@@ -92,7 +92,7 @@
 						<onlyModified>true</onlyModified>
 						<accessModifier>public</accessModifier>
 						<excludes>
-							<exclude>org.apache.juneau.microservice.resources</exclude>
+							<exclude>org.apache.juneau.microservice.jetty.resources</exclude>
 						</excludes>
 						<ignoreMissingClasses>true</ignoreMissingClasses>
 						<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/BasicJettyMicroserviceListener.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyMicroserviceListener.java
similarity index 96%
rename from juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/BasicJettyMicroserviceListener.java
rename to juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyMicroserviceListener.java
index c500087..bfa6e64 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/BasicJettyMicroserviceListener.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyMicroserviceListener.java
@@ -10,7 +10,9 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.microservice;
+package org.apache.juneau.microservice.jetty;
+
+import org.apache.juneau.microservice.*;
 
 /**
  * Basic extensible microservice listener with default no-op method implementations.
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/BasicJettyServerFactory.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyServerFactory.java
similarity index 97%
rename from juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/BasicJettyServerFactory.java
rename to juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyServerFactory.java
index 3cf8a5a..5009fc9 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/BasicJettyServerFactory.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyServerFactory.java
@@ -10,7 +10,7 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.microservice;
+package org.apache.juneau.microservice.jetty;
 
 import java.io.*;
 
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyLogger.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyLogger.java
similarity index 98%
rename from juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyLogger.java
rename to juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyLogger.java
index 9ef855d..52c96f0 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyLogger.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyLogger.java
@@ -10,7 +10,7 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.microservice;
+package org.apache.juneau.microservice.jetty;
 
 import static java.util.logging.Level.*;
 import java.util.logging.*;
@@ -32,7 +32,7 @@ import org.eclipse.jetty.util.log.AbstractLogger;
  * 	<cs>[SystemProperties]</cs>
  *
  * 	<cc># Configure Jetty to log using java-util logging</cc>
- * 	<ck>org.eclipse.jetty.util.log.class</ck> = org.apache.juneau.microservice.JettyLogger
+ * 	<ck>org.eclipse.jetty.util.log.class</ck> = org.apache.juneau.microservice.jetty.JettyLogger
  * </p>
  *
  */
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyMicroservice.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
similarity index 99%
rename from juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyMicroservice.java
rename to juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index 43950f2..d850ad5 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyMicroservice.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -10,7 +10,7 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.microservice;
+package org.apache.juneau.microservice.jetty;
 
 import static org.apache.juneau.internal.SystemUtils.*;
 
@@ -24,6 +24,7 @@ import javax.servlet.*;
 import org.apache.juneau.*;
 import org.apache.juneau.config.*;
 import org.apache.juneau.internal.*;
+import org.apache.juneau.microservice.*;
 import org.apache.juneau.rest.*;
 import org.apache.juneau.svl.*;
 import org.apache.juneau.utils.*;
@@ -173,7 +174,7 @@ public class JettyMicroservice extends Microservice {
 
 
 	//-----------------------------------------------------------------------------------------------------------------
-	// RestMicroservice API methods.
+	// JettyMicroservice API methods.
 	//-----------------------------------------------------------------------------------------------------------------
 
 	/**
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyMicroserviceBuilder.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.java
similarity index 99%
rename from juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyMicroserviceBuilder.java
rename to juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.java
index e78b942..62df13e 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyMicroserviceBuilder.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.java
@@ -10,7 +10,7 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.microservice;
+package org.apache.juneau.microservice.jetty;
 
 import java.io.*;
 import java.util.*;
@@ -22,6 +22,7 @@ import org.apache.juneau.*;
 import org.apache.juneau.config.*;
 import org.apache.juneau.config.store.*;
 import org.apache.juneau.internal.*;
+import org.apache.juneau.microservice.*;
 import org.apache.juneau.microservice.console.*;
 import org.apache.juneau.rest.*;
 import org.apache.juneau.rest.annotation.*;
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyMicroserviceListener.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceListener.java
similarity index 96%
rename from juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyMicroserviceListener.java
rename to juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceListener.java
index e996df8..05886d8 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyMicroserviceListener.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceListener.java
@@ -10,7 +10,9 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.microservice;
+package org.apache.juneau.microservice.jetty;
+
+import org.apache.juneau.microservice.*;
 
 /**
  * Listener class for Jetty microservice lifecycle events.
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyServerFactory.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyServerFactory.java
similarity index 98%
rename from juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyServerFactory.java
rename to juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyServerFactory.java
index 5c511d6..4beb98b 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/JettyServerFactory.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyServerFactory.java
@@ -10,7 +10,7 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.microservice;
+package org.apache.juneau.microservice.jetty;
 
 import org.eclipse.jetty.server.*;
 
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/package-info.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/package-info.java
similarity index 96%
rename from juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/package-info.java
rename to juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/package-info.java
index 2785d52..9b52029 100755
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/package-info.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/package-info.java
@@ -14,5 +14,5 @@
 /**
  * Microservice API
  */
-package org.apache.juneau.microservice;
+package org.apache.juneau.microservice.jetty;
 
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
similarity index 95%
rename from juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java
rename to juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
index e462ffb..8e45762 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
@@ -10,14 +10,14 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.microservice.resources;
+package org.apache.juneau.microservice.jetty.resources;
 
 import static org.apache.juneau.http.HttpMethodName.*;
 
 import java.io.*;
 
 import org.apache.juneau.internal.*;
-import org.apache.juneau.microservice.*;
+import org.apache.juneau.microservice.jetty.*;
 import org.apache.juneau.rest.*;
 import org.apache.juneau.rest.annotation.*;
 import org.apache.juneau.rest.helper.*;
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/resources/org/apache/juneau/microservice/JettyMicroservice.properties b/juneau-microservice/juneau-microservice-jetty/src/main/resources/org/apache/juneau/microservice/jetty/JettyMicroservice.properties
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty/src/main/resources/org/apache/juneau/microservice/JettyMicroservice.properties
rename to juneau-microservice/juneau-microservice-jetty/src/main/resources/org/apache/juneau/microservice/jetty/JettyMicroservice.properties
diff --git a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/my-microservice.launch b/juneau-microservice/juneau-microservice-springboot-template/build-overlay/my-microservice.launch
index 9a8b2b2..a62b475 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/my-microservice.launch
+++ b/juneau-microservice/juneau-microservice-springboot-template/build-overlay/my-microservice.launch
@@ -5,7 +5,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.RestMicroservice"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.springboot.App"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="my-microservice.cfg"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="my-microservice"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml b/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
index 0d2946d..7ae6c26 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
+++ b/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
@@ -85,7 +85,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>org.apache.juneau.microservice.RestMicroservice
+							<mainClass>org.apache.juneau.microservice.springboot.App
 							</mainClass>
 						</manifest>
 						<manifestEntries>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch b/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch
index b1bdb66..5c57739 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch
+++ b/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch
@@ -11,7 +11,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.RestMicroservice"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.springboot.App"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="my-microservice.cfg"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-microservice-jetty-template"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
diff --git a/juneau-microservice/juneau-microservice-test/juneau-microservice-test.cfg b/juneau-microservice/juneau-microservice-test/juneau-microservice-test.cfg
index a3f5bea..dbf37f3 100644
--- a/juneau-microservice/juneau-microservice-test/juneau-microservice-test.cfg
+++ b/juneau-microservice/juneau-microservice-test/juneau-microservice-test.cfg
@@ -51,6 +51,6 @@ boolean2 = [true,true]
 testManifestEntry = $MF{Test-Entry}
 
 [SystemProperties]
-org.eclipse.jetty.util.log.class = org.apache.juneau.microservice.JettyLogger
+org.eclipse.jetty.util.log.class = org.apache.juneau.microservice.jetty.JettyLogger
 org.eclipse.jetty.LEVEL = ALL
 derby.stream.error.file = $C{Logging/logDir}/derby-errors.log
\ No newline at end of file
diff --git a/juneau-microservice/juneau-microservice-test/juneau-microservice-test.launch b/juneau-microservice/juneau-microservice-test/juneau-microservice-test.launch
index 4af27b6..55fc1a5 100644
--- a/juneau-microservice/juneau-microservice-test/juneau-microservice-test.launch
+++ b/juneau-microservice/juneau-microservice-test/juneau-microservice-test.launch
@@ -11,7 +11,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.RestMicroservice"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.jetty.JettyMicroservice"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="juneau-microservice-test.cfg"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-microservice-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
index 431ac85..5847a92 100644
--- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
+++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
@@ -14,6 +14,7 @@ package org.apache.juneau.rest.test;
 
 import static org.apache.juneau.http.HttpMethodName.*;
 
+import org.apache.juneau.microservice.jetty.resources.*;
 import org.apache.juneau.microservice.resources.*;
 import org.apache.juneau.rest.*;
 import org.apache.juneau.rest.annotation.*;
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java
index 4ec5902..6349d9c 100644
--- a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java
+++ b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java
@@ -25,7 +25,7 @@ import org.apache.http.conn.ssl.*;
 import org.apache.http.impl.client.*;
 import org.apache.http.protocol.*;
 import org.apache.juneau.internal.*;
-import org.apache.juneau.microservice.*;
+import org.apache.juneau.microservice.jetty.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.rest.client.*;
 import org.apache.juneau.serializer.*;
@@ -68,7 +68,7 @@ public class TestMicroservice {
 			DEFAULT_CLIENT_PLAINTEXT = client().plainText().build();
 			return true;
 		} catch (Throwable e) {
-			System.err.println(e); // NOT DEBUG
+			e.printStackTrace(); // NOT DEBUG
 			return false;
 		}
 	}


Mime
View raw message