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: Various bug fixes and cleanup in examples.
Date Sat, 15 Dec 2018 22:20:51 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 a226227  Various bug fixes and cleanup in examples.
a226227 is described below

commit a2262274365d79b8cd6273b2476e7b02b0fc6682
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Sat Dec 15 17:20:35 2018 -0500

    Various bug fixes and cleanup in examples.
---
 .../org/apache/juneau/dto/atom/CommonEntry.java    |   2 +-
 juneau-doc/src/main/javadoc/overview.html          |   3 +-
 .../build-overlay/pom.xml                          |  91 ++++++++++++---------
 .../juneau-examples-rest-jetty/examples.cfg        |  26 ++++--
 .../org/apache/juneau/examples/rest/jetty/App.java |   2 +-
 .../src/main/resources}/htdocs/images/asf.png      | Bin
 .../src/main/resources}/htdocs/images/juneau.png   | Bin
 .../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
 .../build-overlay/.classpath                       |   1 -
 .../build-overlay/pom.xml                          |  61 +++++---------
 .../juneau/examples/rest/springboot/App.java       |  17 +++-
 .../src/main/resources}/htdocs/images/asf.png      | Bin
 .../src/main/resources}/htdocs/images/juneau.png   | Bin
 .../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                  |  26 ++++--
 .../apache/juneau/examples/rest/RootResources.java |   2 -
 .../rest/petstore/rest/SqlQueryResource.java       |   1 +
 .../apache/juneau/microservice/Microservice.java   |   9 +-
 .../build-overlay/.project                         |   2 +-
 .../build-overlay/my-microservice.launch           |   4 +-
 .../build-overlay/pom.xml                          |  19 +++--
 .../my-microservice.cfg                            |  13 +--
 .../my-microservice.launch                         |   8 +-
 .../{sample => jetty/template}/App.java            |   4 +-
 .../jetty/template}/HelloWorldResource.java        |   2 +-
 .../jetty/template}/RootResources.java             |   6 +-
 .../jetty/template}/nls/Messages.properties        |   0
 .../{sample => jetty/template}/package-info.java   |   2 +-
 .../src/main/resources}/htdocs/images/asf.png      | Bin
 .../src/main/resources}/htdocs/images/juneau.png   | Bin
 .../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                   |   2 +-
 .../build-overlay/.project                         |   2 +-
 .../build-overlay/my-microservice.launch           |   4 +-
 .../build-overlay/pom.xml                          |  28 ++-----
 .../my-microservice.launch                         |   8 +-
 .../{sample => springboot/template}/App.java       |   2 +-
 .../springboot/template}/HelloWorldResource.java   |   2 +-
 .../springboot/template}/RootResources.java        |   2 +-
 .../springboot/template}/nls/Messages.properties   |   0
 .../template}/package-info.java                    |   2 +-
 .../src/main/resources/application.properties}     |  34 ++++----
 .../src/main/resources}/htdocs/images/asf.png      | Bin
 .../src/main/resources}/htdocs/images/juneau.png   | Bin
 .../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                  |  14 +++-
 .../rest/springboot/JuneauRestInitializer.java     |   4 +
 63 files changed, 233 insertions(+), 172 deletions(-)

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
index ce98ae0..256eb87 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
@@ -100,7 +100,7 @@ public class CommonEntry extends Common {
 	 * @return The list of categories of this object.
 	 */
 	@Xml(format=COLLAPSED, childName="category")
-	public Category[] getCatetories() {
+	public Category[] getCategories() {
 		return categories;
 	}
 
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index 8e2128a..6213b79 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -25723,12 +25723,13 @@
 	<ul>
 		<li class='jc'>{@link org.apache.juneau.examples.core.json.JsonSimpleExample} - JsonSerializer and JsonParser usage on serialize and deserialize simple Pojo bean.
 		<li class='jc'>{@link org.apache.juneau.examples.core.json.JsonComplexExample} - JsonSerializer and JsonParser usage on serialize and deserialize complex Pojo bean.
-		<li class='jc'>{@link org.apache.juneau.examples.core.json.JsonConfigurationExample} 
+		<li class='jc'>{@link org.apache.juneau.examples.core.json.JsonConfigurationExample} - Json Serializers configured using properties defined in JsonSerializer class.
 	</ul>
 	<li class='jp'>{@link org.apache.juneau.examples.core.xml}
 	<ul>
 		<li class='jc'>{@link org.apache.juneau.examples.core.xml.XmlSimpleExample} - XmlSerializer and XmlParser usage on serialize and deserialize simple Pojo bean.
 		<li class='jc'>{@link org.apache.juneau.examples.core.xml.XmlComplexExample} - XmlSerializer and XmlParser usage on serialize and deserialize complex Pojo bean.
+		<li class='jc'>{@link org.apache.juneau.examples.core.xml.XmlConfigurationExample} - XmlSerializers configured using properties defined in XmlSerializer class.
 	</ul>
 	<li class='jp'>{@link org.apache.juneau.examples.core.rdf}
 	<ul>
diff --git a/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml b/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
index 01cdba0..6bb9653 100644
--- a/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-rest-jetty/build-overlay/pom.xml
@@ -54,25 +54,15 @@
 		<!-- Juneau artifacts -->	
 		<dependency>
 			<groupId>org.apache.juneau</groupId>
-			<artifactId>juneau-all</artifactId>
-			<version>\${juneau.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.juneau</groupId>
-			<artifactId>juneau-marshall-rdf</artifactId>
-			<version>\${juneau.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.juneau</groupId>
 			<artifactId>juneau-microservice-jetty</artifactId>
 			<version>\${juneau.version}</version>
 		</dependency>
+
+		<!-- Optional RDF support -->
 		<dependency>
 			<groupId>org.apache.juneau</groupId>
-			<artifactId>juneau-rest-server</artifactId>
+			<artifactId>juneau-marshall-rdf</artifactId>
 			<version>\${juneau.version}</version>
-			<type>test-jar</type>
-			<scope>test</scope>
 		</dependency>
 				
 		<dependency>
@@ -135,57 +125,80 @@
 		<plugins>
 
 			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
+				<artifactId>maven-resources-plugin</artifactId>
+       			<version>3.0.2</version>
+ 				<executions>
 					<execution>
-						<id>attach-sources</id>
-						<phase>verify</phase>
+						<id>package-config</id>
+						<phase>package</phase>
 						<goals>
-							<goal>jar-no-fork</goal>
+							<goal>copy-resources</goal>
 						</goals>
+						<configuration>
+							<outputDirectory>target</outputDirectory>
+							<resources>
+								<resource>
+									<directory>.</directory>
+									<includes>examples.cfg</includes>
+								</resource>
+							</resources>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 
-			<!-- This runs the _TestSuite class. You must run within the testsuite 
-				so the REST microservice is started for the tests. -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
+				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
-					<includes>
-						<include>**/_TestSuite.java</include>
-					</includes>
+					<archive>
+						<manifest>
+							<mainClass>org.apache.juneau.examples.rest.jetty.App
+							</mainClass>
+						</manifest>
+					</archive>
 				</configuration>
 			</plugin>
 
 			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.0.0</version>
+				<configuration>
+					<createDependencyReducedPom>false</createDependencyReducedPom>
+				</configuration>
 				<executions>
 					<execution>
+						<phase>package</phase>
 						<goals>
-							<goal>build-info</goal>
+							<goal>shade</goal>
 						</goals>
 						<configuration>
-							<additionalProperties>
-								<encoding.source>\${project.build.sourceEncoding}</encoding.source>
-								<encoding.reporting>\${project.reporting.outputEncoding}</encoding.reporting>
-								<java.source>\${maven.compiler.source}</java.source>
-								<java.target>\${maven.compiler.target}</java.target>
-							</additionalProperties>
+							<filters>
+								<filter>
+									<artifact>*:*</artifact>
+									<excludes>
+										<exclude>META-INF/*.SF</exclude>
+										<exclude>META-INF/*.RSA</exclude>
+										<exclude>META-INF/*.INF</exclude> <!-- This one may not be required -->
+									</excludes>
+								</filter>
+							</filters>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
 	</build>
 	
 </project>
diff --git a/juneau-examples/juneau-examples-rest-jetty/examples.cfg b/juneau-examples/juneau-examples-rest-jetty/examples.cfg
index 5ac46d1..c63e3ba 100755
--- a/juneau-examples/juneau-examples-rest-jetty/examples.cfg
+++ b/juneau-examples/juneau-examples-rest-jetty/examples.cfg
@@ -39,19 +39,35 @@ port = 10000,0,0,0
 #=======================================================================================================================
 [REST]
 
-staticFiles = htdocs:files/htdocs
+# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @RestResource-annotated
+# classes.  These are static files that are served up by the servlet under the specified sub-paths.
+# For example, given the following setting...
+# 	staticFiles = htdocs:my-docs,styles/my-styles
+# ...the URI "/servletPath/htdocs/javadoc.css" resolves to the path "/my-docs/javadoc.css".
+# This path can be relative to the working directory, classpath root, or package of your resource class.
+# Used by the BasicRestConfig interface that defines the following value:
+# 	staticFiles="$C{REST/staticFiles}"
+staticFiles = htdocs:htdocs
 
 # Stylesheet to use for HTML views.
+# Used by the BasicRestConfig interface that defines the following value:
+# 	stylesheet="$C{REST/theme,servlet:/htdocs/themes/devops.css}"
 theme = servlet:/htdocs/themes/devops.css
 
+# Various look-and-feel settings used in the BasicRestConfig interface.
 headerIcon = servlet:/htdocs/images/juneau.png
 headerLink = http://juneau.apache.org
 footerIcon = servlet:/htdocs/images/asf.png
 footerLink = http://www.apache.org
-
 favicon = $C{REST/headerIcon}
-header = <a href='$U{$C{REST/headerLink}}'><img src='$U{$C{REST/headerIcon}}' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/></a>
-footer = <a href='$U{$C{REST/footerLink}}'><img style='float:right;padding-right:20px;height:32px' src='$U{$C{REST/footerIcon}}'>
+header = 
+	<a href='$U{$C{REST/headerLink}}'>
+		<img src='$U{$C{REST/headerIcon}}' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/>
+	</a>
+footer = 
+	<a href='$U{$C{REST/footerLink}}'>
+		<img style='float:right;padding-right:20px;height:32px' src='$U{$C{REST/footerIcon}}'>
+	</a>
 
 #=======================================================================================================================
 # Console settings
@@ -174,7 +190,7 @@ url = http://docker.apache.org:5000/v1
 #=======================================================================================================================
 [SqlQueryResource]
 driver = org.apache.derby.jdbc.EmbeddedDriver
-directory = $S{user.dir}/target/derby/testDB
+directory = target/derby/testDB
 connectionUrl = jdbc:derby:$C{SqlQueryResource/directory};create=true
 allowTempUpdates = true
 includeRowNums = false
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 9d2a17b..087177d 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
@@ -12,7 +12,7 @@
 // ***************************************************************************************************************************
 package org.apache.juneau.examples.rest.jetty;
 
-import org.apache.juneau.examples.rest.*;
+import org.apache.juneau.examples.rest.RootResources;
 import org.apache.juneau.microservice.jetty.*;
 
 /**
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/images/asf.png b/juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/images/asf.png
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/images/asf.png
rename to juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/images/asf.png
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/images/juneau.png b/juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/images/juneau.png
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/images/juneau.png
rename to juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/images/juneau.png
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/styles/SwaggerUI.css b/juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/styles/SwaggerUI.css
similarity index 100%
rename from juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/styles/SwaggerUI.css
rename to juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/styles/SwaggerUI.css
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/dark.css b/juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/themes/dark.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/dark.css
rename to juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/themes/dark.css
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/devops.css b/juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/themes/devops.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/devops.css
rename to juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/themes/devops.css
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/light.css b/juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/themes/light.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/light.css
rename to juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/themes/light.css
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/original.css b/juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/themes/original.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/original.css
rename to juneau-examples/juneau-examples-rest-jetty/src/main/resources/htdocs/themes/original.css
diff --git a/juneau-examples/juneau-examples-rest-springboot/build-overlay/.classpath b/juneau-examples/juneau-examples-rest-springboot/build-overlay/.classpath
index b8f9eed..0ba4099 100644
--- a/juneau-examples/juneau-examples-rest-springboot/build-overlay/.classpath
+++ b/juneau-examples/juneau-examples-rest-springboot/build-overlay/.classpath
@@ -11,7 +11,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/assembly"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml b/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
index 9588f54..95be27f 100644
--- a/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
+++ b/juneau-examples/juneau-examples-rest-springboot/build-overlay/pom.xml
@@ -15,10 +15,13 @@
 -->
 <!--
 	This project is meant to be used as a starting point for developers to use in creating their own REST microservices.
-	It creates a parent REST interface on port 10000 with a single child hello-world resource.
+	It creates a Spring Boot application on port 5000 populated with the Juneau REST examples.
 	This POM is likewise meant to be used as a starting point for developers. It creates an uber-jar
-	to run the microserice from the command line. Copy the jar as well as the .cfg file and start it
-	with java -jar juneau-microservice-template-1.0.0.jar microservice.cfg
+	to run the microservice from the command line. 
+	
+	Copy the jar as well as the my-microservice.cfg and jetty.xml file and start it with: 
+		java -jar juneau-examples-rest-springboot-1.0.jar
+		
 	The group/artifact/version information is meant to be overwritten by developers to match their own needs.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -29,7 +32,7 @@
 	<artifactId>juneau-examples-rest-springboot</artifactId>
 	<name>Apache Juneau REST Examples</name>
 	<version>${version}</version>
-	<description>Sample code packaged as a microservice.</description>
+	<description>REST examples packaged as a Spring Boot microservice.</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -71,10 +74,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.juneau</groupId>
-			<artifactId>juneau-rest-server</artifactId>
+			<artifactId>juneau-rest-server-springboot</artifactId>
 			<version>\${juneau.version}</version>
-			<type>test-jar</type>
-			<scope>test</scope>
 		</dependency>
 				
 		<!-- Spring Boot dependencies-->
@@ -136,32 +137,6 @@
 		<plugins>
 
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- This runs the _TestSuite class. You must run within the testsuite 
-				so the REST microservice is started for the tests. -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>**/_TestSuite.java</include>
-					</includes>
-				</configuration>
-			</plugin>
-
-			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<executions>
@@ -180,13 +155,21 @@
 					</execution>
 				</executions>
 			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>org.apache.juneau.examples.rest.springboot.App
+							</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			
 		</plugins>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
 	</build>
 	
 </project>
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/App.java b/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/App.java
index 2c23a3e..1cea588 100644
--- a/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/App.java
+++ b/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/App.java
@@ -12,13 +12,15 @@
 // ***************************************************************************************************************************
 package org.apache.juneau.examples.rest.springboot;
 
-import org.apache.juneau.examples.rest.RootResources;
+import org.apache.juneau.examples.rest.*;
 import org.apache.juneau.rest.springboot.*;
 import org.apache.juneau.rest.springboot.annotation.*;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.*;
+import org.springframework.boot.web.servlet.*;
 import org.springframework.context.annotation.*;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.filter.*;
 
 /**
  * Entry point for Examples REST application when deployed as a Spring Boot application.
@@ -31,6 +33,8 @@ public class App {
 		new SpringApplicationBuilder(App.class)
 			.initializers(new JuneauRestInitializer(App.class))
 			.run(args);
+
+		System.err.println(System.getProperty("server.port"));
 	}
 
 	/**
@@ -40,4 +44,15 @@ public class App {
 	public RootResources getRootResources() {
 		return new RootResources();
 	}
+
+	/**
+	 * We want to be able to consume url-encoded-form-post bodies, but HiddenHttpMethodFilter triggers the HTTP
+	 * body to be consumed.  So disable it.
+	 */
+	@Bean
+	public FilterRegistrationBean<HiddenHttpMethodFilter> registration(HiddenHttpMethodFilter filter) {
+	    FilterRegistrationBean<HiddenHttpMethodFilter> registration = new FilterRegistrationBean<>(filter);
+	    registration.setEnabled(false);
+	    return registration;
+	}
 }
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/images/asf.png b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/images/asf.png
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/images/asf.png
rename to juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/images/asf.png
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/images/juneau.png b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/images/juneau.png
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/images/juneau.png
rename to juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/images/juneau.png
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/styles/SwaggerUI.css b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/styles/SwaggerUI.css
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/styles/SwaggerUI.css
rename to juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/styles/SwaggerUI.css
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/themes/dark.css b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/themes/dark.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/themes/dark.css
rename to juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/themes/dark.css
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/themes/devops.css b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/themes/devops.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/themes/devops.css
rename to juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/themes/devops.css
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/themes/light.css b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/themes/light.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/themes/light.css
rename to juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/themes/light.css
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/themes/original.css b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/themes/original.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/themes/original.css
rename to juneau-examples/juneau-examples-rest-springboot/src/main/resources/htdocs/themes/original.css
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
index 594c30a..2d368dd 100755
--- a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
+++ b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
@@ -16,26 +16,42 @@
 #=======================================================================================================================
 [REST]
 
-staticFiles = htdocs:files/htdocs
+# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @RestResource-annotated
+# classes.  These are static files that are served up by the servlet under the specified sub-paths.
+# For example, given the following setting...
+# 	staticFiles = htdocs:my-docs,styles/my-styles
+# ...the URI "/servletPath/htdocs/javadoc.css" resolves to the path "/my-docs/javadoc.css".
+# This path can be relative to the working directory, classpath root, or package of your resource class.
+# Used by the BasicRestConfig interface that defines the following value:
+# 	staticFiles="$C{REST/staticFiles}"
+staticFiles = htdocs:htdocs
 
 # Stylesheet to use for HTML views.
+# Used by the BasicRestConfig interface that defines the following value:
+# 	stylesheet="$C{REST/theme,servlet:/htdocs/themes/devops.css}"
 theme = servlet:/htdocs/themes/devops.css
 
+# Various look-and-feel settings used in the BasicRestConfig interface.
 headerIcon = servlet:/htdocs/images/juneau.png
 headerLink = http://juneau.apache.org
 footerIcon = servlet:/htdocs/images/asf.png
 footerLink = http://www.apache.org
-
 favicon = $C{REST/headerIcon}
-header = <a href='$U{$C{REST/headerLink}}'><img src='$U{$C{REST/headerIcon}}' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/></a>
-footer = <a href='$U{$C{REST/footerLink}}'><img style='float:right;padding-right:20px;height:32px' src='$U{$C{REST/footerIcon}}'>
+header = 
+	<a href='$U{$C{REST/headerLink}}'>
+		<img src='$U{$C{REST/headerIcon}}' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/>
+	</a>
+footer = 
+	<a href='$U{$C{REST/footerLink}}'>
+		<img style='float:right;padding-right:20px;height:32px' src='$U{$C{REST/footerIcon}}'>
+	</a>
 
 #=======================================================================================================================
 # SqlQueryResource properties
 #=======================================================================================================================
 [SqlQueryResource]
 driver = org.apache.derby.jdbc.EmbeddedDriver
-directory = $S{user.dir}/target/derby/testDB
+directory = target/derby/testDB
 connectionUrl = jdbc:derby:$C{SqlQueryResource/directory};create=true
 allowTempUpdates = true
 includeRowNums = false
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 1a20beb..90dc00a 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,7 +16,6 @@ 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.*;
@@ -63,7 +62,6 @@ import org.apache.juneau.rest.widget.*;
 		DtoExamples.class,
 		ConfigResource.class,
 		LogsResource.class,
-		DebugResource.class,
 		ShutdownResource.class
 	}
 )
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.java
index a2a68a1..1ad34e0 100644
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.java
@@ -98,6 +98,7 @@ public class SqlQueryResource extends BasicRestServlet {
 		try {
 			Class.forName(driver).newInstance();
 		} catch (Exception e) {
+			e.printStackTrace(System.err);
 			throw new RuntimeException(e);
 		}
 	}
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index c859478..3598b35 100755
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -234,8 +234,13 @@ public class Microservice implements ConfigEventListener {
 				consoleCommandMap.put(cc.getName(), cc);
 			}
 			for (String s : config.getStringArray("Console/commands")) {
-				ConsoleCommand cc = (ConsoleCommand)Class.forName(s).newInstance();
-				consoleCommandMap.put(cc.getName(), cc);
+				ConsoleCommand cc;
+				try {
+					cc = (ConsoleCommand)Class.forName(s).newInstance();
+					consoleCommandMap.put(cc.getName(), cc);
+				} catch (Exception e) {
+					getConsoleWriter().println("Could not create console command '"+s+"', " + e.getLocalizedMessage());
+				}
 			}
 			consoleThread = new Thread("ConsoleThread") {
 				@Override /* Thread */
diff --git a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/.project b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/.project
index e940a4f..5490c5b 100755
--- a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/.project
+++ b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>my-microservice</name>
+	<name>my-jetty-microservice</name>
 	<comment></comment>
 	<projects>
 	</projects>
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 721de3c..461d58b 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.sample.App"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="my-microservice"/>
+<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="my-microservice-jetty"/>
 <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/build-overlay/pom.xml b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
index 38b1518..9fd8101 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
@@ -20,7 +20,7 @@
 	to run the microservice from the command line. 
 	
 	Copy the jar as well as the my-microservice.cfg file and start it with: 
-		java -jar my-microservice-1.0.jar
+		java -jar my-jetty-microservice-1.0.jar
 		
 	The group/artifact/version information is meant to be overwritten by developers to match their own needs.
 -->
@@ -29,12 +29,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<groupId>my-microservices</groupId>
-	<artifactId>my-microservice</artifactId>
-	<version>${project.version}</version>
+	<artifactId>my-jetty-microservice</artifactId>
+	<version>${version}</version>
 	<name>Juneau REST start project using Jetty</name>
 	
 	<properties>
-		<juneau.version>${project.version}</juneau.version>
+		<juneau.version>${version}</juneau.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	
@@ -42,12 +42,13 @@
 		<dependency>
 			<groupId>org.apache.juneau</groupId>
 			<artifactId>juneau-microservice-jetty</artifactId>
-			<version>${juneau.version}</version>
+			<version>\${juneau.version}</version>
 		</dependency>
 	</dependencies>
 	
 	<build>
 		<plugins>
+			
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
@@ -55,6 +56,7 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -71,25 +73,27 @@
 							<resources>
 								<resource>
 									<directory>.</directory>
-									<includes>my-microservice.cfg,jetty.xml</includes>
+									<includes>my-microservice.cfg</includes>
 								</resource>
 							</resources>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>org.apache.juneau.microservice.sample.App
+							<mainClass>org.apache.juneau.microservice.jetty.template.App
 							</mainClass>
 						</manifest>
 					</archive>
 				</configuration>
 			</plugin>
+			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
@@ -118,6 +122,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
 	</build>
 </project>
diff --git a/juneau-microservice/juneau-microservice-jetty-template/my-microservice.cfg b/juneau-microservice/juneau-microservice-jetty-template/my-microservice.cfg
index 11c1440..c81d135 100755
--- a/juneau-microservice/juneau-microservice-jetty-template/my-microservice.cfg
+++ b/juneau-microservice/juneau-microservice-jetty-template/my-microservice.cfg
@@ -34,7 +34,7 @@ resolveVars = true
 port = 10000,0,0,0
 
 # Optionally specify your servlets here:
-#servlets = org.apache.juneau.microservice.sample.RootResources
+#servlets = org.apache.juneau.microservice.jetty.template.RootResources
 
 #=======================================================================================================================
 # REST settings
@@ -42,16 +42,18 @@ port = 10000,0,0,0
 [REST]
 
 # URL mappings to static files in the working directory or classpath.
-staticFiles = htdocs:files/htdocs
+staticFiles = htdocs:htdocs
 
 # Stylesheet to use for HTML views.
+# Used by the BasicRestConfig interface that defines the following value:
+# 	stylesheet="$C{REST/theme,servlet:/htdocs/themes/devops.css}"
 theme = servlet:/htdocs/themes/devops.css
 
+# Various look-and-feel settings used in the BasicRestConfig interface.
 headerIcon = servlet:/htdocs/images/juneau.png
 headerLink = http://juneau.apache.org
 footerIcon = servlet:/htdocs/images/asf.png
 footerLink = http://www.apache.org
-
 favicon = $C{REST/headerIcon}
 header = 
 	<a href='$U{$C{REST/headerLink}}'>
@@ -78,8 +80,7 @@ commands =
 	org.apache.juneau.microservice.console.ExitCommand,
 	org.apache.juneau.microservice.console.RestartCommand,
 	org.apache.juneau.microservice.console.HelpCommand,
-	org.apache.juneau.microservice.console.ConfigCommand,
-    org.apache.juneau.examples.rest.command.EchoCommand
+	org.apache.juneau.microservice.console.ConfigCommand
 	
 #=======================================================================================================================
 # Logger settings
@@ -158,7 +159,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.jetty.JettyLogger
+org.eclipse.jetty.util.log.class = org.apache.juneau.microservice.jetty.template.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 7b01dd6..4f5ed8d 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/my-microservice.launch
+++ b/juneau-microservice/juneau-microservice-jetty-template/my-microservice.launch
@@ -1,11 +1,17 @@
 <?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"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
 <booleanAttribute key="org.eclipse.jdt.debug.ui.CONSIDER_INHERITED_MAIN" value="true"/>
 <booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
 <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.sample.App"/>
+<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.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/App.java b/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/App.java
similarity index 94%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/App.java
rename to juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/App.java
index 062a7e0..616f5e4 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/App.java
+++ b/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/App.java
@@ -10,9 +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.sample;
+package org.apache.juneau.microservice.jetty.template;
 
-import org.apache.juneau.microservice.jetty.*;
+import org.apache.juneau.microservice.jetty.JettyMicroservice;
 
 /**
  * Entry-point for your microservice.
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java b/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/HelloWorldResource.java
similarity index 95%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java
rename to juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/HelloWorldResource.java
index ac41bfe..aa8354f 100755
--- a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java
+++ b/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/HelloWorldResource.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.sample;
+package org.apache.juneau.microservice.jetty.template;
 
 import static org.apache.juneau.http.HttpMethodName.*;
 
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java b/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/RootResources.java
similarity index 91%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java
rename to juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/RootResources.java
index 9de1714..87e1d3a 100755
--- a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java
+++ b/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/RootResources.java
@@ -10,8 +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.sample;
+package org.apache.juneau.microservice.jetty.template;
 
+import org.apache.juneau.microservice.jetty.resources.DebugResource;
 import org.apache.juneau.microservice.resources.ConfigResource;
 import org.apache.juneau.microservice.resources.LogsResource;
 import org.apache.juneau.rest.*;
@@ -39,7 +40,8 @@ import org.apache.juneau.rest.widget.ThemeMenuItem;
 	children={
 		HelloWorldResource.class,
 		ConfigResource.class,
-		LogsResource.class
+		LogsResource.class,
+		DebugResource.class
 	}
 )
 public class RootResources extends BasicRestServletGroup {
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/nls/Messages.properties b/juneau-microservice/juneau-microservice-jetty-template/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/sample/nls/Messages.properties
rename to juneau-microservice/juneau-microservice-jetty-template/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/sample/package-info.java b/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/package-info.java
similarity index 95%
copy from juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/package-info.java
copy to juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/package-info.java
index c9eff9b..f13fe26 100755
--- a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/package-info.java
+++ b/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/jetty/template/package-info.java
@@ -14,5 +14,5 @@
 /**
  * Microservice Samples
  */
-package org.apache.juneau.microservice.sample;
+package org.apache.juneau.microservice.jetty.template;
 
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/images/asf.png b/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/images/asf.png
similarity index 100%
rename from juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/images/asf.png
rename to juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/images/asf.png
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/images/juneau.png b/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/images/juneau.png
similarity index 100%
rename from juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/images/juneau.png
rename to juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/images/juneau.png
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/styles/SwaggerUI.css b/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/styles/SwaggerUI.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/styles/SwaggerUI.css
rename to juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/styles/SwaggerUI.css
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/themes/dark.css b/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/dark.css
similarity index 100%
rename from juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/themes/dark.css
rename to juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/dark.css
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/themes/devops.css b/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/devops.css
similarity index 100%
rename from juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/themes/devops.css
rename to juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/devops.css
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/themes/light.css b/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/light.css
similarity index 100%
rename from juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/themes/light.css
rename to juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/light.css
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/themes/original.css b/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/htdocs/themes/original.css
similarity index 100%
rename from juneau-examples/juneau-examples-rest-springboot/src/main/resources/files/htdocs/themes/original.css
rename to juneau-microservice/juneau-microservice-jetty-template/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-microservice-jetty-template/src/main/resources/jetty.xml
index d1ffc81..aed7599 100644
--- a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/jetty.xml
+++ b/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/jetty.xml
@@ -34,7 +34,7 @@
 		<Set name="contextPath">/</Set>
 		<!-- Optionally specify your servlets here -->
 		<!--Call name="addServlet">
-            <Arg>org.apache.juneau.microservice.sample.RootResources</Arg>
+            <Arg>org.apache.juneau.microservice.jetty.template.RootResources</Arg>
             <Arg>/*</Arg>
          </Call-->
 		<Set name="sessionHandler">
diff --git a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/.project b/juneau-microservice/juneau-microservice-springboot-template/build-overlay/.project
index e940a4f..3cff83a 100755
--- a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/.project
+++ b/juneau-microservice/juneau-microservice-springboot-template/build-overlay/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>my-microservice</name>
+	<name>my-springboot-microservice</name>
 	<comment></comment>
 	<projects>
 	</projects>
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 721de3c..48f0632 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.sample.App"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="my-microservice"/>
+<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="my-microservice-springboot"/>
 <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/build-overlay/pom.xml b/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
index 95e0cfa..7c55169 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
+++ b/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
@@ -20,7 +20,7 @@
 	to run the microservice from the command line. 
 	
 	Copy the jar as well as the my-microservice.cfg and jetty.xml file and start it with: 
-		java -jar my-microservice-1.0.jar
+		java -jar my-springboot-microservice-1.0.jar
 		
 	The group/artifact/version information is meant to be overwritten by developers to match their own needs.
 -->
@@ -29,7 +29,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>my-microservices</groupId>
-	<artifactId>my-microservice</artifactId>
+	<artifactId>my-springboot-microservice</artifactId>
 	<version>${project.version}</version>
 	<name>Juneau REST start project using Spring Boot</name>
 
@@ -95,20 +95,6 @@
 		<plugins>
 
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<executions>
@@ -127,24 +113,20 @@
 					</execution>
 				</executions>
 			</plugin>
+		
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>org.apache.juneau.microservice.sample.App
+							<mainClass>org.apache.juneau.microservice.springboot.template.App
 							</mainClass>
 						</manifest>
 					</archive>
 				</configuration>
 			</plugin>
+		
 		</plugins>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
 	</build>
 </project>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch b/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch
index d069147..f549d7f 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch
+++ b/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch
@@ -1,11 +1,17 @@
 <?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"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
 <booleanAttribute key="org.eclipse.jdt.debug.ui.CONSIDER_INHERITED_MAIN" value="true"/>
 <booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
 <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.sample.App"/>
+<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.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>
diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/App.java b/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/App.java
similarity index 97%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/App.java
rename to juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/App.java
index e9ff11d..9d644e0 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/App.java
+++ b/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/App.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.sample;
+package org.apache.juneau.microservice.springboot.template;
 
 import org.apache.juneau.rest.springboot.*;
 import org.apache.juneau.rest.springboot.annotation.*;
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java b/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
similarity index 95%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java
rename to juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
index ac41bfe..412d2cf 100755
--- a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java
+++ b/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.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.sample;
+package org.apache.juneau.microservice.springboot.template;
 
 import static org.apache.juneau.http.HttpMethodName.*;
 
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java b/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
similarity index 95%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java
rename to juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
index 9de1714..60ea414 100755
--- a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java
+++ b/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.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.sample;
+package org.apache.juneau.microservice.springboot.template;
 
 import org.apache.juneau.microservice.resources.ConfigResource;
 import org.apache.juneau.microservice.resources.LogsResource;
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/nls/Messages.properties b/juneau-microservice/juneau-microservice-springboot-template/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/sample/nls/Messages.properties
rename to juneau-microservice/juneau-microservice-springboot-template/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/sample/package-info.java b/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/package-info.java
similarity index 95%
rename from juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/package-info.java
rename to juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/package-info.java
index c9eff9b..e8fc69c 100755
--- a/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/package-info.java
+++ b/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/springboot/template/package-info.java
@@ -14,5 +14,5 @@
 /**
  * Microservice Samples
  */
-package org.apache.juneau.microservice.sample;
+package org.apache.juneau.microservice.springboot.template;
 
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/package-info.java b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/application.properties
old mode 100755
new mode 100644
similarity index 90%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/package-info.java
rename to juneau-microservice/juneau-microservice-springboot-template/src/main/resources/application.properties
index c9eff9b..4c5ab3e
--- a/juneau-microservice/juneau-microservice-jetty-template/src/main/java/org/apache/juneau/microservice/sample/package-info.java
+++ b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/application.properties
@@ -1,18 +1,16 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-
-/**
- * Microservice Samples
- */
-package org.apache.juneau.microservice.sample;
-
+// ***************************************************************************************************************************
+// * 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.                                              *
+// ****************************************************************************************************************************
+
+logging.level.org.springframework=INFO
+spring.profiles.active=production
+server.port=${PORT:5000}
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/images/asf.png b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/images/asf.png
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/images/asf.png
rename to juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/images/asf.png
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/images/juneau.png b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/images/juneau.png
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/images/juneau.png
rename to juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/images/juneau.png
diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/styles/SwaggerUI.css b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/styles/SwaggerUI.css
similarity index 100%
rename from juneau-microservice/juneau-microservice-jetty-template/src/main/resources/files/htdocs/styles/SwaggerUI.css
rename to juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/styles/SwaggerUI.css
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/themes/dark.css b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/dark.css
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/themes/dark.css
rename to juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/dark.css
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/themes/devops.css b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/devops.css
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/themes/devops.css
rename to juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/devops.css
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/themes/light.css b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/light.css
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/themes/light.css
rename to juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/light.css
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/themes/original.css b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/htdocs/themes/original.css
similarity index 100%
rename from juneau-examples/juneau-examples-rest-jetty/src/main/resources/files/htdocs/themes/original.css
rename to juneau-microservice/juneau-microservice-springboot-template/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-microservice-springboot-template/src/main/resources/juneau.cfg
index 21c69ad..852fb94 100755
--- a/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/juneau.cfg
+++ b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/juneau.cfg
@@ -16,16 +16,26 @@
 #=======================================================================================================================
 [REST]
 
-staticFiles = htdocs:files/htdocs
+# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @RestResource-annotated
+# classes.  These are static files that are served up by the servlet under the specified sub-paths.
+# For example, given the following setting...
+# 	staticFiles = htdocs:my-docs,styles/my-styles
+# ...the URI "/servletPath/htdocs/javadoc.css" resolves to the path "/my-docs/javadoc.css".
+# This path can be relative to the working directory, classpath root, or package of your resource class.
+# Used by the BasicRestConfig interface that defines the following value:
+# 	staticFiles="$C{REST/staticFiles}"
+staticFiles = htdocs:htdocs
 
 # Stylesheet to use for HTML views.
+# Used by the BasicRestConfig interface that defines the following value:
+# 	stylesheet="$C{REST/theme,servlet:/htdocs/themes/devops.css}"
 theme = servlet:/htdocs/themes/devops.css
 
+# Various look-and-feel settings used in the BasicRestConfig interface.
 headerIcon = servlet:/htdocs/images/juneau.png
 headerLink = http://juneau.apache.org
 footerIcon = servlet:/htdocs/images/asf.png
 footerLink = http://www.apache.org
-
 favicon = $C{REST/headerIcon}
 header = 
 	<a href='$U{$C{REST/headerLink}}'>
diff --git a/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/JuneauRestInitializer.java b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/JuneauRestInitializer.java
index 2709401..0cd392e 100644
--- a/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/JuneauRestInitializer.java
+++ b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/JuneauRestInitializer.java
@@ -12,6 +12,7 @@
 // ***************************************************************************************************************************
 package org.apache.juneau.rest.springboot;
 
+import static java.lang.System.*;
 import org.apache.juneau.rest.springboot.annotation.*;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -37,6 +38,9 @@ public class JuneauRestInitializer implements ApplicationContextInitializer<Conf
 
 	@Override /* ApplicationContextInitializer */
 	public void initialize(ConfigurableApplicationContext ctx) {
+		String port = ctx.getEnvironment().getProperty("server.port");
+		if (port != null && getProperty("juneau.serverPort") == null)
+			setProperty("juneau.serverPort", port);
 		ctx.addBeanFactoryPostProcessor(new JuneauRestPostProcessor(ctx, appClass));
 	}
 }
\ No newline at end of file


Mime
View raw message