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: Rename template projects.
Date Sun, 16 Dec 2018 20:45:04 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 2237571  Rename template projects.
2237571 is described below

commit 22375714728a570d46c3801e1aff4e50db33990b
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Sun Dec 16 15:44:33 2018 -0500

    Rename template projects.
---
 juneau-doc/docs/ReleaseNotes/5.2.0.0.html          |   2 +-
 juneau-doc/docs/ReleaseNotes/6.4.0.html            |   4 +-
 juneau-doc/docs/ReleaseNotes/7.1.0.html            |   2 +-
 juneau-doc/docs/ReleaseNotes/8.0.0.html            |   4 +-
 ...au-microservice-jetty-template.Installing.2.png | Bin 103957 -> 0 bytes
 ...e.html => 13.juneau-my-jetty-microservice.html} |   6 +-
 .../01.Installing.html                             |   6 +-
 .../02.Running.html                                |   2 +-
 .../03.Building.html                               |   0
 ...au-microservice-jetty-template.Installing.1.png | Bin
 ...au-microservice-jetty-template.Installing.2.png | Bin 0 -> 93366 bytes
 ...uneau-microservice-jetty-template.Running.1.png | Bin
 ...croservice-springboot-template.Installing.2.png | Bin 92377 -> 0 bytes
 ...l => 14.juneau-my-springboot-microservice.html} |   6 +-
 .../01.Installing.html                             |   8 +-
 .../02.Running.html                                |   2 +-
 .../03.Building.html                               |   0
 ...croservice-springboot-template.Installing.1.png | Bin
 ...croservice-springboot-template.Installing.2.png | Bin 0 -> 97545 bytes
 ...-microservice-springboot-template.Running.1.png | Bin
 .../16.juneau-examples-rest/01.RootResources.html  |   2 +-
 .../juneau-examples-rest-springboot.Classes.png    | Bin 26502 -> 0 bytes
 ...juneau-microservice-rest-jetty.Installing.2.png | Bin 0 -> 158863 bytes
 ...uneau-examples-rest-springboot-Installing.2.png | Bin 0 -> 173827 bytes
 .../juneau-examples-rest-springboot.Classes.png    | Bin 26502 -> 0 bytes
 juneau-doc/src/main/javadoc/overview.html          | 104 ++++++++++-----------
 juneau-doc/src/main/javadoc/resources/docs.txt     |  16 ++--
 .../src/main/javadoc/resources/fragments/toc.html  |  16 ++--
 .../.classpath                                     |   6 ++
 .../.gitignore                                     |   0
 .../.project                                       |   2 +-
 .../build-overlay/.classpath                       |   0
 .../build-overlay/.project                         |   0
 .../build-overlay/my-jetty-microservice.launch     |   0
 .../build-overlay/pom.xml                          |   0
 .../my-jetty-microservice.cfg                      |   0
 .../my-jetty-microservice.launch                   |   4 +-
 .../pom.xml                                        |   2 +-
 .../src/assembly/bin.xml                           |   0
 .../juneau/microservice/jetty/template/App.java    |   0
 .../jetty/template/HelloWorldResource.java         |   0
 .../microservice/jetty/template/RootResources.java |   0
 .../jetty}/template/nls/Messages.properties        |   0
 .../microservice/jetty/template/package-info.java  |   0
 .../src/main/resources/htdocs/images/asf.png       | Bin
 .../src/main/resources/htdocs/images/juneau.png    | Bin
 .../src/main/resources/htdocs/styles/SwaggerUI.css |   0
 .../src/main/resources/htdocs/themes/dark.css      |   0
 .../src/main/resources/htdocs/themes/devops.css    |   0
 .../src/main/resources/htdocs/themes/light.css     |   0
 .../src/main/resources/htdocs/themes/original.css  |   0
 .../src/main/resources/jetty.xml                   |   0
 .../.classpath                                     |   6 ++
 .../.gitignore                                     |   0
 .../.project                                       |   2 +-
 .../build-overlay/.classpath                       |   0
 .../build-overlay/.project                         |   0
 .../my-springboot-microservice.launch              |   0
 .../build-overlay/pom.xml                          |   0
 .../my-springboot-microservice.launch              |   4 +-
 .../pom.xml                                        |   2 +-
 .../src/assembly/bin.xml                           |   0
 .../microservice/springboot/template/App.java      |   0
 .../springboot/template/HelloWorldResource.java    |   0
 .../springboot/template/RootResources.java         |   0
 .../springboot}/template/nls/Messages.properties   |   0
 .../springboot/template/package-info.java          |   0
 .../src/main/resources/application.properties      |   0
 .../src/main/resources/htdocs/images/asf.png       | Bin
 .../src/main/resources/htdocs/images/juneau.png    | Bin
 .../src/main/resources/htdocs/styles/SwaggerUI.css |   0
 .../src/main/resources/htdocs/themes/dark.css      |   0
 .../src/main/resources/htdocs/themes/devops.css    |   0
 .../src/main/resources/htdocs/themes/light.css     |   0
 .../src/main/resources/htdocs/themes/original.css  |   0
 .../src/main/resources/juneau.cfg                  |   0
 juneau-microservice/pom.xml                        |   4 +-
 juneau-release.sh                                  |   3 +-
 juneau-releng/juneau-distrib/pom.xml               |  11 ++-
 79 files changed, 124 insertions(+), 102 deletions(-)

diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
index a3d0ea5..25eac96 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
@@ -403,7 +403,7 @@
 			<li><js>"$MF{key,default}""</js> - Manifest file entries.
 		</ul> 
 	<li>CSS stylesheet now configurable through config file entry <js>"REST/stylesheet"</js>.
-	<li>New {@link oaj.microservice.BasicRestServletJena} class if you want your REST interface to support RDF.
+	<li>New <code><del>BasicRestServletJena</del></code> class if you want your REST interface to support RDF.
 	<li>Eliminated the following classes:
 		<ul>
 			<li><code>org.apache.juneau.microservice.RootResource</code>
diff --git a/juneau-doc/docs/ReleaseNotes/6.4.0.html b/juneau-doc/docs/ReleaseNotes/6.4.0.html
index 06f1523..7e00722 100644
--- a/juneau-doc/docs/ReleaseNotes/6.4.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.4.0.html
@@ -489,10 +489,10 @@
 			<li>{@link oaj.microservice.Microservice#getInstance() getInstance()}
 		</ul>
 	<li>
-		New class {@link oaj.microservice.JettyLogger} for directing Jetty logging to the
+		New class <code><del>JettyLogger</del></code> for directing Jetty logging to the
 		java.util.logging framework.
 	<li>
-		New class {@link oaj.microservice.resources.DebugResource} for viewing and generating
+		New class <code><del>DebugResource</del></code> for viewing and generating
 		Jetty thread dumps through REST calls.
 </ul>
 
diff --git a/juneau-doc/docs/ReleaseNotes/7.1.0.html b/juneau-doc/docs/ReleaseNotes/7.1.0.html
index 1b0dd89..866e173 100644
--- a/juneau-doc/docs/ReleaseNotes/7.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.1.0.html
@@ -454,5 +454,5 @@
 		<br>{@link oajr.BasicRestServlet} and {@link oajr.BasicRestServletGroup} can be used instead.
 	<li>
 		<code>ResourceJena</code> and <code>ResourceJenaGroup</code> classes renamed to
-		{@link oaj.microservice.BasicRestServletJena} and {@link oaj.microservice.BasicRestServletJenaGroup}.
+		<code><del>BasicRestServletJena</del></code> and <code><del>BasicRestServletJenaGroup</del></code>.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/8.0.0.html b/juneau-doc/docs/ReleaseNotes/8.0.0.html
index 605afa2..af9ce9c 100644
--- a/juneau-doc/docs/ReleaseNotes/8.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.0.0.html
@@ -37,8 +37,8 @@
 	<ul>
 		<li><b><code>juneau-microservice-core</code></b> - New.  Contains base {@link oaj.microservice.Microservice} class.
 		<li><b><code>juneau-microservice-jetty</code></b> - New.  Contains new {@link oaj.microservice.jetty.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.
+		<li><b><code>juneau-my-jetty-microservice</code></b> - New.  Template starter project for Jetty-based microservices.
+		<li><b><code>juneau-my-springboot-microservice</code></b> - New.  Template starter project for Spring-Boot-based microservices.
 	</ul>
 	<li><code>juneau-<examples/code>
 	<ul>
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.Installing.2.png b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.Installing.2.png
deleted file mode 100644
index 6e81fa5..0000000
Binary files a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.Installing.2.png and /dev/null differ
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template.html b/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice.html
similarity index 89%
rename from juneau-doc/docs/Topics/13.juneau-microservice-jetty-template.html
rename to juneau-doc/docs/Topics/13.juneau-my-jetty-microservice.html
index 9f0e03d..814b99f 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template.html
+++ b/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice.html
@@ -13,15 +13,15 @@
  ***************************************************************************************************************************/
  -->
 
-{new} juneau-microservice-jetty-template
+{new} juneau-my-jetty-microservice / my-jetty-microservice
 
 <h5 class='figure'>Starter Project Zip</h5>
 <p class='bpcode w500'>
-	my-microservice-jetty-{@property juneauVersion}.zip 
+	my-jetty-microservice-{@property juneauVersion}.zip 
 </p>	
 
 <p>
-	The <l>my-microservice-jetty.zip</l> file is a predefined starter Eclipse project for developing
+	The <l>my-jetty-microservice.zip</l> file is a predefined starter Eclipse project for developing
 	REST microservices using the {@doc juneau-microservice-jetty} package.
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/01.Installing.html b/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/01.Installing.html
similarity index 97%
rename from juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/01.Installing.html
rename to juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/01.Installing.html
index d944dee..49fda7c 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/01.Installing.html
+++ b/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/01.Installing.html
@@ -20,16 +20,16 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the latest <l>my-microservice-jetty.zip</l> file.
+		Download the latest <l>my-jetty-microservice.zip</l> file.
 	<li>
 		In your Eclipse workspace, go to <b>File -&gt; Import -&gt; General -&gt; Existing Projects into Workspace</b> 
 		and select the zip file and click <b>Finish</b>.
 		<br><br>
-		<img class='bordered' src='doc-files/juneau-microservice-jetty-template.Installing.1.png' style='width:549px'>
+		<img class='bordered' src='doc-files/juneau-my-jetty-microservice.Installing.1.png' style='width:549px'>
 	<li>
 		In your workspace, you should now see the following project:
 		<br><br>
-		<img class='bordered' src='doc-files/juneau-microservice-jetty-template.Installing.2.png' style='width:400px'>
+		<img class='bordered' src='doc-files/juneau-my-jetty-microservice.Installing.2.png' style='width:400px'>
 </ol>
 <p>
 	The important elements in this project are:
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.Running.html b/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/02.Running.html
similarity index 95%
rename from juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.Running.html
rename to juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/02.Running.html
index 9a28e76..244daeb 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.Running.html
+++ b/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/02.Running.html
@@ -41,7 +41,7 @@
 <p class='bpcode w400'>
 	http://localhost:10000
 </p>			
-<img class='bordered w400' src='doc-files/juneau-microservice-jetty-template.Running.1.png'>
+<img class='bordered w400' src='doc-files/juneau-my-jetty-microservice.Running.1.png'>
 <p>
 	You have started a REST interface on port 10000.
 	<br>You can enter the command <code>exit</code> to shut it down.
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/03.Building.html b/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/03.Building.html
similarity index 100%
rename from juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/03.Building.html
rename to juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/03.Building.html
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.Installing.1.png b/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/doc-files/juneau-microservice-jetty-template.Installing.1.png
similarity index 100%
rename from juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.Installing.1.png
rename to juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/doc-files/juneau-microservice-jetty-template.Installing.1.png
diff --git a/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/doc-files/juneau-microservice-jetty-template.Installing.2.png b/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/doc-files/juneau-microservice-jetty-template.Installing.2.png
new file mode 100644
index 0000000..367b24d
Binary files /dev/null and b/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/doc-files/juneau-microservice-jetty-template.Installing.2.png differ
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.Running.1.png b/juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/doc-files/juneau-microservice-jetty-template.Running.1.png
similarity index 100%
rename from juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.Running.1.png
rename to juneau-doc/docs/Topics/13.juneau-my-jetty-microservice/doc-files/juneau-microservice-jetty-template.Running.1.png
diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/doc-files/juneau-microservice-springboot-template.Installing.2.png b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/doc-files/juneau-microservice-springboot-template.Installing.2.png
deleted file mode 100644
index c3a681a..0000000
Binary files a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/doc-files/juneau-microservice-springboot-template.Installing.2.png and /dev/null differ
diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template.html b/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice.html
similarity index 88%
rename from juneau-doc/docs/Topics/14.juneau-microservice-springboot-template.html
rename to juneau-doc/docs/Topics/14.juneau-my-springboot-microservice.html
index bca3b84..ea16b02 100644
--- a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template.html
+++ b/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice.html
@@ -13,15 +13,15 @@
  ***************************************************************************************************************************/
  -->
 
-{new} juneau-microservice-springboot-template
+{new} juneau-my-springboot-microservice / my-springboot-microservice
 
 <h5 class='figure'>Starter Project Zip</h5>
 <p class='bpcode w500'>
-	my-microservice-springboot-{@property juneauVersion}.zip 
+	my-springboot-microservice-{@property juneauVersion}.zip 
 </p>	
 
 <p>
-	The <l>my-microservice-springboot.zip</l> file is a predefined starter Eclipse project for developing
+	The <l>my-springboot-microservice.zip</l> file is a predefined starter Eclipse project for developing
 	REST microservices using the {@doc juneau-rest-server-springboot} package with Spring Boot.
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/01.Installing.html b/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/01.Installing.html
similarity index 93%
rename from juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/01.Installing.html
rename to juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/01.Installing.html
index c83de65..ac2da02 100644
--- a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/01.Installing.html
+++ b/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/01.Installing.html
@@ -20,16 +20,16 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the latest <l>my-microservice-springboot.zip</l> file.
+		Download the latest <l>my-springboot-microservice.zip</l> file.
 	<li>
 		In your Eclipse workspace, go to <b>File -&gt; Import -&gt; General -&gt; Existing Projects into Workspace</b> 
 		and select the zip file and click <b>Finish</b>.
 		<br><br>
-		<img class='bordered' src='doc-files/juneau-microservice-springboot-template.Installing.1.png' style='width:549px'>
+		<img class='bordered' src='doc-files/juneau-my-springboot-microservice.Installing.1.png' style='width:549px'>
 	<li>
 		In your workspace, you should now see the following project:
 		<br><br>
-		<img class='bordered' src='doc-files/juneau-microservice-springboot-template.Installing.2.png' style='width:400px'>
+		<img class='bordered' src='doc-files/juneau-my-springboot-microservice.Installing.2.png' style='width:400px'>
 </ol>
 <p>
 	The important elements in this project are:
@@ -40,7 +40,7 @@
 		<br>This class creates and starts our microservice.
 		<br>Note that we're using the existing Spring Boot application logic for the microservice and we're retrieving
 		our root resource as a spring bean.
-		<br>Only the top-level resource needs to be annotated with {@link oaj.microservice.springboot.annotation.JuneauRestRoot @JuneauRestRoot}
+		<br>Only the top-level resource needs to be annotated with {@link oaj.rest.springboot.annotation.JuneauRestRoot @JuneauRestRoot}
 		<br><br>
 		<p class='bcode w800'>
 	<ja>@SpringBootApplication</ja>
diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/02.Running.html b/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/02.Running.html
similarity index 95%
rename from juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/02.Running.html
rename to juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/02.Running.html
index 08912e1..f4e34c7 100644
--- a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/02.Running.html
+++ b/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/02.Running.html
@@ -43,7 +43,7 @@
 <p class='bpcode w400'>
 	http://localhost:8080
 </p>			
-<img class='bordered w400' src='doc-files/juneau-microservice-springboot-template.Running.1.png'>
+<img class='bordered w400' src='doc-files/juneau-my-springboot-microservice.Running.1.png'>
 <p>
 	You have started a REST interface on port 8080.
 </p>
diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/03.Building.html b/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/03.Building.html
similarity index 100%
rename from juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/03.Building.html
rename to juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/03.Building.html
diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/doc-files/juneau-microservice-springboot-template.Installing.1.png b/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/doc-files/juneau-microservice-springboot-template.Installing.1.png
similarity index 100%
rename from juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/doc-files/juneau-microservice-springboot-template.Installing.1.png
rename to juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/doc-files/juneau-microservice-springboot-template.Installing.1.png
diff --git a/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/doc-files/juneau-microservice-springboot-template.Installing.2.png b/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/doc-files/juneau-microservice-springboot-template.Installing.2.png
new file mode 100644
index 0000000..cef51e9
Binary files /dev/null and b/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/doc-files/juneau-microservice-springboot-template.Installing.2.png differ
diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/doc-files/juneau-microservice-springboot-template.Running.1.png b/juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/doc-files/juneau-microservice-springboot-template.Running.1.png
similarity index 100%
rename from juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/doc-files/juneau-microservice-springboot-template.Running.1.png
rename to juneau-doc/docs/Topics/14.juneau-my-springboot-microservice/doc-files/juneau-microservice-springboot-template.Running.1.png
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-rest/01.RootResources.html b/juneau-doc/docs/Topics/16.juneau-examples-rest/01.RootResources.html
index 8a88af3..8ac660c 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-rest/01.RootResources.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-rest/01.RootResources.html
@@ -33,7 +33,7 @@
 						{@link oajr.BasicRestServletGroup} - Specialized subclass for grouping other resources.
 						<ul>
 							<li class='jac'>
-								{@link oaj.microservice.BasicRestServletJenaGroup} - Group resource with added RDF support.
+								{@link oaj.rest.BasicRestServletJenaGroup} - Group resource with added RDF support.
 								<ul>
 									<li class='jc'>
 										<code>RootResources</code>
diff --git a/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-springboot.Classes.png b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-springboot.Classes.png
deleted file mode 100644
index 9310ea9..0000000
Binary files a/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-springboot.Classes.png and /dev/null differ
diff --git a/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-microservice-rest-jetty.Installing.2.png b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-microservice-rest-jetty.Installing.2.png
new file mode 100644
index 0000000..d01d24f
Binary files /dev/null and b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-microservice-rest-jetty.Installing.2.png differ
diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot-Installing.2.png b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot-Installing.2.png
new file mode 100644
index 0000000..0563e0b
Binary files /dev/null and b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot-Installing.2.png differ
diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Classes.png b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Classes.png
deleted file mode 100644
index 9310ea9..0000000
Binary files a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Classes.png and /dev/null differ
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index 6213b79..3e30164 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -417,17 +417,17 @@
 		<li><p class='new'><a class='doclink' href='#juneau-microservice-jetty.UiCustomization'>UI Customization</a></p>
 		<li><p class='new'><a class='doclink' href='#juneau-microservice-jetty.Extending'>Extending JettyMicroservice</a></p>
 	</ol>
-	<li><p class='new'><a class='doclink' href='#juneau-microservice-jetty-template'>juneau-microservice-jetty-template</a></p>
+	<li><p class='new'><a class='doclink' href='#juneau-my-jetty-microservice'>juneau-my-jetty-microservice / my-jetty-microservice</a></p>
 	<ol>
-		<li><p class='updated'><a class='doclink' href='#juneau-microservice-jetty-template.Installing'>Installing in Eclipse</a></p>
-		<li><p class='updated'><a class='doclink' href='#juneau-microservice-jetty-template.Running'>Running in Eclipse</a></p>
-		<li><p class='updated'><a class='doclink' href='#juneau-microservice-jetty-template.Building'>Building and Running from Command-Line</a></p>
+		<li><p class='updated'><a class='doclink' href='#juneau-my-jetty-microservice.Installing'>Installing in Eclipse</a></p>
+		<li><p class='updated'><a class='doclink' href='#juneau-my-jetty-microservice.Running'>Running in Eclipse</a></p>
+		<li><p class='updated'><a class='doclink' href='#juneau-my-jetty-microservice.Building'>Building and Running from Command-Line</a></p>
 	</ol>
-	<li><p class='new'><a class='doclink' href='#juneau-microservice-springboot-template'>juneau-microservice-springboot-template</a></p>
+	<li><p class='new'><a class='doclink' href='#juneau-my-springboot-microservice'>juneau-my-springboot-microservice / my-springboot-microservice</a></p>
 	<ol>
-		<li><p class='new'><a class='doclink' href='#juneau-microservice-springboot-template.Installing'>Installing in Eclipse</a></p>
-		<li><p class='new'><a class='doclink' href='#juneau-microservice-springboot-template.Running'>Running in Eclipse</a></p>
-		<li><p class='new'><a class='doclink' href='#juneau-microservice-springboot-template.Building'>Building and Running from Command-Line</a></p>
+		<li><p class='new'><a class='doclink' href='#juneau-my-springboot-microservice.Installing'>Installing in Eclipse</a></p>
+		<li><p class='new'><a class='doclink' href='#juneau-my-springboot-microservice.Running'>Running in Eclipse</a></p>
+		<li><p class='new'><a class='doclink' href='#juneau-my-springboot-microservice.Building'>Building and Running from Command-Line</a></p>
 	</ol>
 	<li><p class='toc2'><a class='doclink' href='#juneau-examples-core'>juneau-examples-core</a></p>
 	<ol>
@@ -25103,15 +25103,15 @@
 
 <!-- ==================================================================================================== -->
 
-<h2 class='topic new' 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 -->
+<h2 class='topic new' onclick='toggle(this)'><a href='#juneau-my-jetty-microservice' id='juneau-my-jetty-microservice'>13 - juneau-my-jetty-microservice / my-jetty-microservice</a></h2>
+<div class='topic'><!-- START: 13 - juneau-my-jetty-microservice -->
 <h5 class='figure'>Starter Project Zip</h5>
 <p class='bpcode w500'>
-	my-microservice-jetty-{@property juneauVersion}.zip 
+	my-jetty-microservice-{@property juneauVersion}.zip 
 </p>	
 
 <p>
-	The <l>my-microservice-jetty.zip</l> file is a predefined starter Eclipse project for developing
+	The <l>my-jetty-microservice.zip</l> file is a predefined starter Eclipse project for developing
 	REST microservices using the {@doc juneau-microservice-jetty} package.
 </p>
 <p>
@@ -25124,23 +25124,23 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic updated' onclick='toggle(this)'><a href='#juneau-microservice-jetty-template.Installing' id='juneau-microservice-jetty-template.Installing'>13.1 - Installing in Eclipse</a></h3>
-<div class='topic'><!-- START: 13.1 - juneau-microservice-jetty-template.Installing -->
+<h3 class='topic updated' onclick='toggle(this)'><a href='#juneau-my-jetty-microservice.Installing' id='juneau-my-jetty-microservice.Installing'>13.1 - Installing in Eclipse</a></h3>
+<div class='topic'><!-- START: 13.1 - juneau-my-jetty-microservice.Installing -->
 <p>
 	Follow these instructions to create a new template project in Eclipse.
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the latest <l>my-microservice-jetty.zip</l> file.
+		Download the latest <l>my-jetty-microservice.zip</l> file.
 	<li>
 		In your Eclipse workspace, go to <b>File -&gt; Import -&gt; General -&gt; Existing Projects into Workspace</b> 
 		and select the zip file and click <b>Finish</b>.
 		<br><br>
-		<img class='bordered' src='doc-files/juneau-microservice-jetty-template.Installing.1.png' style='width:549px'>
+		<img class='bordered' src='doc-files/juneau-my-jetty-microservice.Installing.1.png' style='width:549px'>
 	<li>
 		In your workspace, you should now see the following project:
 		<br><br>
-		<img class='bordered' src='doc-files/juneau-microservice-jetty-template.Installing.2.png' style='width:400px'>
+		<img class='bordered' src='doc-files/juneau-my-jetty-microservice.Installing.2.png' style='width:400px'>
 </ol>
 <p>
 	The important elements in this project are:
@@ -25365,12 +25365,12 @@
 <p>
 	At this point, you're ready to start the microservice from your workspace.
 </p>
-</div><!-- END: 13.1 - juneau-microservice-jetty-template.Installing -->
+</div><!-- END: 13.1 - juneau-my-jetty-microservice.Installing -->
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic updated' onclick='toggle(this)'><a href='#juneau-microservice-jetty-template.Running' id='juneau-microservice-jetty-template.Running'>13.2 - Running in Eclipse</a></h3>
-<div class='topic'><!-- START: 13.2 - juneau-microservice-jetty-template.Running -->
+<h3 class='topic updated' onclick='toggle(this)'><a href='#juneau-my-jetty-microservice.Running' id='juneau-my-jetty-microservice.Running'>13.2 - Running in Eclipse</a></h3>
+<div class='topic'><!-- START: 13.2 - juneau-my-jetty-microservice.Running -->
 <p>
 	The <l>my-microservice.launch</l> file is already provided to allow you to quickly start
 	your new microservice.
@@ -25397,17 +25397,17 @@
 <p class='bpcode w400'>
 	http://localhost:10000
 </p>			
-<img class='bordered w400' src='doc-files/juneau-microservice-jetty-template.Running.1.png'>
+<img class='bordered w400' src='doc-files/juneau-my-jetty-microservice.Running.1.png'>
 <p>
 	You have started a REST interface on port 10000.
 	<br>You can enter the command <code>exit</code> to shut it down.
 </p>
-</div><!-- END: 13.2 - juneau-microservice-jetty-template.Running -->
+</div><!-- END: 13.2 - juneau-my-jetty-microservice.Running -->
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic updated' onclick='toggle(this)'><a href='#juneau-microservice-jetty-template.Building' id='juneau-microservice-jetty-template.Building'>13.3 - Building and Running from Command-Line</a></h3>
-<div class='topic'><!-- START: 13.3 - juneau-microservice-jetty-template.Building -->
+<h3 class='topic updated' onclick='toggle(this)'><a href='#juneau-my-jetty-microservice.Building' id='juneau-my-jetty-microservice.Building'>13.3 - Building and Running from Command-Line</a></h3>
+<div class='topic'><!-- START: 13.3 - juneau-my-jetty-microservice.Building -->
 <p>
 	The <l>pom.xml</l> file is a basic Maven build script for creating your microservice
 	as an executable uber-jar.
@@ -25449,20 +25449,20 @@
 	If you get this error message: <code class='snippet'>java.net.BindException: Address already in use</code>, 
 	then this microservice is already running elsewhere and so it cannot bind to port 10000.
 </p>
-</div><!-- END: 13.3 - juneau-microservice-jetty-template.Building -->
-</div><!-- END: 13 - juneau-microservice-jetty-template -->
+</div><!-- END: 13.3 - juneau-my-jetty-microservice.Building -->
+</div><!-- END: 13 - juneau-my-jetty-microservice -->
 
 <!-- ==================================================================================================== -->
 
-<h2 class='topic new' onclick='toggle(this)'><a href='#juneau-microservice-springboot-template' id='juneau-microservice-springboot-template'>14 - juneau-microservice-springboot-template</a></h2>
-<div class='topic'><!-- START: 14 - juneau-microservice-springboot-template -->
+<h2 class='topic new' onclick='toggle(this)'><a href='#juneau-my-springboot-microservice' id='juneau-my-springboot-microservice'>14 - juneau-my-springboot-microservice / my-springboot-microservice</a></h2>
+<div class='topic'><!-- START: 14 - juneau-my-springboot-microservice -->
 <h5 class='figure'>Starter Project Zip</h5>
 <p class='bpcode w500'>
-	my-microservice-springboot-{@property juneauVersion}.zip 
+	my-springboot-microservice-{@property juneauVersion}.zip 
 </p>	
 
 <p>
-	The <l>my-microservice-springboot.zip</l> file is a predefined starter Eclipse project for developing
+	The <l>my-springboot-microservice.zip</l> file is a predefined starter Eclipse project for developing
 	REST microservices using the {@doc juneau-rest-server-springboot} package with Spring Boot.
 </p>
 <p>
@@ -25471,23 +25471,23 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic new' onclick='toggle(this)'><a href='#juneau-microservice-springboot-template.Installing' id='juneau-microservice-springboot-template.Installing'>14.1 - Installing in Eclipse</a></h3>
-<div class='topic'><!-- START: 14.1 - juneau-microservice-springboot-template.Installing -->
+<h3 class='topic new' onclick='toggle(this)'><a href='#juneau-my-springboot-microservice.Installing' id='juneau-my-springboot-microservice.Installing'>14.1 - Installing in Eclipse</a></h3>
+<div class='topic'><!-- START: 14.1 - juneau-my-springboot-microservice.Installing -->
 <p>
 	Follow these instructions to create a new template project in Eclipse.
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the latest <l>my-microservice-springboot.zip</l> file.
+		Download the latest <l>my-springboot-microservice.zip</l> file.
 	<li>
 		In your Eclipse workspace, go to <b>File -&gt; Import -&gt; General -&gt; Existing Projects into Workspace</b> 
 		and select the zip file and click <b>Finish</b>.
 		<br><br>
-		<img class='bordered' src='doc-files/juneau-microservice-springboot-template.Installing.1.png' style='width:549px'>
+		<img class='bordered' src='doc-files/juneau-my-springboot-microservice.Installing.1.png' style='width:549px'>
 	<li>
 		In your workspace, you should now see the following project:
 		<br><br>
-		<img class='bordered' src='doc-files/juneau-microservice-springboot-template.Installing.2.png' style='width:400px'>
+		<img class='bordered' src='doc-files/juneau-my-springboot-microservice.Installing.2.png' style='width:400px'>
 </ol>
 <p>
 	The important elements in this project are:
@@ -25498,7 +25498,7 @@
 		<br>This class creates and starts our microservice.
 		<br>Note that we're using the existing Spring Boot application logic for the microservice and we're retrieving
 		our root resource as a spring bean.
-		<br>Only the top-level resource needs to be annotated with {@link org.apache.juneau.microservice.springboot.annotation.JuneauRestRoot @JuneauRestRoot}
+		<br>Only the top-level resource needs to be annotated with {@link org.apache.juneau.rest.springboot.annotation.JuneauRestRoot @JuneauRestRoot}
 		<br><br>
 		<p class='bcode w800'>
 	<ja>@SpringBootApplication</ja>
@@ -25589,12 +25589,12 @@
 <p>
 	At this point, you're ready to start the microservice from your workspace.
 </p>
-</div><!-- END: 14.1 - juneau-microservice-springboot-template.Installing -->
+</div><!-- END: 14.1 - juneau-my-springboot-microservice.Installing -->
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic new' onclick='toggle(this)'><a href='#juneau-microservice-springboot-template.Running' id='juneau-microservice-springboot-template.Running'>14.2 - Running in Eclipse</a></h3>
-<div class='topic'><!-- START: 14.2 - juneau-microservice-springboot-template.Running -->
+<h3 class='topic new' onclick='toggle(this)'><a href='#juneau-my-springboot-microservice.Running' id='juneau-my-springboot-microservice.Running'>14.2 - Running in Eclipse</a></h3>
+<div class='topic'><!-- START: 14.2 - juneau-my-springboot-microservice.Running -->
 <p>
 	The <l>my-microservice.launch</l> file is already provided to allow you to quickly start
 	your new microservice.
@@ -25623,16 +25623,16 @@
 <p class='bpcode w400'>
 	http://localhost:8080
 </p>			
-<img class='bordered w400' src='doc-files/juneau-microservice-springboot-template.Running.1.png'>
+<img class='bordered w400' src='doc-files/juneau-my-springboot-microservice.Running.1.png'>
 <p>
 	You have started a REST interface on port 8080.
 </p>
-</div><!-- END: 14.2 - juneau-microservice-springboot-template.Running -->
+</div><!-- END: 14.2 - juneau-my-springboot-microservice.Running -->
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic new' onclick='toggle(this)'><a href='#juneau-microservice-springboot-template.Building' id='juneau-microservice-springboot-template.Building'>14.3 - Building and Running from Command-Line</a></h3>
-<div class='topic'><!-- START: 14.3 - juneau-microservice-springboot-template.Building -->
+<h3 class='topic new' onclick='toggle(this)'><a href='#juneau-my-springboot-microservice.Building' id='juneau-my-springboot-microservice.Building'>14.3 - Building and Running from Command-Line</a></h3>
+<div class='topic'><!-- START: 14.3 - juneau-my-springboot-microservice.Building -->
 <p>
 	The <l>pom.xml</l> file is a basic Maven build script for creating your microservice
 	as an executable uber-jar.
@@ -25671,8 +25671,8 @@
 	Dec 21, 2012 12:30:00 AM org.springframework.boot.StartupInfoLogger logStarted
 	INFO: Started App in 1.999 seconds (JVM running for 2.999)
 </p>
-</div><!-- END: 14.3 - juneau-microservice-springboot-template.Building -->
-</div><!-- END: 14 - juneau-microservice-springboot-template -->
+</div><!-- END: 14.3 - juneau-my-springboot-microservice.Building -->
+</div><!-- END: 14 - juneau-my-springboot-microservice -->
 
 <!-- ==================================================================================================== -->
 
@@ -25803,7 +25803,7 @@
 						{@link org.apache.juneau.rest.BasicRestServletGroup} - Specialized subclass for grouping other resources.
 						<ul>
 							<li class='jac'>
-								{@link org.apache.juneau.microservice.BasicRestServletJenaGroup} - Group resource with added RDF support.
+								{@link org.apache.juneau.rest.BasicRestServletJenaGroup} - Group resource with added RDF support.
 								<ul>
 									<li class='jc'>
 										<code>RootResources</code>
@@ -30947,7 +30947,7 @@
 			<li><js>"$MF{key,default}""</js> - Manifest file entries.
 		</ul> 
 	<li>CSS stylesheet now configurable through config file entry <js>"REST/stylesheet"</js>.
-	<li>New {@link org.apache.juneau.microservice.BasicRestServletJena} class if you want your REST interface to support RDF.
+	<li>New <code><del>BasicRestServletJena</del></code> class if you want your REST interface to support RDF.
 	<li>Eliminated the following classes:
 		<ul>
 			<li><code>org.apache.juneau.microservice.RootResource</code>
@@ -32857,10 +32857,10 @@
 			<li>{@link org.apache.juneau.microservice.Microservice#getInstance() getInstance()}
 		</ul>
 	<li>
-		New class {@link org.apache.juneau.microservice.JettyLogger} for directing Jetty logging to the
+		New class <code><del>JettyLogger</del></code> for directing Jetty logging to the
 		java.util.logging framework.
 	<li>
-		New class {@link org.apache.juneau.microservice.resources.DebugResource} for viewing and generating
+		New class <code><del>DebugResource</del></code> for viewing and generating
 		Jetty thread dumps through REST calls.
 </ul>
 
@@ -33493,7 +33493,7 @@
 		<br>{@link org.apache.juneau.rest.BasicRestServlet} and {@link org.apache.juneau.rest.BasicRestServletGroup} can be used instead.
 	<li>
 		<code>ResourceJena</code> and <code>ResourceJenaGroup</code> classes renamed to
-		{@link org.apache.juneau.microservice.BasicRestServletJena} and {@link org.apache.juneau.microservice.BasicRestServletJenaGroup}.
+		<code><del>BasicRestServletJena</del></code> and <code><del>BasicRestServletJenaGroup</del></code>.
 </ul>
 </div><!-- END: 7.1.0 -->
 
@@ -34202,8 +34202,8 @@
 	<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.jetty.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.
+		<li><b><code>juneau-my-jetty-microservice</code></b> - New.  Template starter project for Jetty-based microservices.
+		<li><b><code>juneau-my-springboot-microservice</code></b> - New.  Template starter project for Spring-Boot-based microservices.
 	</ul>
 	<li><code>juneau-<examples/code>
 	<ul>
diff --git a/juneau-doc/src/main/javadoc/resources/docs.txt b/juneau-doc/src/main/javadoc/resources/docs.txt
index 4a2c99f..5ca52f9 100644
--- a/juneau-doc/src/main/javadoc/resources/docs.txt
+++ b/juneau-doc/src/main/javadoc/resources/docs.txt
@@ -215,10 +215,10 @@ juneau-microservice-core.Overview = #juneau-microservice-core.Overview, Overview
 juneau-microservice-core.SystemProperties = #juneau-microservice-core.SystemProperties, Overview > juneau-microservice-core > System properties
 juneau-microservice-core.VarResolver = #juneau-microservice-core.VarResolver, Overview > juneau-microservice-core > VarResolver
 juneau-microservice-jetty = #juneau-microservice-jetty, Overview > juneau-microservice-jetty
-juneau-microservice-jetty-template = #juneau-microservice-jetty-template, Overview > juneau-microservice-jetty-template
-juneau-microservice-jetty-template.Building = #juneau-microservice-jetty-template.Building, Overview > juneau-microservice-jetty-template > Building and Running from Command-Line
-juneau-microservice-jetty-template.Installing = #juneau-microservice-jetty-template.Installing, Overview > juneau-microservice-jetty-template > Installing in Eclipse
-juneau-microservice-jetty-template.Running = #juneau-microservice-jetty-template.Running, Overview > juneau-microservice-jetty-template > Running in Eclipse
+juneau-my-jetty-microservice = #juneau-my-jetty-microservice, Overview > juneau-my-jetty-microservice / my-jetty-microservice
+juneau-my-jetty-microservice.Building = #juneau-my-jetty-microservice.Building, Overview > juneau-my-jetty-microservice / my-jetty-microservice > Building and Running from Command-Line
+juneau-my-jetty-microservice.Installing = #juneau-my-jetty-microservice.Installing, Overview > juneau-my-jetty-microservice / my-jetty-microservice > Installing in Eclipse
+juneau-my-jetty-microservice.Running = #juneau-my-jetty-microservice.Running, Overview > juneau-my-jetty-microservice / my-jetty-microservice > Running in Eclipse
 juneau-microservice-jetty.Config = #juneau-microservice-jetty.Config, Overview > juneau-microservice-jetty > Config
 juneau-microservice-jetty.Extending = #juneau-microservice-jetty.Extending, Overview > juneau-microservice-jetty > Extending JettyMicroservice
 juneau-microservice-jetty.JettyXml = #juneau-microservice-jetty.JettyXml, Overview > juneau-microservice-jetty > Jetty.xml file
@@ -227,10 +227,10 @@ juneau-microservice-jetty.Overview = #juneau-microservice-jetty.Overview, Overvi
 juneau-microservice-jetty.PredefinedResourceClasses = #juneau-microservice-jetty.PredefinedResourceClasses, Overview > juneau-microservice-jetty > Predefined Resource Classes
 juneau-microservice-jetty.ResourceClasses = #juneau-microservice-jetty.ResourceClasses, Overview > juneau-microservice-jetty > Resource Classes
 juneau-microservice-jetty.UiCustomization = #juneau-microservice-jetty.UiCustomization, Overview > juneau-microservice-jetty > UI Customization
-juneau-microservice-springboot-template = #juneau-microservice-springboot-template, Overview > juneau-microservice-springboot-template
-juneau-microservice-springboot-template.Building = #juneau-microservice-springboot-template.Building, Overview > juneau-microservice-springboot-template > Building and Running from Command-Line
-juneau-microservice-springboot-template.Installing = #juneau-microservice-springboot-template.Installing, Overview > juneau-microservice-springboot-template > Installing in Eclipse
-juneau-microservice-springboot-template.Running = #juneau-microservice-springboot-template.Running, Overview > juneau-microservice-springboot-template > Running in Eclipse
+juneau-my-springboot-microservice = #juneau-my-springboot-microservice, Overview > juneau-my-springboot-microservice / my-springboot-microservice
+juneau-my-springboot-microservice.Building = #juneau-my-springboot-microservice.Building, Overview > juneau-my-springboot-microservice / my-springboot-microservice > Building and Running from Command-Line
+juneau-my-springboot-microservice.Installing = #juneau-my-springboot-microservice.Installing, Overview > juneau-my-springboot-microservice / my-springboot-microservice > Installing in Eclipse
+juneau-my-springboot-microservice.Running = #juneau-my-springboot-microservice.Running, Overview > juneau-my-springboot-microservice / my-springboot-microservice > Running in Eclipse
 juneau-rest-client = #juneau-rest-client, Overview > juneau-rest-client
 juneau-rest-client.Authentication = #juneau-rest-client.Authentication, Overview > juneau-rest-client > Authentication
 juneau-rest-client.Authentication.BASIC = #juneau-rest-client.Authentication.BASIC, Overview > juneau-rest-client > Authentication > BASIC Authentication
diff --git a/juneau-doc/src/main/javadoc/resources/fragments/toc.html b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
index 21b40bf..94420d8 100644
--- a/juneau-doc/src/main/javadoc/resources/fragments/toc.html
+++ b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
@@ -360,17 +360,17 @@
 		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.UiCustomization'>UI Customization</a></p>
 		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty.Extending'>Extending JettyMicroservice</a></p>
 	</ol>
-	<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty-template'>juneau-microservice-jetty-template</a></p>
+	<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-my-jetty-microservice'>juneau-my-jetty-microservice / my-jetty-microservice</a></p>
 	<ol>
-		<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty-template.Installing'>Installing in Eclipse</a></p>
-		<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty-template.Running'>Running in Eclipse</a></p>
-		<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-jetty-template.Building'>Building and Running from Command-Line</a></p>
+		<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-my-jetty-microservice.Installing'>Installing in Eclipse</a></p>
+		<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-my-jetty-microservice.Running'>Running in Eclipse</a></p>
+		<li><p class='updated'><a class='doclink' href='{OVERVIEW_URL}#juneau-my-jetty-microservice.Building'>Building and Running from Command-Line</a></p>
 	</ol>
-	<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-springboot-template'>juneau-microservice-springboot-template</a></p>
+	<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-my-springboot-microservice'>juneau-my-springboot-microservice / my-springboot-microservice</a></p>
 	<ol>
-		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-springboot-template.Installing'>Installing in Eclipse</a></p>
-		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-springboot-template.Running'>Running in Eclipse</a></p>
-		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-microservice-springboot-template.Building'>Building and Running from Command-Line</a></p>
+		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-my-springboot-microservice.Installing'>Installing in Eclipse</a></p>
+		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-my-springboot-microservice.Running'>Running in Eclipse</a></p>
+		<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-my-springboot-microservice.Building'>Building and Running from Command-Line</a></p>
 	</ol>
 	<li><p class='toc2'><a class='doclink' href='{OVERVIEW_URL}#juneau-examples-core'>juneau-examples-core</a></p>
 	<ol>
diff --git a/juneau-microservice/juneau-microservice-jetty-template/.classpath b/juneau-microservice/juneau-my-jetty-microservice/.classpath
similarity index 81%
rename from juneau-microservice/juneau-microservice-jetty-template/.classpath
rename to juneau-microservice/juneau-my-jetty-microservice/.classpath
index d623f16..b2821f9 100755
--- a/juneau-microservice/juneau-microservice-jetty-template/.classpath
+++ b/juneau-microservice/juneau-my-jetty-microservice/.classpath
@@ -22,5 +22,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/.gitignore b/juneau-microservice/juneau-my-jetty-microservice/.gitignore
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/.gitignore
rename to juneau-microservice/juneau-my-jetty-microservice/.gitignore
diff --git a/juneau-microservice/juneau-microservice-jetty-template/.project b/juneau-microservice/juneau-my-jetty-microservice/.project
similarity index 90%
rename from juneau-microservice/juneau-microservice-jetty-template/.project
rename to juneau-microservice/juneau-my-jetty-microservice/.project
index e300af5..adcd687 100755
--- a/juneau-microservice/juneau-microservice-jetty-template/.project
+++ b/juneau-microservice/juneau-my-jetty-microservice/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>juneau-microservice-jetty-template</name>
+	<name>juneau-my-jetty-microservice</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/.classpath b/juneau-microservice/juneau-my-jetty-microservice/build-overlay/.classpath
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/build-overlay/.classpath
rename to juneau-microservice/juneau-my-jetty-microservice/build-overlay/.classpath
diff --git a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/.project b/juneau-microservice/juneau-my-jetty-microservice/build-overlay/.project
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/build-overlay/.project
rename to juneau-microservice/juneau-my-jetty-microservice/build-overlay/.project
diff --git a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/my-jetty-microservice.launch b/juneau-microservice/juneau-my-jetty-microservice/build-overlay/my-jetty-microservice.launch
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/build-overlay/my-jetty-microservice.launch
rename to juneau-microservice/juneau-my-jetty-microservice/build-overlay/my-jetty-microservice.launch
diff --git a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml b/juneau-microservice/juneau-my-jetty-microservice/build-overlay/pom.xml
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
rename to juneau-microservice/juneau-my-jetty-microservice/build-overlay/pom.xml
diff --git a/juneau-microservice/juneau-microservice-jetty-template/my-jetty-microservice.cfg b/juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.cfg
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/my-jetty-microservice.cfg
rename to juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.cfg
diff --git a/juneau-microservice/juneau-microservice-jetty-template/my-jetty-microservice.launch b/juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.launch
similarity index 87%
rename from juneau-microservice/juneau-microservice-jetty-template/my-jetty-microservice.launch
rename to juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.launch
index 4f5ed8d..20c5811 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/my-jetty-microservice.launch
+++ b/juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/App.java"/>
+<listEntry value="/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/App.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -12,6 +12,6 @@
 <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.jetty.template.App"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-microservice-jetty-template"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-my-jetty-microservice"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>
diff --git a/juneau-microservice/juneau-microservice-jetty-template/pom.xml b/juneau-microservice/juneau-my-jetty-microservice/pom.xml
similarity index 98%
rename from juneau-microservice/juneau-microservice-jetty-template/pom.xml
rename to juneau-microservice/juneau-my-jetty-microservice/pom.xml
index 0570209..21b3448 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/pom.xml
+++ b/juneau-microservice/juneau-my-jetty-microservice/pom.xml
@@ -31,7 +31,7 @@
 		<version>8.0.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>juneau-microservice-jetty-template</artifactId>
+	<artifactId>juneau-my-jetty-microservice</artifactId>
 	<name>Apache Juneau Jetty Microservice Template</name>
 	<description>A template project developers use to start with to create a microservice.</description>
 	
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/assembly/bin.xml b/juneau-microservice/juneau-my-jetty-microservice/src/assembly/bin.xml
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/assembly/bin.xml
rename to juneau-microservice/juneau-my-jetty-microservice/src/assembly/bin.xml
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/App.java b/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/App.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/App.java
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/App.java
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/HelloWorldResource.java b/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/HelloWorldResource.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/HelloWorldResource.java
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/HelloWorldResource.java
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/RootResources.java b/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/RootResources.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/RootResources.java
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/RootResources.java
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/nls/Messages.properties b/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/nls/Messages.properties
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/nls/Messages.properties
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/nls/Messages.properties
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/package-info.java b/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/package-info.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/package-info.java
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/package-info.java
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/images/asf.png b/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/images/asf.png
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/images/asf.png
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/images/asf.png
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/images/juneau.png b/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/images/juneau.png
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/images/juneau.png
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/images/juneau.png
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/styles/SwaggerUI.css b/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/styles/SwaggerUI.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/styles/SwaggerUI.css
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/styles/SwaggerUI.css
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/dark.css b/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/themes/dark.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/dark.css
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/themes/dark.css
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/devops.css b/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/themes/devops.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/devops.css
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/themes/devops.css
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/light.css b/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/themes/light.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/light.css
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/themes/light.css
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/original.css b/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/themes/original.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/original.css
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/resources/htdocs/themes/original.css
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/jetty.xml b/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/jetty.xml
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/jetty.xml
rename to juneau-microservice/juneau-my-jetty-microservice/src/main/resources/jetty.xml
diff --git a/juneau-microservice/juneau-microservice-springboot-template/.classpath b/juneau-microservice/juneau-my-springboot-microservice/.classpath
similarity index 81%
rename from juneau-microservice/juneau-microservice-springboot-template/.classpath
rename to juneau-microservice/juneau-my-springboot-microservice/.classpath
index d623f16..b2821f9 100755
--- a/juneau-microservice/juneau-microservice-springboot-template/.classpath
+++ b/juneau-microservice/juneau-my-springboot-microservice/.classpath
@@ -22,5 +22,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-microservice/juneau-microservice-jetty-template/.gitignore b/juneau-microservice/juneau-my-springboot-microservice/.gitignore
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/.gitignore
rename to juneau-microservice/juneau-my-springboot-microservice/.gitignore
diff --git a/juneau-microservice/juneau-microservice-springboot-template/.project b/juneau-microservice/juneau-my-springboot-microservice/.project
similarity index 89%
rename from juneau-microservice/juneau-microservice-springboot-template/.project
rename to juneau-microservice/juneau-my-springboot-microservice/.project
index a317557..fc37613 100755
--- a/juneau-microservice/juneau-microservice-springboot-template/.project
+++ b/juneau-microservice/juneau-my-springboot-microservice/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>juneau-microservice-springboot-template</name>
+	<name>juneau-my-springboot-microservice</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/.classpath b/juneau-microservice/juneau-my-springboot-microservice/build-overlay/.classpath
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/build-overlay/.classpath
rename to juneau-microservice/juneau-my-springboot-microservice/build-overlay/.classpath
diff --git a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/.project b/juneau-microservice/juneau-my-springboot-microservice/build-overlay/.project
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/build-overlay/.project
rename to juneau-microservice/juneau-my-springboot-microservice/build-overlay/.project
diff --git a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/my-springboot-microservice.launch b/juneau-microservice/juneau-my-springboot-microservice/build-overlay/my-springboot-microservice.launch
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/build-overlay/my-springboot-microservice.launch
rename to juneau-microservice/juneau-my-springboot-microservice/build-overlay/my-springboot-microservice.launch
diff --git a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml b/juneau-microservice/juneau-my-springboot-microservice/build-overlay/pom.xml
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
rename to juneau-microservice/juneau-my-springboot-microservice/build-overlay/pom.xml
diff --git a/juneau-microservice/juneau-microservice-springboot-template/my-springboot-microservice.launch b/juneau-microservice/juneau-my-springboot-microservice/my-springboot-microservice.launch
similarity index 87%
rename from juneau-microservice/juneau-microservice-springboot-template/my-springboot-microservice.launch
rename to juneau-microservice/juneau-my-springboot-microservice/my-springboot-microservice.launch
index f549d7f..2fbb1ff 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/my-springboot-microservice.launch
+++ b/juneau-microservice/juneau-my-springboot-microservice/my-springboot-microservice.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/App.java"/>
+<listEntry value="/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/App.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -12,6 +12,6 @@
 <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.springboot.template.App"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-microservice-springboot-template"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-my-springboot-microservice"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/pom.xml b/juneau-microservice/juneau-my-springboot-microservice/pom.xml
similarity index 98%
rename from juneau-microservice/juneau-microservice-springboot-template/pom.xml
rename to juneau-microservice/juneau-my-springboot-microservice/pom.xml
index 16f8af1..aff689c 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/pom.xml
+++ b/juneau-microservice/juneau-my-springboot-microservice/pom.xml
@@ -31,7 +31,7 @@
 		<version>8.0.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>juneau-microservice-springboot-template</artifactId>
+	<artifactId>juneau-my-springboot-microservice</artifactId>
 	<name>Apache Juneau Spring Boot Microservice Template</name>
 	<description>A template project developers use to start with to create a microservice.</description>
 	
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/assembly/bin.xml b/juneau-microservice/juneau-my-springboot-microservice/src/assembly/bin.xml
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/assembly/bin.xml
rename to juneau-microservice/juneau-my-springboot-microservice/src/assembly/bin.xml
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/App.java b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/App.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/App.java
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/App.java
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/nls/Messages.properties b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/nls/Messages.properties
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/nls/Messages.properties
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/nls/Messages.properties
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/package-info.java b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/package-info.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/package-info.java
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/package-info.java
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/application.properties b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/application.properties
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/application.properties
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/resources/application.properties
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/images/asf.png b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/images/asf.png
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/images/asf.png
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/images/asf.png
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/images/juneau.png b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/images/juneau.png
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/images/juneau.png
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/images/juneau.png
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/styles/SwaggerUI.css b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/styles/SwaggerUI.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/styles/SwaggerUI.css
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/styles/SwaggerUI.css
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/dark.css b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/themes/dark.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/dark.css
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/themes/dark.css
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/devops.css b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/themes/devops.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/devops.css
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/themes/devops.css
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/light.css b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/themes/light.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/light.css
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/themes/light.css
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/original.css b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/themes/original.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/original.css
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/resources/htdocs/themes/original.css
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/juneau.cfg b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/juneau.cfg
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/juneau.cfg
rename to juneau-microservice/juneau-my-springboot-microservice/src/main/resources/juneau.cfg
diff --git a/juneau-microservice/pom.xml b/juneau-microservice/pom.xml
index 33b8d83..d5c8d14 100644
--- a/juneau-microservice/pom.xml
+++ b/juneau-microservice/pom.xml
@@ -31,9 +31,9 @@
 	<modules>
 		<module>juneau-microservice-core</module>
 		<module>juneau-microservice-jetty</module>
-		<module>juneau-microservice-jetty-template</module>
+		<module>juneau-my-jetty-microservice</module>
 		<module>juneau-microservice-test</module>
-		<module>juneau-microservice-springboot-template</module>
+		<module>juneau-my-springboot-microservice</module>
 	</modules>
 
 </project>
diff --git a/juneau-release.sh b/juneau-release.sh
index 7d3c7a4..f2518f6 100755
--- a/juneau-release.sh
+++ b/juneau-release.sh
@@ -67,7 +67,8 @@ mvn clean verify
 mvn javadoc:aggregate
 yprompt "Is the javadoc generation clean?"
 
-yprompt "Can juneau/juneau-microservice/juneau-microservice-jetty-template/target/my-jetty-microservice-$X_VERSION.bin.zip be deployed into an Eclipse workspace?"
+yprompt "Can juneau/juneau-microservice/juneau-my-jetty-microservice/target/my-jetty-microservice-$X_VERSION.bin.zip be deployed into an Eclipse workspace?"
+yprompt "Can juneau/juneau-microservice/juneau-my-springboot-microservice/target/my-springboot-microservice-$X_VERSION.bin.zip be deployed into an Eclipse workspace?"
 yprompt "Can juneau/juneau-examples/juneau-examples-rest-jetty/target/juneau-examples-rest-jetty-$X_VERSION.bin.zip be deployed into an Eclipse workspace?"
 yprompt "Can juneau/juneau-examples/juneau-examples-rest-springboot/target/juneau-examples-rest-springboot-$X_VERSION.bin.zip be deployed into an Eclipse workspace?"
 
diff --git a/juneau-releng/juneau-distrib/pom.xml b/juneau-releng/juneau-distrib/pom.xml
index c0fb793..68a9a61 100644
--- a/juneau-releng/juneau-distrib/pom.xml
+++ b/juneau-releng/juneau-distrib/pom.xml
@@ -330,12 +330,21 @@
 								<artifactItem>
 									<outputDirectory>${project.build.directory}/bin/projects</outputDirectory>
 									<groupId>org.apache.juneau</groupId>
-									<artifactId>juneau-microservice-jetty-template</artifactId>
+									<artifactId>juneau-my-jetty-microservice</artifactId>
 									<classifier>bin</classifier>
 									<type>zip</type>
 									<version>${project.version}</version>
 									<destFileName>my-jetty-microservice-${project.version}.zip</destFileName>
 								</artifactItem>
+								<artifactItem>
+									<outputDirectory>${project.build.directory}/bin/projects</outputDirectory>
+									<groupId>org.apache.juneau</groupId>
+									<artifactId>juneau-my-springboot-microservice</artifactId>
+									<classifier>bin</classifier>
+									<type>zip</type>
+									<version>${project.version}</version>
+									<destFileName>my-springboot-microservice-${project.version}.zip</destFileName>
+								</artifactItem>
 
 							</artifactItems>
 						</configuration>


Mime
View raw message