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 1cfe93a Javadocs.
1cfe93a is described below
commit 1cfe93a0fce7f370203126dc468fa60abe011918
Author: JamesBognar <[email protected]>
AuthorDate: Tue Dec 11 18:42:36 2018 -0500
Javadocs.
---
.../13.juneau-microservice-jetty-template.html | 18 +-
.../{02.GettingStarted => }/01.Installing.html | 2 +-
.../01.Introduction.html | 41 --
.../{02.GettingStarted => }/02.Running.html | 0
.../{02.GettingStarted => }/03.Building.html | 0
...croservice-jetty-template.ResourceClasses.1.png | Bin 42699 -> 0 bytes
...croservice-jetty-template.UiCustomization.1.png | Bin 56726 -> 0 bytes
...4.juneau-microservice-springboot-template.html} | 16 +-
.../01.Installing.html | 130 +++++++
.../02.Running.html | 21 +-
.../03.Building.html | 17 +-
...croservice-springboot-template.Installing.1.png | Bin 0 -> 156973 bytes
...croservice-springboot-template.Installing.2.png | Bin 0 -> 103957 bytes
...-microservice-springboot-template.Running.1.png | Bin 0 -> 67578 bytes
...ples-core.html => 15.juneau-examples-core.html} | 0
.../01.Examples.html | 0
.../doc-files/juneau-examples-core.1.png | Bin
.../doc-files/juneau-examples-core.2.png | Bin
.../doc-files/juneau-examples-core.3.png | Bin
...ples-rest.html => 16.juneau-examples-rest.html} | 0
.../01.RootResources.html | 0
.../02.HelloWorldResource.html | 0
.../03.PetStoreResource.html | 0
.../04.DtoExamples.html | 0
.../05.ConfigResource.html | 0
.../06.LogsResource.html | 0
.../doc-files/juneau-examples-rest.1.png | Bin
.../doc-files/juneau-examples-rest.2.png | Bin
.../doc-files/juneau-examples-rest.3.png | Bin
.../doc-files/juneau-examples-rest.4.png | Bin
.../juneau-examples-rest.AtomFeedResource.1.png | Bin
.../juneau-examples-rest.AtomFeedResource.2.png | Bin
.../juneau-examples-rest.AtomFeedResource.3.png | Bin
.../juneau-examples-rest.ConfigResource.1.png | Bin
.../juneau-examples-rest.ConfigResource.2.png | Bin
...neau-examples-rest.DockerRegistryResource.1.png | Bin
.../juneau-examples-rest.HelloWorldResource.1.png | Bin
.../juneau-examples-rest.HelloWorldResource.2.png | Bin
.../juneau-examples-rest.JsonSchemaResource.1.png | Bin
.../juneau-examples-rest.JsonSchemaResource.2.png | Bin
.../juneau-examples-rest.LogsResource.1.png | Bin
...uneau-examples-rest.MethodExampleResource.1.png | Bin
...uneau-examples-rest.MethodExampleResource.2.png | Bin
...uneau-examples-rest.MethodExampleResource.3.png | Bin
.../juneau-examples-rest.PetStoreResource.1.png | Bin
.../juneau-examples-rest.PetStoreResource.10a.png | Bin
.../juneau-examples-rest.PetStoreResource.10b.png | Bin
.../juneau-examples-rest.PetStoreResource.10c.png | Bin
.../juneau-examples-rest.PetStoreResource.11a.png | Bin
.../juneau-examples-rest.PetStoreResource.11b.png | Bin
.../juneau-examples-rest.PetStoreResource.2a.png | Bin
.../juneau-examples-rest.PetStoreResource.2b.png | Bin
.../juneau-examples-rest.PetStoreResource.2c.png | Bin
.../juneau-examples-rest.PetStoreResource.2d.png | Bin
.../juneau-examples-rest.PetStoreResource.3a.png | Bin
.../juneau-examples-rest.PetStoreResource.3b.png | Bin
.../juneau-examples-rest.PetStoreResource.4a.png | Bin
.../juneau-examples-rest.PetStoreResource.4b.png | Bin
.../juneau-examples-rest.PetStoreResource.5a.png | Bin
.../juneau-examples-rest.PetStoreResource.5b.png | Bin
.../juneau-examples-rest.PetStoreResource.6a.png | Bin
.../juneau-examples-rest.PetStoreResource.6b.png | Bin
.../juneau-examples-rest.PetStoreResource.7a.png | Bin
.../juneau-examples-rest.PetStoreResource.7b.png | Bin
.../juneau-examples-rest.PetStoreResource.8a.png | Bin
.../juneau-examples-rest.PetStoreResource.9a.png | Bin
.../juneau-examples-rest.PetStoreResource.9b.png | Bin
.../juneau-examples-rest.PetStoreResource.9c.png | Bin
.../juneau-examples-rest.PetStoreResource.9d.png | Bin
.../juneau-examples-rest.PetStoreResource.9e.png | Bin
.../juneau-examples-rest.PetStoreResource.9f.png | Bin
.../juneau-examples-rest.PetStoreResource.9g.png | Bin
.../juneau-examples-rest.PetStoreResource.9h.png | Bin
.../juneau-examples-rest.PhotosResource.1.png | Bin
.../juneau-examples-rest.PhotosResource.2.png | Bin
.../juneau-examples-rest.RequestEchoResource.1.png | Bin
.../juneau-examples-rest.RootResources.1.png | Bin
.../juneau-examples-rest.SqlQueryResource.1.png | Bin
.../juneau-examples-rest.SqlQueryResource.2.png | Bin
...au-examples-rest.SystemPropertiesResource.1.png | Bin
...au-examples-rest.SystemPropertiesResource.2.png | Bin
...au-examples-rest.SystemPropertiesResource.3.png | Bin
.../juneau-examples-rest.TempDirResource.1.png | Bin
.../juneau-examples-rest.TempDirResource.2.png | Bin
.../juneau-examples-rest.TempDirResource.3.png | Bin
...juneau-examples-rest.TumblrParserResource.1.png | Bin
...neau-examples-rest.UrlEncodedFormResource.1.png | Bin
...neau-examples-rest.UrlEncodedFormResource.2.png | Bin
...tty.html => 17.juneau-examples-rest-jetty.html} | 12 +-
.../01.Classes.html | 0
.../02.DeployingToHeroku.html | 0
.../juneau-examples-rest-springboot.Classes.png | Bin
...tml => 18.juneau-examples-rest-springboot.html} | 2 +-
.../01.Classes.html | 0
.../02.DeployingToHeroku.html | 0
.../juneau-examples-rest-springboot.Classes.png | Bin
.../Topics/{18.Security.html => 19.Security.html} | 0
.../01.juneau-marshall.html | 0
.../02.juneau-svl.html | 0
.../03.juneau-rest-server.html | 0
...croservice-jetty-template.ResourceClasses.1.png | Bin 42699 -> 0 bytes
...croservice-jetty-template.UiCustomization.1.png | Bin 56726 -> 0 bytes
...croservice-springboot-template.Installing.1.png | Bin 0 -> 156973 bytes
...croservice-springboot-template.Installing.2.png | Bin 0 -> 103957 bytes
...-microservice-springboot-template.Running.1.png | Bin 0 -> 67578 bytes
juneau-doc/src/main/javadoc/overview.html | 413 ++++++++++++++-------
juneau-doc/src/main/javadoc/resources/docs.txt | 12 +-
.../src/main/javadoc/resources/fragments/toc.html | 16 +-
.../build-overlay/pom.xml | 10 +-
.../.classpath | 3 +-
.../build-overlay/my-microservice.launch | 3 +-
.../build-overlay/pom.xml | 12 +-
.../files/jetty.xml | 76 ----
.../my-microservice.cfg | 168 ---------
.../my-microservice.launch | 11 +-
.../pom.xml | 7 +-
.../org/apache/juneau/microservice/sample/App.java | 48 +++
.../main/resources}/files/htdocs/images/asf.png | Bin
.../main/resources}/files/htdocs/images/juneau.png | Bin
.../resources}/files/htdocs/styles/SwaggerUI.css | 0
.../main/resources}/files/htdocs/themes/dark.css | 0
.../main/resources}/files/htdocs/themes/devops.css | 0
.../main/resources}/files/htdocs/themes/light.css | 0
.../resources}/files/htdocs/themes/original.css | 0
.../src/main/resources/juneau.cfg | 37 ++
125 files changed, 570 insertions(+), 505 deletions(-)
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template.html
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template.html
index 5035644..9f0e03d 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template.html
+++ b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template.html
@@ -15,16 +15,7 @@
{new} juneau-microservice-jetty-template
-<h5 class='figure'>Maven Dependency</h5>
-<p class='bpcode w500'>
- <xt><dependency></xt>
-
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
-
<xt><artifactId></xt>juneau-microservice-jetty-template<xt></artifactId></xt>
- <xt><version></xt>{@property
juneauVersion}<xt></version></xt>
- <xt></dependency></xt>
-</p>
-
-<h5 class='figure'>Microservice Starter Project</h5>
+<h5 class='figure'>Starter Project Zip</h5>
<p class='bpcode w500'>
my-microservice-jetty-{@property juneauVersion}.zip
</p>
@@ -33,3 +24,10 @@
The <l>my-microservice-jetty.zip</l> file is a predefined starter
Eclipse project for developing
REST microservices using the {@doc juneau-microservice-jetty} package.
</p>
+<p>
+ It includes a combination of the Juneau Core, Server, and Client APIs
and all libraries needed to execute in a Java 1.8+ environment.
+</p>
+<p>
+ One significant difference is that we are not using the Juneau {@link
oaj.microservice.Microservice} API for our
+ application but instead using the existing Spring Boot API.
+</p>
\ No newline at end of file
diff --git
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/01.Installing.html
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/01.Installing.html
similarity index 99%
rename from
juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/01.Installing.html
rename to
juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/01.Installing.html
index 40b6611..d944dee 100644
---
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/01.Installing.html
+++
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/01.Installing.html
@@ -20,7 +20,7 @@
</p>
<ol class='spaced-list'>
<li>
- Download the latest <l>my-jetty-microservice.zip</l> file.
+ Download the latest <l>my-microservice-jetty.zip</l> file.
<li>
In your Eclipse workspace, go to <b>File -> Import ->
General -> Existing Projects into Workspace</b>
and select the zip file and click <b>Finish</b>.
diff --git
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/01.Introduction.html
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/01.Introduction.html
deleted file mode 100644
index 86c161e..0000000
---
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/01.Introduction.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * 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.
-
***************************************************************************************************************************/
- -->
-
-{updated} Microservice Introduction
-
-<p>
- The Microservice API consists of a combination of the Juneau Core,
Server, and Client APIs and an embedded
- Eclipse Jetty Servlet Container.
- <br>It includes all libraries needed to execute in a Java 1.8+
environment.
-</p>
-<p>
- Features include:
-</p>
-<ul class='spaced-list'>
- <li>
- An out-of-the-box zipped Eclipse project to get started quickly.
- <li>
- Buildable as a simple executable jar and configuration file.
- <li>
- All the power of the Juneau ecosystem for defining REST
servlets and clients with the ability to
- serialize and parse POJOs as HTML, JSON, XML, RDF,
URL-Encoding, and others.
- <li>
- An extensible API that allows you to hook into various
lifecycle events.
- <li>
- Simple-to-use APIs for accessing manifest file entries,
command-line arguments, and external configuration
- file properties.
- <li>
- Predefined REST resources for configuring microservice and
accessing log files.
-</ul>
diff --git
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/02.Running.html
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.Running.html
similarity index 100%
copy from
juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/02.Running.html
copy to
juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.Running.html
diff --git
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/03.Building.html
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/03.Building.html
similarity index 100%
copy from
juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/03.Building.html
copy to
juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/03.Building.html
diff --git
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.ResourceClasses.1.png
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.ResourceClasses.1.png
deleted file mode 100644
index 91f7275..0000000
Binary files
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.ResourceClasses.1.png
and /dev/null differ
diff --git
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.UiCustomization.1.png
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.UiCustomization.1.png
deleted file mode 100644
index 490cf48..0000000
Binary files
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/doc-files/juneau-microservice-jetty-template.UiCustomization.1.png
and /dev/null differ
diff --git
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted.html
b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template.html
similarity index 67%
rename from
juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted.html
rename to juneau-doc/docs/Topics/14.juneau-microservice-springboot-template.html
index eb3ea78..bca3b84 100644
---
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted.html
+++ b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template.html
@@ -13,9 +13,17 @@
***************************************************************************************************************************/
-->
-{updated} Getting Started
+{new} juneau-microservice-springboot-template
-<p>
- The <l>my-microservice-jetty.zip</l> file is a zipped eclipse project
that includes everything you
- need to create a REST microservice in an Eclipse workspace.
+<h5 class='figure'>Starter Project Zip</h5>
+<p class='bpcode w500'>
+ my-microservice-springboot-{@property juneauVersion}.zip
</p>
+
+<p>
+ The <l>my-microservice-springboot.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>
+ It includes a combination of the Juneau Core, Server, and Client APIs
and all libraries needed to execute in a Java 1.8+ environment.
+</p>
diff --git
a/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/01.Installing.html
b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/01.Installing.html
new file mode 100644
index 0000000..7ab67b3
--- /dev/null
+++
b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/01.Installing.html
@@ -0,0 +1,130 @@
+<!--
+/***************************************************************************************************************************
+ * 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.
+
***************************************************************************************************************************/
+ -->
+
+{todo} Installing in Eclipse
+
+<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.
+ <li>
+ In your Eclipse workspace, go to <b>File -> Import ->
General -> 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'>
+ <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'>
+</ol>
+<p>
+ The important elements in this project are:
+</p>
+<ul class='spaced-list'>
+ <li>
+ <l>App.java</l> - The entry point.
+ <br>This class creates and starts our microservice.
+ <br>Note that we're using the existing Spring Boot application
logic for the microservice.
+ <br><br>
+ <p class='bcode w800'>
+ <ja>@SpringBootApplication</ja>
+ <ja>@Controller</ja>
+ <jk>public class</jk> App {
+
+ <jk>public static void</jk> main(String[] args) {
+ <jk>new</jk>
SpringApplicationBuilder(App.<jk>class</jk>)
+ .initializers(<jk>new</jk>
JuneauRestInitializer(App.<jk>class</jk>))
+ .run(args);
+ }
+
+ <ja>@Bean @JuneauRest</ja>
+ <jk>public</jk> RootResources getRootResources() {
+ <jk>return new</jk> RootResources();
+ }
+ }
+ </p>
+ <li>
+ <l>RootResources.java</l> - The top-level REST resource.
+ <br>This class routes HTTP requests to child resources.
+ <br>This is identical to the Jetty example.
+ <br><br>
+ <p class='bcode w800'>
+ <ja>@RestResource</ja>(
+ path=<js>"/"</js>,
+ title=<js>"My Microservice"</js>,
+ description=<js>"Top-level resources page"</js>,
+ htmldoc=<ja>@HtmlDoc</ja>(
+ widgets={
+ ContentTypeMenuItem.<jk>class</jk>,
+ StyleMenuItem.<jk>class</jk>
+ },
+ navlinks={
+ <js>"options: servlet:/?method=OPTIONS"</js>
+ }
+ ),
+ children={
+ HelloWorldResource.<jk>class</jk>,
+ ConfigResource.<jk>class</jk>,
+ LogsResource.<jk>class</jk>
+ }
+ )
+ <jk>public class</jk> RootResources <jk>extends</jk>
BasicRestServletJenaGroup {
+ <jc>// No code</jc>
+ }
+ </p>
+ <li>
+ <l>my-microservice.cfg</l> - The external configuration file.
+ <br>Contains various useful settings.
+ <br>Can be used for your own resource configurations.
+ <br>Note that the Jetty configuration is not present.
+ <br><br>
+ <p class='bcode w800'>
+
<cc>#=======================================================================================================================
+ # Basic configuration file for REST microservices
+ # Subprojects can use this as a starting point.
+
#=======================================================================================================================</cc>
+
+
<cc>#=======================================================================================================================
+ # REST settings
+
#=======================================================================================================================</cc>
+ <cs>[REST]</cs>
+
+ <cc># URL mappings to static files in the working directory or
classpath.</cc>
+ <ck>staticFiles</ck> = htdocs:files/htdocs
+
+ <cc># Stylesheet to use for HTML views.</cc>
+ <ck>theme</ck> = <cv>servlet:/htdocs/themes/devops.css</cv>
+
+ <ck>headerIcon</ck> = <cv>servlet:/htdocs/images/juneau.png</cv>
+ <ck>headerLink</ck> = <cv>http://juneau.apache.org</cv>
+ <ck>footerIcon</ck> = <cv>servlet:/htdocs/images/asf.png</cv>
+ <ck>footerLink</ck> = <cv>http://www.apache.org</cv>
+
+ <ck>favicon</ck> = <cv>$C{REST/headerIcon}</cv>
+ <ck>header</ck> =
+ <cv><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></cv>
+ <ck>footer</ck> =
+ <cv><a href='$U{$C{REST/footerLink}}'>
+ <img src='$U{$C{REST/footerIcon}}'
style='float:right;padding-right:20px;height:32px'/>
+ </a></cv>
+ </p>
+</ul>
+<p>
+ At this point, you're ready to start the microservice from your
workspace.
+</p>
diff --git
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/02.Running.html
b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/02.Running.html
similarity index 72%
rename from
juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/02.Running.html
rename to
juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/02.Running.html
index 9a28e76..246437f 100644
---
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/02.Running.html
+++
b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/02.Running.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{updated} Running in Eclipse
+{todo} Running in Eclipse
<p>
The <l>my-microservice.launch</l> file is already provided to allow you
to quickly start
@@ -24,25 +24,16 @@
<br>In your console view, you should see the following output:
</p>
<p class='bpcode w800'>
- Running class 'RestMicroservice' using config file
'my-microservice.cfg'.
- Server started on port 10000
-
- List of available commands:
- exit -- Shut down service
- restart -- Restarts service
- help -- Commands help
-
- >
+ TODO
</p>
<p>
- Now open your browser and point to <l>http://localhost:10000</l>.
+ Now open your browser and point to <l>http://localhost:5000</l>.
You should see the following:
</p>
<p class='bpcode w400'>
- http://localhost:10000
+ http://localhost:5000
</p>
-<img class='bordered w400'
src='doc-files/juneau-microservice-jetty-template.Running.1.png'>
+<img class='bordered w400'
src='doc-files/juneau-microservice-springboot-template.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.
+ You have started a REST interface on port 5000.
</p>
diff --git
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/03.Building.html
b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/03.Building.html
similarity index 76%
rename from
juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/03.Building.html
rename to
juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/03.Building.html
index 9da50fa..675b46e 100644
---
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty-template/02.GettingStarted/03.Building.html
+++
b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/03.Building.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{updated} Building and Running from Command-Line
+{todo} Building and Running from Command-Line
<p>
The <l>pom.xml</l> file is a basic Maven build script for creating your
microservice
@@ -30,7 +30,6 @@
</p>
<ul>
<li><code>my-microservice-1.0.jar</code>
- <li><code>my-microservice.cfg</code>
</ul>
<p>
To start from a command line, run the following command from inside
your <code>target</code> directory:
@@ -42,17 +41,5 @@
You should see the following console output:
</p>
<p class='bpcode w800'>
- Running class 'RestMicroservice' using config file
'my-microservice.cfg'.
- Server started on port 10000
-
- List of available commands:
- exit -- Shut down service
- restart -- Restarts service
- help -- Commands help
-
- >
-</p>
-<p>
- 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.
+ TODO
</p>
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-microservice-springboot-template/doc-files/juneau-microservice-springboot-template.Installing.1.png
new file mode 100755
index 0000000..4ea5cec
Binary files /dev/null and
b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/doc-files/juneau-microservice-springboot-template.Installing.1.png
differ
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
new file mode 100644
index 0000000..6e81fa5
Binary files /dev/null and
b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/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-microservice-springboot-template/doc-files/juneau-microservice-springboot-template.Running.1.png
new file mode 100644
index 0000000..9d75bda
Binary files /dev/null and
b/juneau-doc/docs/Topics/14.juneau-microservice-springboot-template/doc-files/juneau-microservice-springboot-template.Running.1.png
differ
diff --git a/juneau-doc/docs/Topics/14.juneau-examples-core.html
b/juneau-doc/docs/Topics/15.juneau-examples-core.html
similarity index 100%
rename from juneau-doc/docs/Topics/14.juneau-examples-core.html
rename to juneau-doc/docs/Topics/15.juneau-examples-core.html
diff --git a/juneau-doc/docs/Topics/14.juneau-examples-core/01.Examples.html
b/juneau-doc/docs/Topics/15.juneau-examples-core/01.Examples.html
similarity index 100%
rename from juneau-doc/docs/Topics/14.juneau-examples-core/01.Examples.html
rename to juneau-doc/docs/Topics/15.juneau-examples-core/01.Examples.html
diff --git
a/juneau-doc/docs/Topics/14.juneau-examples-core/doc-files/juneau-examples-core.1.png
b/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/14.juneau-examples-core/doc-files/juneau-examples-core.1.png
rename to
juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.1.png
diff --git
a/juneau-doc/docs/Topics/14.juneau-examples-core/doc-files/juneau-examples-core.2.png
b/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/14.juneau-examples-core/doc-files/juneau-examples-core.2.png
rename to
juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.2.png
diff --git
a/juneau-doc/docs/Topics/14.juneau-examples-core/doc-files/juneau-examples-core.3.png
b/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.3.png
similarity index 100%
rename from
juneau-doc/docs/Topics/14.juneau-examples-core/doc-files/juneau-examples-core.3.png
rename to
juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.3.png
diff --git a/juneau-doc/docs/Topics/15.juneau-examples-rest.html
b/juneau-doc/docs/Topics/16.juneau-examples-rest.html
similarity index 100%
rename from juneau-doc/docs/Topics/15.juneau-examples-rest.html
rename to juneau-doc/docs/Topics/16.juneau-examples-rest.html
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/01.RootResources.html
b/juneau-doc/docs/Topics/16.juneau-examples-rest/01.RootResources.html
similarity index 100%
rename from juneau-doc/docs/Topics/15.juneau-examples-rest/01.RootResources.html
rename to juneau-doc/docs/Topics/16.juneau-examples-rest/01.RootResources.html
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/02.HelloWorldResource.html
b/juneau-doc/docs/Topics/16.juneau-examples-rest/02.HelloWorldResource.html
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/02.HelloWorldResource.html
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/02.HelloWorldResource.html
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/03.PetStoreResource.html
b/juneau-doc/docs/Topics/16.juneau-examples-rest/03.PetStoreResource.html
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/03.PetStoreResource.html
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/03.PetStoreResource.html
diff --git a/juneau-doc/docs/Topics/15.juneau-examples-rest/04.DtoExamples.html
b/juneau-doc/docs/Topics/16.juneau-examples-rest/04.DtoExamples.html
similarity index 100%
rename from juneau-doc/docs/Topics/15.juneau-examples-rest/04.DtoExamples.html
rename to juneau-doc/docs/Topics/16.juneau-examples-rest/04.DtoExamples.html
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/05.ConfigResource.html
b/juneau-doc/docs/Topics/16.juneau-examples-rest/05.ConfigResource.html
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/05.ConfigResource.html
rename to juneau-doc/docs/Topics/16.juneau-examples-rest/05.ConfigResource.html
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/06.LogsResource.html
b/juneau-doc/docs/Topics/16.juneau-examples-rest/06.LogsResource.html
similarity index 100%
rename from juneau-doc/docs/Topics/15.juneau-examples-rest/06.LogsResource.html
rename to juneau-doc/docs/Topics/16.juneau-examples-rest/06.LogsResource.html
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.2.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.2.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.2.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.3.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.3.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.3.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.3.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.4.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.4.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.4.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.4.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.2.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.2.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.2.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.3.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.3.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.3.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.3.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.2.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.2.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.2.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.DockerRegistryResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.DockerRegistryResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.DockerRegistryResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.DockerRegistryResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.2.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.2.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.2.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.2.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.2.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.2.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.LogsResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.LogsResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.LogsResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.LogsResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.2.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.2.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.2.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.3.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.3.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.3.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.3.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10a.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10a.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10a.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10a.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10b.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10b.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10b.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10b.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10c.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10c.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10c.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10c.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11a.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11a.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11a.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11a.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11b.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11b.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11b.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11b.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2a.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2a.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2a.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2a.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2b.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2b.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2b.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2b.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2c.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2c.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2c.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2c.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2d.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2d.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2d.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2d.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3a.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3a.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3a.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3a.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3b.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3b.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3b.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3b.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4a.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4a.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4a.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4a.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4b.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4b.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4b.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4b.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5a.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5a.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5a.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5a.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5b.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5b.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5b.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5b.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6a.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6a.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6a.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6a.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6b.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6b.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6b.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6b.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7a.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7a.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7a.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7a.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7b.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7b.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7b.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7b.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.8a.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.8a.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.8a.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.8a.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9a.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9a.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9a.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9a.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9b.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9b.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9b.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9b.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9c.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9c.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9c.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9c.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9d.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9d.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9d.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9d.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9e.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9e.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9e.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9e.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9f.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9f.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9f.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9f.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9g.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9g.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9g.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9g.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9h.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9h.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9h.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9h.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.2.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.2.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.2.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.RequestEchoResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.RequestEchoResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.RequestEchoResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.RequestEchoResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.2.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.2.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.2.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.2.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.2.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.2.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.3.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.3.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.3.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.3.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.2.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.2.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.2.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.3.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.3.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.3.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.3.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.TumblrParserResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.TumblrParserResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.TumblrParserResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.TumblrParserResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.1.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.1.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.1.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.1.png
diff --git
a/juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.2.png
b/juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.2.png
similarity index 100%
rename from
juneau-doc/docs/Topics/15.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.2.png
rename to
juneau-doc/docs/Topics/16.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.2.png
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-rest-jetty.html
b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty.html
similarity index 85%
rename from juneau-doc/docs/Topics/16.juneau-examples-rest-jetty.html
rename to juneau-doc/docs/Topics/17.juneau-examples-rest-jetty.html
index c22a110..090a94d 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-rest-jetty.html
+++ b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty.html
@@ -15,19 +15,15 @@
{todo} juneau-examples-rest-jetty
-<h5 class='figure'>Archive File</h5>
+<h5 class='figure'>Starter Project Zip</h5>
<p class='bpcode w500'>
- juneau-examples-rest-{@property juneauVersion}.zip
+ juneau-examples-rest-jetty-{@property juneauVersion}.zip
</p>
<p>
- The <code>juneau-examples-rest</code> project includes everything you
need to start the Samples REST
- microservice in an Eclipse workspace.
+ The <code>juneau-examples-rest-jetty</code> project includes everything
you need create a Samples REST
+ microservice in an Eclipse workspace and build it as an executable jar.
</p>
-<p>
- This project is packaged as a Juneau Microservice project that allows
REST resources to be started
- using embedded Jetty.
-</p>
<h5 class='topic'>juneau-examples-rest install instructions</h5>
<p>
diff --git
a/juneau-doc/docs/Topics/16.juneau-examples-rest-jetty/01.Classes.html
b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/01.Classes.html
similarity index 100%
rename from juneau-doc/docs/Topics/16.juneau-examples-rest-jetty/01.Classes.html
rename to juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/01.Classes.html
diff --git
a/juneau-doc/docs/Topics/17.juneau-examples-rest-springboot/02.DeployingToHeroku.html
b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/02.DeployingToHeroku.html
similarity index 100%
rename from
juneau-doc/docs/Topics/17.juneau-examples-rest-springboot/02.DeployingToHeroku.html
rename to
juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/02.DeployingToHeroku.html
diff --git
a/juneau-doc/docs/Topics/17.juneau-examples-rest-springboot/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
similarity index 100%
rename from
juneau-doc/docs/Topics/17.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Classes.png
rename to
juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-springboot.Classes.png
diff --git a/juneau-doc/docs/Topics/17.juneau-examples-rest-springboot.html
b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot.html
similarity index 97%
rename from juneau-doc/docs/Topics/17.juneau-examples-rest-springboot.html
rename to juneau-doc/docs/Topics/18.juneau-examples-rest-springboot.html
index b9e32db..1c1f25d 100644
--- a/juneau-doc/docs/Topics/17.juneau-examples-rest-springboot.html
+++ b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot.html
@@ -15,7 +15,7 @@
{todo} juneau-examples-rest-springboot
-<h5 class='figure'>Archive File</h5>
+<h5 class='figure'>Starter Project Zip</h5>
<p class='bpcode w500'>
juneau-examples-rest-springboot-{@property juneauVersion}.zip
</p>
diff --git
a/juneau-doc/docs/Topics/17.juneau-examples-rest-springboot/01.Classes.html
b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Classes.html
similarity index 100%
rename from
juneau-doc/docs/Topics/17.juneau-examples-rest-springboot/01.Classes.html
rename to
juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Classes.html
diff --git
a/juneau-doc/docs/Topics/16.juneau-examples-rest-jetty/02.DeployingToHeroku.html
b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/02.DeployingToHeroku.html
similarity index 100%
rename from
juneau-doc/docs/Topics/16.juneau-examples-rest-jetty/02.DeployingToHeroku.html
rename to
juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/02.DeployingToHeroku.html
diff --git
a/juneau-doc/docs/Topics/16.juneau-examples-rest-jetty/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
similarity index 100%
rename from
juneau-doc/docs/Topics/16.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-springboot.Classes.png
rename to
juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Classes.png
diff --git a/juneau-doc/docs/Topics/18.Security.html
b/juneau-doc/docs/Topics/19.Security.html
similarity index 100%
rename from juneau-doc/docs/Topics/18.Security.html
rename to juneau-doc/docs/Topics/19.Security.html
diff --git a/juneau-doc/docs/Topics/18.Security/01.juneau-marshall.html
b/juneau-doc/docs/Topics/19.Security/01.juneau-marshall.html
similarity index 100%
rename from juneau-doc/docs/Topics/18.Security/01.juneau-marshall.html
rename to juneau-doc/docs/Topics/19.Security/01.juneau-marshall.html
diff --git a/juneau-doc/docs/Topics/18.Security/02.juneau-svl.html
b/juneau-doc/docs/Topics/19.Security/02.juneau-svl.html
similarity index 100%
rename from juneau-doc/docs/Topics/18.Security/02.juneau-svl.html
rename to juneau-doc/docs/Topics/19.Security/02.juneau-svl.html
diff --git a/juneau-doc/docs/Topics/18.Security/03.juneau-rest-server.html
b/juneau-doc/docs/Topics/19.Security/03.juneau-rest-server.html
similarity index 100%
rename from juneau-doc/docs/Topics/18.Security/03.juneau-rest-server.html
rename to juneau-doc/docs/Topics/19.Security/03.juneau-rest-server.html
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-jetty-template.ResourceClasses.1.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-jetty-template.ResourceClasses.1.png
deleted file mode 100644
index 91f7275..0000000
Binary files
a/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-jetty-template.ResourceClasses.1.png
and /dev/null differ
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-jetty-template.UiCustomization.1.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-jetty-template.UiCustomization.1.png
deleted file mode 100644
index 490cf48..0000000
Binary files
a/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-jetty-template.UiCustomization.1.png
and /dev/null differ
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-springboot-template.Installing.1.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-springboot-template.Installing.1.png
new file mode 100755
index 0000000..4ea5cec
Binary files /dev/null and
b/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-springboot-template.Installing.1.png
differ
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-springboot-template.Installing.2.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-springboot-template.Installing.2.png
new file mode 100644
index 0000000..6e81fa5
Binary files /dev/null and
b/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-springboot-template.Installing.2.png
differ
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-springboot-template.Running.1.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-springboot-template.Running.1.png
new file mode 100644
index 0000000..9d75bda
Binary files /dev/null and
b/juneau-doc/src/main/javadoc/doc-files/juneau-microservice-springboot-template.Running.1.png
differ
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index 52fd5ff..f721cc4 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -419,13 +419,15 @@
</ol>
<li><p class='new'><a class='doclink'
href='#juneau-microservice-jetty-template'>juneau-microservice-jetty-template</a></p>
<ol>
- <li><p class='updated'><a class='doclink'
href='#juneau-microservice-jetty-template.Introduction'>Microservice
Introduction</a></p>
- <li><p class='updated'><a class='doclink'
href='#juneau-microservice-jetty-template.GettingStarted'>Getting
Started</a></p>
- <ol>
- <li><p class='updated'><a class='doclink'
href='#juneau-microservice-jetty-template.GettingStarted.Installing'>Installing
in Eclipse</a></p>
- <li><p class='updated'><a class='doclink'
href='#juneau-microservice-jetty-template.GettingStarted.Running'>Running in
Eclipse</a></p>
- <li><p class='updated'><a class='doclink'
href='#juneau-microservice-jetty-template.GettingStarted.Building'>Building and
Running from Command-Line</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>
+ </ol>
+ <li><p class='new'><a class='doclink'
href='#juneau-microservice-springboot-template'>juneau-microservice-springboot-template</a></p>
+ <ol>
+ <li><p class='todo'><a class='doclink'
href='#juneau-microservice-springboot-template.Installing'>Installing in
Eclipse</a></p>
+ <li><p class='todo'><a class='doclink'
href='#juneau-microservice-springboot-template.Running'>Running in
Eclipse</a></p>
+ <li><p class='todo'><a class='doclink'
href='#juneau-microservice-springboot-template.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,16 +25105,7 @@
<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 -->
-<h5 class='figure'>Maven Dependency</h5>
-<p class='bpcode w500'>
- <xt><dependency></xt>
-
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
-
<xt><artifactId></xt>juneau-microservice-jetty-template<xt></artifactId></xt>
- <xt><version></xt>{@property
juneauVersion}<xt></version></xt>
- <xt></dependency></xt>
-</p>
-
-<h5 class='figure'>Microservice Starter Project</h5>
+<h5 class='figure'>Starter Project Zip</h5>
<p class='bpcode w500'>
my-microservice-jetty-{@property juneauVersion}.zip
</p>
@@ -25121,56 +25114,24 @@
The <l>my-microservice-jetty.zip</l> file is a predefined starter
Eclipse project for developing
REST microservices using the {@doc juneau-microservice-jetty} package.
</p>
-
-<!--
====================================================================================================
-->
-
-<h3 class='topic updated' onclick='toggle(this)'><a
href='#juneau-microservice-jetty-template.Introduction'
id='juneau-microservice-jetty-template.Introduction'>13.1 - Microservice
Introduction</a></h3>
-<div class='topic'><!-- START: 13.1 -
juneau-microservice-jetty-template.Introduction -->
-<p>
- The Microservice API consists of a combination of the Juneau Core,
Server, and Client APIs and an embedded
- Eclipse Jetty Servlet Container.
- <br>It includes all libraries needed to execute in a Java 1.8+
environment.
-</p>
<p>
- Features include:
+ It includes a combination of the Juneau Core, Server, and Client APIs
and all libraries needed to execute in a Java 1.8+ environment.
</p>
-<ul class='spaced-list'>
- <li>
- An out-of-the-box zipped Eclipse project to get started quickly.
- <li>
- Buildable as a simple executable jar and configuration file.
- <li>
- All the power of the Juneau ecosystem for defining REST
servlets and clients with the ability to
- serialize and parse POJOs as HTML, JSON, XML, RDF,
URL-Encoding, and others.
- <li>
- An extensible API that allows you to hook into various
lifecycle events.
- <li>
- Simple-to-use APIs for accessing manifest file entries,
command-line arguments, and external configuration
- file properties.
- <li>
- Predefined REST resources for configuring microservice and
accessing log files.
-</ul>
-</div><!-- END: 13.1 - juneau-microservice-jetty-template.Introduction -->
-
-<!--
====================================================================================================
-->
-
-<h3 class='topic updated' onclick='toggle(this)'><a
href='#juneau-microservice-jetty-template.GettingStarted'
id='juneau-microservice-jetty-template.GettingStarted'>13.2 - Getting
Started</a></h3>
-<div class='topic'><!-- START: 13.2 -
juneau-microservice-jetty-template.GettingStarted -->
<p>
- The <l>my-microservice-jetty.zip</l> file is a zipped eclipse project
that includes everything you
- need to create a REST microservice in an Eclipse workspace.
+ One significant difference is that we are not using the Juneau {@link
org.apache.juneau.microservice.Microservice} API for our
+ application but instead using the existing Spring Boot API.
</p>
<!--
====================================================================================================
-->
-<h4 class='topic updated' onclick='toggle(this)'><a
href='#juneau-microservice-jetty-template.GettingStarted.Installing'
id='juneau-microservice-jetty-template.GettingStarted.Installing'>13.2.1 -
Installing in Eclipse</a></h4>
-<div class='topic'><!-- START: 13.2.1 -
juneau-microservice-jetty-template.GettingStarted.Installing -->
+<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 -->
<p>
Follow these instructions to create a new template project in Eclipse.
</p>
<ol class='spaced-list'>
<li>
- Download the latest <l>my-jetty-microservice.zip</l> file.
+ Download the latest <l>my-microservice-jetty.zip</l> file.
<li>
In your Eclipse workspace, go to <b>File -> Import ->
General -> Existing Projects into Workspace</b>
and select the zip file and click <b>Finish</b>.
@@ -25404,12 +25365,12 @@
<p>
At this point, you're ready to start the microservice from your
workspace.
</p>
-</div><!-- END: 13.2.1 -
juneau-microservice-jetty-template.GettingStarted.Installing -->
+</div><!-- END: 13.1 - juneau-microservice-jetty-template.Installing -->
<!--
====================================================================================================
-->
-<h4 class='topic updated' onclick='toggle(this)'><a
href='#juneau-microservice-jetty-template.GettingStarted.Running'
id='juneau-microservice-jetty-template.GettingStarted.Running'>13.2.2 - Running
in Eclipse</a></h4>
-<div class='topic'><!-- START: 13.2.2 -
juneau-microservice-jetty-template.GettingStarted.Running -->
+<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 -->
<p>
The <l>my-microservice.launch</l> file is already provided to allow you
to quickly start
your new microservice.
@@ -25441,12 +25402,12 @@
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.2 -
juneau-microservice-jetty-template.GettingStarted.Running -->
+</div><!-- END: 13.2 - juneau-microservice-jetty-template.Running -->
<!--
====================================================================================================
-->
-<h4 class='topic updated' onclick='toggle(this)'><a
href='#juneau-microservice-jetty-template.GettingStarted.Building'
id='juneau-microservice-jetty-template.GettingStarted.Building'>13.2.3 -
Building and Running from Command-Line</a></h4>
-<div class='topic'><!-- START: 13.2.3 -
juneau-microservice-jetty-template.GettingStarted.Building -->
+<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 -->
<p>
The <l>pom.xml</l> file is a basic Maven build script for creating your
microservice
as an executable uber-jar.
@@ -25488,14 +25449,212 @@
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.2.3 -
juneau-microservice-jetty-template.GettingStarted.Building -->
-</div><!-- END: 13.2 - juneau-microservice-jetty-template.GettingStarted -->
+</div><!-- END: 13.3 - juneau-microservice-jetty-template.Building -->
</div><!-- END: 13 - juneau-microservice-jetty-template -->
<!--
====================================================================================================
-->
-<h2 class='topic ' onclick='toggle(this)'><a href='#juneau-examples-core'
id='juneau-examples-core'>14 - juneau-examples-core</a></h2>
-<div class='topic'><!-- START: 14 - juneau-examples-core -->
+<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 -->
+<h5 class='figure'>Starter Project Zip</h5>
+<p class='bpcode w500'>
+ my-microservice-springboot-{@property juneauVersion}.zip
+</p>
+
+<p>
+ The <l>my-microservice-springboot.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>
+ It includes a combination of the Juneau Core, Server, and Client APIs
and all libraries needed to execute in a Java 1.8+ environment.
+</p>
+
+<!--
====================================================================================================
-->
+
+<h3 class='topic todo' 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 -->
+<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.
+ <li>
+ In your Eclipse workspace, go to <b>File -> Import ->
General -> 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'>
+ <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'>
+</ol>
+<p>
+ The important elements in this project are:
+</p>
+<ul class='spaced-list'>
+ <li>
+ <l>App.java</l> - The entry point.
+ <br>This class creates and starts our microservice.
+ <br>Note that we're using the existing Spring Boot application
logic for the microservice.
+ <br><br>
+ <p class='bcode w800'>
+ <ja>@SpringBootApplication</ja>
+ <ja>@Controller</ja>
+ <jk>public class</jk> App {
+
+ <jk>public static void</jk> main(String[] args) {
+ <jk>new</jk>
SpringApplicationBuilder(App.<jk>class</jk>)
+ .initializers(<jk>new</jk>
JuneauRestInitializer(App.<jk>class</jk>))
+ .run(args);
+ }
+
+ <ja>@Bean @JuneauRest</ja>
+ <jk>public</jk> RootResources getRootResources() {
+ <jk>return new</jk> RootResources();
+ }
+ }
+ </p>
+ <li>
+ <l>RootResources.java</l> - The top-level REST resource.
+ <br>This class routes HTTP requests to child resources.
+ <br>This is identical to the Jetty example.
+ <br><br>
+ <p class='bcode w800'>
+ <ja>@RestResource</ja>(
+ path=<js>"/"</js>,
+ title=<js>"My Microservice"</js>,
+ description=<js>"Top-level resources page"</js>,
+ htmldoc=<ja>@HtmlDoc</ja>(
+ widgets={
+ ContentTypeMenuItem.<jk>class</jk>,
+ StyleMenuItem.<jk>class</jk>
+ },
+ navlinks={
+ <js>"options: servlet:/?method=OPTIONS"</js>
+ }
+ ),
+ children={
+ HelloWorldResource.<jk>class</jk>,
+ ConfigResource.<jk>class</jk>,
+ LogsResource.<jk>class</jk>
+ }
+ )
+ <jk>public class</jk> RootResources <jk>extends</jk>
BasicRestServletJenaGroup {
+ <jc>// No code</jc>
+ }
+ </p>
+ <li>
+ <l>my-microservice.cfg</l> - The external configuration file.
+ <br>Contains various useful settings.
+ <br>Can be used for your own resource configurations.
+ <br>Note that the Jetty configuration is not present.
+ <br><br>
+ <p class='bcode w800'>
+
<cc>#=======================================================================================================================
+ # Basic configuration file for REST microservices
+ # Subprojects can use this as a starting point.
+
#=======================================================================================================================</cc>
+
+
<cc>#=======================================================================================================================
+ # REST settings
+
#=======================================================================================================================</cc>
+ <cs>[REST]</cs>
+
+ <cc># URL mappings to static files in the working directory or
classpath.</cc>
+ <ck>staticFiles</ck> = htdocs:files/htdocs
+
+ <cc># Stylesheet to use for HTML views.</cc>
+ <ck>theme</ck> = <cv>servlet:/htdocs/themes/devops.css</cv>
+
+ <ck>headerIcon</ck> = <cv>servlet:/htdocs/images/juneau.png</cv>
+ <ck>headerLink</ck> = <cv>http://juneau.apache.org</cv>
+ <ck>footerIcon</ck> = <cv>servlet:/htdocs/images/asf.png</cv>
+ <ck>footerLink</ck> = <cv>http://www.apache.org</cv>
+
+ <ck>favicon</ck> = <cv>$C{REST/headerIcon}</cv>
+ <ck>header</ck> =
+ <cv><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></cv>
+ <ck>footer</ck> =
+ <cv><a href='$U{$C{REST/footerLink}}'>
+ <img src='$U{$C{REST/footerIcon}}'
style='float:right;padding-right:20px;height:32px'/>
+ </a></cv>
+ </p>
+</ul>
+<p>
+ At this point, you're ready to start the microservice from your
workspace.
+</p>
+</div><!-- END: 14.1 - juneau-microservice-springboot-template.Installing -->
+
+<!--
====================================================================================================
-->
+
+<h3 class='topic todo' 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 -->
+<p>
+ The <l>my-microservice.launch</l> file is already provided to allow you
to quickly start
+ your new microservice.
+</p>
+<p>
+ Go to <b>Run -> Run Configurations -> Java Application ->
my-microservice</b> and click <b>Run</b>.
+ <br>In your console view, you should see the following output:
+</p>
+<p class='bpcode w800'>
+ TODO
+</p>
+<p>
+ Now open your browser and point to <l>http://localhost:5000</l>.
+ You should see the following:
+</p>
+<p class='bpcode w400'>
+ http://localhost:5000
+</p>
+<img class='bordered w400'
src='doc-files/juneau-microservice-springboot-template.Running.1.png'>
+<p>
+ You have started a REST interface on port 5000.
+</p>
+</div><!-- END: 14.2 - juneau-microservice-springboot-template.Running -->
+
+<!--
====================================================================================================
-->
+
+<h3 class='topic todo' 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 -->
+<p>
+ The <l>pom.xml</l> file is a basic Maven build script for creating your
microservice
+ as an executable uber-jar.
+</p>
+<p>
+ The easiest way to build your microservice is to run the following from
the project root.
+</p>
+<p class='bpcode w800'>
+ mvn clean install
+</p>
+<p>
+ Your <code>target</code> directory should now contain the following
files:
+</p>
+<ul>
+ <li><code>my-microservice-1.0.jar</code>
+</ul>
+<p>
+ To start from a command line, run the following command from inside
your <code>target</code> directory:
+</p>
+<p class='bpcode w800'>
+ java -jar my-microservice-1.0.jar
+</p>
+<p>
+ You should see the following console output:
+</p>
+<p class='bpcode w800'>
+ TODO
+</p>
+</div><!-- END: 14.3 - juneau-microservice-springboot-template.Building -->
+</div><!-- END: 14 - juneau-microservice-springboot-template -->
+
+<!--
====================================================================================================
-->
+
+<h2 class='topic ' onclick='toggle(this)'><a href='#juneau-examples-core'
id='juneau-examples-core'>15 - juneau-examples-core</a></h2>
+<div class='topic'><!-- START: 15 - juneau-examples-core -->
<h5 class='figure'>Archive File</h5>
<p class='bpcode w500'>
juneau-examples-core-{@property juneauVersion}.zip
@@ -25531,8 +25690,8 @@
<!--
====================================================================================================
-->
-<h3 class='topic new' onclick='toggle(this)'><a
href='#juneau-examples-core.Examples' id='juneau-examples-core.Examples'>14.1 -
Examples</a></h3>
-<div class='topic'><!-- START: 14.1 - juneau-examples-core.Examples -->
+<h3 class='topic new' onclick='toggle(this)'><a
href='#juneau-examples-core.Examples' id='juneau-examples-core.Examples'>15.1 -
Examples</a></h3>
+<div class='topic'><!-- START: 15.1 - juneau-examples-core.Examples -->
<p>
The following shows the core examples provided:
</p>
@@ -25559,13 +25718,13 @@
<li class='jc'>{@link
org.apache.juneau.examples.core.html.HtmlComplexExample} - HtmlSerializer usage
on serialize complex Pojo bean.
</ul>
</ul>
-</div><!-- END: 14.1 - juneau-examples-core.Examples -->
-</div><!-- END: 14 - juneau-examples-core -->
+</div><!-- END: 15.1 - juneau-examples-core.Examples -->
+</div><!-- END: 15 - juneau-examples-core -->
<!--
====================================================================================================
-->
-<h2 class='topic updated' onclick='toggle(this)'><a
href='#juneau-examples-rest' id='juneau-examples-rest'>15 -
juneau-examples-rest</a></h2>
-<div class='topic'><!-- START: 15 - juneau-examples-rest -->
+<h2 class='topic updated' onclick='toggle(this)'><a
href='#juneau-examples-rest' id='juneau-examples-rest'>16 -
juneau-examples-rest</a></h2>
+<div class='topic'><!-- START: 16 - juneau-examples-rest -->
<h5 class='figure'>Maven Dependency</h5>
<p class='bpcode w500'>
<xt><dependency></xt>
@@ -25600,8 +25759,8 @@
<!--
====================================================================================================
-->
-<h3 class='topic updated' onclick='toggle(this)'><a
href='#juneau-examples-rest.RootResources'
id='juneau-examples-rest.RootResources'>15.1 - RootResources</a></h3>
-<div class='topic'><!-- START: 15.1 - juneau-examples-rest.RootResources -->
+<h3 class='topic updated' onclick='toggle(this)'><a
href='#juneau-examples-rest.RootResources'
id='juneau-examples-rest.RootResources'>16.1 - RootResources</a></h3>
+<div class='topic'><!-- START: 16.1 - juneau-examples-rest.RootResources -->
<p>
The <l>RootResources</l> class is the main page for the REST
microservice.
It serves as the jumping-off point for the other resources.
@@ -25741,12 +25900,12 @@
The request passed to the child resource is the same as if the child
resource had been deployed
independently (e.g. path-info, resource-URI, and so forth).
</p>
-</div><!-- END: 15.1 - juneau-examples-rest.RootResources -->
+</div><!-- END: 16.1 - juneau-examples-rest.RootResources -->
<!--
====================================================================================================
-->
-<h3 class='topic updated' onclick='toggle(this)'><a
href='#juneau-examples-rest.HelloWorldResource'
id='juneau-examples-rest.HelloWorldResource'>15.2 - HelloWorldResource</a></h3>
-<div class='topic'><!-- START: 15.2 - juneau-examples-rest.HelloWorldResource
-->
+<h3 class='topic updated' onclick='toggle(this)'><a
href='#juneau-examples-rest.HelloWorldResource'
id='juneau-examples-rest.HelloWorldResource'>16.2 - HelloWorldResource</a></h3>
+<div class='topic'><!-- START: 16.2 - juneau-examples-rest.HelloWorldResource
-->
<p>
The <l>HelloWorldResource</l> class is a simple resource that prints a
"Hello world!" message.
</p>
@@ -25810,12 +25969,12 @@
http://localhost:10000/helloWorld?Accept=text/json&plainText=true
</p>
<img class='bordered w800'
src='doc-files/juneau-examples-rest.HelloWorldResource.2.png'>
-</div><!-- END: 15.2 - juneau-examples-rest.HelloWorldResource -->
+</div><!-- END: 16.2 - juneau-examples-rest.HelloWorldResource -->
<!--
====================================================================================================
-->
-<h3 class='topic new' onclick='toggle(this)'><a
href='#juneau-examples-rest.PetStoreResource'
id='juneau-examples-rest.PetStoreResource'>15.3 - PetStore</a></h3>
-<div class='topic'><!-- START: 15.3 - juneau-examples-rest.PetStoreResource -->
+<h3 class='topic new' onclick='toggle(this)'><a
href='#juneau-examples-rest.PetStoreResource'
id='juneau-examples-rest.PetStoreResource'>16.3 - PetStore</a></h3>
+<div class='topic'><!-- START: 16.3 - juneau-examples-rest.PetStoreResource -->
<p>
The <code>PetStore</code> application is an functional application
meant to demonstrate the following:
</p>
@@ -27178,12 +27337,12 @@
<p>
Note that we could have also used <ja>@FormData</ja> parameters as well.
</p>
-</div><!-- END: 15.3 - juneau-examples-rest.PetStoreResource -->
+</div><!-- END: 16.3 - juneau-examples-rest.PetStoreResource -->
<!--
====================================================================================================
-->
-<h3 class='topic new' onclick='toggle(this)'><a
href='#juneau-examples-rest.DtoExamples'
id='juneau-examples-rest.DtoExamples'>15.4 - DtoExamples</a></h3>
-<div class='topic'><!-- START: 15.4 - juneau-examples-rest.DtoExamples -->
+<h3 class='topic new' onclick='toggle(this)'><a
href='#juneau-examples-rest.DtoExamples'
id='juneau-examples-rest.DtoExamples'>16.4 - DtoExamples</a></h3>
+<div class='topic'><!-- START: 16.4 - juneau-examples-rest.DtoExamples -->
<p>
The <l>DtoExamples</l> resource is a resource group for demonstrating
various DTO examples.
</p>
@@ -27402,12 +27561,12 @@
}
}
</p>
-</div><!-- END: 15.4 - juneau-examples-rest.DtoExamples -->
+</div><!-- END: 16.4 - juneau-examples-rest.DtoExamples -->
<!--
====================================================================================================
-->
-<h3 class='topic ' onclick='toggle(this)'><a
href='#juneau-examples-rest.ConfigResource'
id='juneau-examples-rest.ConfigResource'>15.5 - ConfigResource</a></h3>
-<div class='topic'><!-- START: 15.5 - juneau-examples-rest.ConfigResource -->
+<h3 class='topic ' onclick='toggle(this)'><a
href='#juneau-examples-rest.ConfigResource'
id='juneau-examples-rest.ConfigResource'>16.5 - ConfigResource</a></h3>
+<div class='topic'><!-- START: 16.5 - juneau-examples-rest.ConfigResource -->
<p>
The {@link org.apache.juneau.microservice.resources.ConfigResource}
class is a predefined reusable resource.
<br>It provides a REST interface for reading and altering the
microservice config file.
@@ -27557,12 +27716,12 @@
}
}
</p>
-</div><!-- END: 15.5 - juneau-examples-rest.ConfigResource -->
+</div><!-- END: 16.5 - juneau-examples-rest.ConfigResource -->
<!--
====================================================================================================
-->
-<h3 class='topic ' onclick='toggle(this)'><a
href='#juneau-examples-rest.LogsResource'
id='juneau-examples-rest.LogsResource'>15.6 - LogsResource</a></h3>
-<div class='topic'><!-- START: 15.6 - juneau-examples-rest.LogsResource -->
+<h3 class='topic ' onclick='toggle(this)'><a
href='#juneau-examples-rest.LogsResource'
id='juneau-examples-rest.LogsResource'>16.6 - LogsResource</a></h3>
+<div class='topic'><!-- START: 16.6 - juneau-examples-rest.LogsResource -->
<p>
The {@link org.apache.juneau.microservice.resources.LogsResource} class
is a reusable predefined resource.
<br>It provides a REST interface for the log files generated by the
microservice.
@@ -27574,26 +27733,22 @@
http://localhost:10000/logs
</p>
<img class='bordered w800'
src='doc-files/juneau-examples-rest.LogsResource.1.png'>
-</div><!-- END: 15.6 - juneau-examples-rest.LogsResource -->
-</div><!-- END: 15 - juneau-examples-rest -->
+</div><!-- END: 16.6 - juneau-examples-rest.LogsResource -->
+</div><!-- END: 16 - juneau-examples-rest -->
<!--
====================================================================================================
-->
-<h2 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest-jetty' id='juneau-examples-rest-jetty'>16 -
juneau-examples-rest-jetty</a></h2>
-<div class='topic'><!-- START: 16 - juneau-examples-rest-jetty -->
-<h5 class='figure'>Archive File</h5>
+<h2 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest-jetty' id='juneau-examples-rest-jetty'>17 -
juneau-examples-rest-jetty</a></h2>
+<div class='topic'><!-- START: 17 - juneau-examples-rest-jetty -->
+<h5 class='figure'>Starter Project Zip</h5>
<p class='bpcode w500'>
- juneau-examples-rest-{@property juneauVersion}.zip
+ juneau-examples-rest-jetty-{@property juneauVersion}.zip
</p>
<p>
- The <code>juneau-examples-rest</code> project includes everything you
need to start the Samples REST
- microservice in an Eclipse workspace.
+ The <code>juneau-examples-rest-jetty</code> project includes everything
you need create a Samples REST
+ microservice in an Eclipse workspace and build it as an executable jar.
</p>
-<p>
- This project is packaged as a Juneau Microservice project that allows
REST resources to be started
- using embedded Jetty.
-</p>
<h5 class='topic'>juneau-examples-rest install instructions</h5>
<p>
@@ -27620,8 +27775,8 @@
<!--
====================================================================================================
-->
-<h3 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest-jetty.Classes'
id='juneau-examples-rest-jetty.Classes'>16.1 - Classes</a></h3>
-<div class='topic'><!-- START: 16.1 - juneau-examples-rest-jetty.Classes -->
+<h3 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest-jetty.Classes'
id='juneau-examples-rest-jetty.Classes'>17.1 - Classes</a></h3>
+<div class='topic'><!-- START: 17.1 - juneau-examples-rest-jetty.Classes -->
<p>
The <code>juneau-examples-rest-springboot</code> project contains the
same classes as found in <code>juneau-examples-rest</code>
with the inclusion of a
<code>org.apache.juneau.examples.rest.springboot</code> package containing the
following:
@@ -27660,23 +27815,23 @@
}
}
</p>
-</div><!-- END: 16.1 - juneau-examples-rest-jetty.Classes -->
+</div><!-- END: 17.1 - juneau-examples-rest-jetty.Classes -->
<!--
====================================================================================================
-->
-<h3 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest-jetty.DeployingToHeroku'
id='juneau-examples-rest-jetty.DeployingToHeroku'>16.2 - Deploying to
Heroku</a></h3>
-<div class='topic'><!-- START: 16.2 -
juneau-examples-rest-jetty.DeployingToHeroku -->
+<h3 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest-jetty.DeployingToHeroku'
id='juneau-examples-rest-jetty.DeployingToHeroku'>17.2 - Deploying to
Heroku</a></h3>
+<div class='topic'><!-- START: 17.2 -
juneau-examples-rest-jetty.DeployingToHeroku -->
<p>
TODO
</p>
-</div><!-- END: 16.2 - juneau-examples-rest-jetty.DeployingToHeroku -->
-</div><!-- END: 16 - juneau-examples-rest-jetty -->
+</div><!-- END: 17.2 - juneau-examples-rest-jetty.DeployingToHeroku -->
+</div><!-- END: 17 - juneau-examples-rest-jetty -->
<!--
====================================================================================================
-->
-<h2 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest-springboot' id='juneau-examples-rest-springboot'>17
- juneau-examples-rest-springboot</a></h2>
-<div class='topic'><!-- START: 17 - juneau-examples-rest-springboot -->
-<h5 class='figure'>Archive File</h5>
+<h2 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest-springboot' id='juneau-examples-rest-springboot'>18
- juneau-examples-rest-springboot</a></h2>
+<div class='topic'><!-- START: 18 - juneau-examples-rest-springboot -->
+<h5 class='figure'>Starter Project Zip</h5>
<p class='bpcode w500'>
juneau-examples-rest-springboot-{@property juneauVersion}.zip
</p>
@@ -27709,8 +27864,8 @@
<!--
====================================================================================================
-->
-<h3 class='topic new' onclick='toggle(this)'><a
href='#juneau-examples-rest-springboot.Classes'
id='juneau-examples-rest-springboot.Classes'>17.1 - Classes</a></h3>
-<div class='topic'><!-- START: 17.1 - juneau-examples-rest-springboot.Classes
-->
+<h3 class='topic new' onclick='toggle(this)'><a
href='#juneau-examples-rest-springboot.Classes'
id='juneau-examples-rest-springboot.Classes'>18.1 - Classes</a></h3>
+<div class='topic'><!-- START: 18.1 - juneau-examples-rest-springboot.Classes
-->
<p>
The <code>juneau-examples-rest-springboot</code> project contains the
same classes as found in <code>juneau-examples-rest</code>
with the inclusion of a
<code>org.apache.juneau.examples.rest.springboot</code> package containing the
following:
@@ -27749,22 +27904,22 @@
}
}
</p>
-</div><!-- END: 17.1 - juneau-examples-rest-springboot.Classes -->
+</div><!-- END: 18.1 - juneau-examples-rest-springboot.Classes -->
<!--
====================================================================================================
-->
-<h3 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest-springboot.DeployingToHeroku'
id='juneau-examples-rest-springboot.DeployingToHeroku'>17.2 - Deploying to
Heroku</a></h3>
-<div class='topic'><!-- START: 17.2 -
juneau-examples-rest-springboot.DeployingToHeroku -->
+<h3 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest-springboot.DeployingToHeroku'
id='juneau-examples-rest-springboot.DeployingToHeroku'>18.2 - Deploying to
Heroku</a></h3>
+<div class='topic'><!-- START: 18.2 -
juneau-examples-rest-springboot.DeployingToHeroku -->
<p>
TODO
</p>
-</div><!-- END: 17.2 - juneau-examples-rest-springboot.DeployingToHeroku -->
-</div><!-- END: 17 - juneau-examples-rest-springboot -->
+</div><!-- END: 18.2 - juneau-examples-rest-springboot.DeployingToHeroku -->
+</div><!-- END: 18 - juneau-examples-rest-springboot -->
<!--
====================================================================================================
-->
-<h2 class='topic ' onclick='toggle(this)'><a href='#Security' id='Security'>18
- Security Best-Practices</a></h2>
-<div class='topic'><!-- START: 18 - Security -->
+<h2 class='topic ' onclick='toggle(this)'><a href='#Security' id='Security'>19
- Security Best-Practices</a></h2>
+<div class='topic'><!-- START: 19 - Security -->
<p>
Security is always an ongoing concern in any library.
If you discover any security vulnerabilities in this code, please refer
to the instructions found here:
@@ -27775,8 +27930,8 @@
<!--
====================================================================================================
-->
-<h3 class='topic ' onclick='toggle(this)'><a href='#Security.juneau-marshall'
id='Security.juneau-marshall'>18.1 - juneau-marshall</a></h3>
-<div class='topic'><!-- START: 18.1 - Security.juneau-marshall -->
+<h3 class='topic ' onclick='toggle(this)'><a href='#Security.juneau-marshall'
id='Security.juneau-marshall'>19.1 - juneau-marshall</a></h3>
+<div class='topic'><!-- START: 19.1 - Security.juneau-marshall -->
<h5 class='topic'>Demarshalling vulnerabilities</h5>
<p>
One common security vulnerability is the ability to create arbitrary
Java object instances through crafted
@@ -27849,12 +28004,12 @@
<li>The RDF parsers rely on Apache Jena 2.7.1.
As of <code>7.0.1</code>, no known security vulnerabilities
exist that affect Juneau at this time.
</ul>
-</div><!-- END: 18.1 - Security.juneau-marshall -->
+</div><!-- END: 19.1 - Security.juneau-marshall -->
<!--
====================================================================================================
-->
-<h3 class='topic ' onclick='toggle(this)'><a href='#Security.juneau-svl'
id='Security.juneau-svl'>18.2 - juneau-svl</a></h3>
-<div class='topic'><!-- START: 18.2 - Security.juneau-svl -->
+<h3 class='topic ' onclick='toggle(this)'><a href='#Security.juneau-svl'
id='Security.juneau-svl'>19.2 - juneau-svl</a></h3>
+<div class='topic'><!-- START: 19.2 - Security.juneau-svl -->
<p>
Care must be used when defining new {@link org.apache.juneau.svl.Var
Vars} using the SVL API since mistakes
could potentially expose system properties, environment variables, or
even file system files.
@@ -27899,12 +28054,12 @@
{@link org.apache.juneau.svl.Var#allowNested()} and {@link
org.apache.juneau.svl.Var#allowRecurse()}
methods to prevent recursive handling of variables.
</p>
-</div><!-- END: 18.2 - Security.juneau-svl -->
+</div><!-- END: 19.2 - Security.juneau-svl -->
<!--
====================================================================================================
-->
-<h3 class='topic ' onclick='toggle(this)'><a
href='#Security.juneau-rest-server' id='Security.juneau-rest-server'>18.3 -
juneau-rest-server</a></h3>
-<div class='topic'><!-- START: 18.3 - Security.juneau-rest-server -->
+<h3 class='topic ' onclick='toggle(this)'><a
href='#Security.juneau-rest-server' id='Security.juneau-rest-server'>19.3 -
juneau-rest-server</a></h3>
+<div class='topic'><!-- START: 19.3 - Security.juneau-rest-server -->
<p>
Denial of service attacks can be alleviated through the {@link
org.apache.juneau.rest.annotation.RestResource#maxInput() maxInput()}
setting. Arbitrarily-large input will trigger an exception before
causing out-of-memory errors.
@@ -27916,8 +28071,8 @@
becomes an issue. However, this is NOT true of the RDF parsers that
use an intermediate DOM. If parsing
RDF, you may want to consider lowering the max-input value above.
</p>
-</div><!-- END: 18.3 - Security.juneau-rest-server -->
-</div><!-- END: 18 - Security -->
+</div><!-- END: 19.3 - Security.juneau-rest-server -->
+</div><!-- END: 19 - Security -->
<h2 class='topic' onclick='toggle(this)'><a href='#ReleaseNotes'
id='ReleaseNotes'>Release Notes</a></h2>
diff --git a/juneau-doc/src/main/javadoc/resources/docs.txt
b/juneau-doc/src/main/javadoc/resources/docs.txt
index 2f9ea12..4a2c99f 100644
--- a/juneau-doc/src/main/javadoc/resources/docs.txt
+++ b/juneau-doc/src/main/javadoc/resources/docs.txt
@@ -216,11 +216,9 @@ juneau-microservice-core.SystemProperties =
#juneau-microservice-core.SystemProp
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.GettingStarted =
#juneau-microservice-jetty-template.GettingStarted, Overview >
juneau-microservice-jetty-template > Getting Started
-juneau-microservice-jetty-template.GettingStarted.Building =
#juneau-microservice-jetty-template.GettingStarted.Building, Overview >
juneau-microservice-jetty-template > Getting Started > Building and Running
from Command-Line
-juneau-microservice-jetty-template.GettingStarted.Installing =
#juneau-microservice-jetty-template.GettingStarted.Installing, Overview >
juneau-microservice-jetty-template > Getting Started > Installing in Eclipse
-juneau-microservice-jetty-template.GettingStarted.Running =
#juneau-microservice-jetty-template.GettingStarted.Running, Overview >
juneau-microservice-jetty-template > Getting Started > Running in Eclipse
-juneau-microservice-jetty-template.Introduction =
#juneau-microservice-jetty-template.Introduction, Overview >
juneau-microservice-jetty-template > Microservice Introduction
+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-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
@@ -229,6 +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-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 0e841ef..7398437 100644
--- a/juneau-doc/src/main/javadoc/resources/fragments/toc.html
+++ b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
@@ -362,13 +362,15 @@
</ol>
<li><p class='new'><a class='doclink'
href='{OVERVIEW_URL}#juneau-microservice-jetty-template'>juneau-microservice-jetty-template</a></p>
<ol>
- <li><p class='updated'><a class='doclink'
href='{OVERVIEW_URL}#juneau-microservice-jetty-template.Introduction'>Microservice
Introduction</a></p>
- <li><p class='updated'><a class='doclink'
href='{OVERVIEW_URL}#juneau-microservice-jetty-template.GettingStarted'>Getting
Started</a></p>
- <ol>
- <li><p class='updated'><a class='doclink'
href='{OVERVIEW_URL}#juneau-microservice-jetty-template.GettingStarted.Installing'>Installing
in Eclipse</a></p>
- <li><p class='updated'><a class='doclink'
href='{OVERVIEW_URL}#juneau-microservice-jetty-template.GettingStarted.Running'>Running
in Eclipse</a></p>
- <li><p class='updated'><a class='doclink'
href='{OVERVIEW_URL}#juneau-microservice-jetty-template.GettingStarted.Building'>Building
and Running from Command-Line</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>
+ </ol>
+ <li><p class='new'><a class='doclink'
href='{OVERVIEW_URL}#juneau-microservice-springboot-template'>juneau-microservice-springboot-template</a></p>
+ <ol>
+ <li><p class='todo'><a class='doclink'
href='{OVERVIEW_URL}#juneau-microservice-springboot-template.Installing'>Installing
in Eclipse</a></p>
+ <li><p class='todo'><a class='doclink'
href='{OVERVIEW_URL}#juneau-microservice-springboot-template.Running'>Running
in Eclipse</a></p>
+ <li><p class='todo'><a class='doclink'
href='{OVERVIEW_URL}#juneau-microservice-springboot-template.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/build-overlay/pom.xml
b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
index d1cc3b9..57ae5e0 100644
---
a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
+++
b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml
@@ -28,11 +28,11 @@
<modelVersion>4.0.0</modelVersion>
- <groupId>my-microservice-group</groupId>
- <artifactId>my-microservice</artifactId>
- <version>1.0</version>
- <name>My microservice</name>
- <description>My microservice.</description>
+ <groupId>juneau-examples</groupId>
+ <artifactId>juneau-examples-rest-jetty</artifactId>
+ <version>${project.version}</version>
+ <name>Juneau REST Examples using Jetty</name>
+ <description>Juneau REST Examples using Jetty</description>
<properties>
<juneau.version>${project.version}</juneau.version>
diff --git
a/juneau-microservice/juneau-microservice-springboot-template/.classpath
b/juneau-microservice/juneau-microservice-springboot-template/.classpath
index 8906d38..d623f16 100755
--- a/juneau-microservice/juneau-microservice-springboot-template/.classpath
+++ b/juneau-microservice/juneau-microservice-springboot-template/.classpath
@@ -7,9 +7,8 @@
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/assembly"/>
- <classpathentry kind="src" output="target/test-classes"
path="src/test/java">
+ <classpathentry excluding="**" kind="src" output="target/classes"
path="src/main/resources">
<attributes>
- <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
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 a62b475..721de3c 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,8 +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.springboot.App"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="my-microservice.cfg"/>
+<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.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 7ae6c26..716977d 100644
---
a/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
+++
b/juneau-microservice/juneau-microservice-springboot-template/build-overlay/pom.xml
@@ -28,14 +28,14 @@
<modelVersion>4.0.0</modelVersion>
- <groupId>my-microservice-group</groupId>
- <artifactId>my-microservice</artifactId>
- <version>1.0</version>
- <name>My microservice</name>
- <description>My microservice.</description>
+ <groupId>juneau-examples</groupId>
+ <artifactId>juneau-examples-rest-springboot</artifactId>
+ <version>${project.version}</version>
+ <name>Juneau REST Examples using Spring Boot</name>
+ <description>Juneau REST Examples using Spring Boot</description>
<properties>
- <juneau.version>7.1.0-SNAPSHOT</juneau.version>
+ <juneau.version>${project.version}</juneau.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git
a/juneau-microservice/juneau-microservice-springboot-template/files/jetty.xml
b/juneau-microservice/juneau-microservice-springboot-template/files/jetty.xml
deleted file mode 100644
index 3fc3408..0000000
---
a/juneau-microservice/juneau-microservice-springboot-template/files/jetty.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN"
"http://www.eclipse.org/jetty/configure_9_3.dtd";>
-<!--
-
***************************************************************************************************************************
- * 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.
*
-
***************************************************************************************************************************
--->
-
-<Configure id="ExampleServer" class="org.eclipse.jetty.server.Server">
-
- <Set name="connectors">
- <Array type="org.eclipse.jetty.server.Connector">
- <Item>
- <New
class="org.eclipse.jetty.server.ServerConnector">
- <Arg>
- <Ref refid="ExampleServer" />
- </Arg>
- <Set
name="port">$S{availablePort,8080}</Set>
- </New>
- </Item>
- </Array>
- </Set>
-
- <New id="context"
class="org.eclipse.jetty.servlet.ServletContextHandler">
- <Set name="contextPath">/</Set>
- <Call name="addServlet">
-
<Arg>org.apache.juneau.microservice.sample.RootResources</Arg>
- <Arg>/*</Arg>
- </Call>
- <Set name="sessionHandler">
- <New
class="org.eclipse.jetty.server.session.SessionHandler" />
- </Set>
- </New>
-
- <Set name="handler">
- <New class="org.eclipse.jetty.server.handler.HandlerCollection">
- <Set name="handlers">
- <Array type="org.eclipse.jetty.server.Handler">
- <Item>
- <Ref refid="context" />
- </Item>
- <Item>
- <New
class="org.eclipse.jetty.server.handler.DefaultHandler" />
- </Item>
- </Array>
- </Set>
- </New>
- </Set>
-
- <Set name="requestLog">
- <New id="RequestLogImpl"
class="org.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename"><Property name="jetty.logs"
default="$C{Logging/logDir,logs}"/>/jetty-requests.log</Set>
- <Set name="filenameDateFormat">yyyy_MM_dd</Set>
- <Set name="LogTimeZone">GMT</Set>
- <Set name="retainDays">90</Set>
- <Set name="append">false</Set>
- <Set name="LogLatency">true</Set>
- </New>
- </Set>
-
- <Get name="ThreadPool">
- <Set name="minThreads" type="int">10</Set>
- <Set name="maxThreads" type="int">100</Set>
- <Set name="idleTimeout" type="int">60000</Set>
- <Set name="detailedDump">true</Set>
- </Get>
-</Configure>
diff --git
a/juneau-microservice/juneau-microservice-springboot-template/my-microservice.cfg
b/juneau-microservice/juneau-microservice-springboot-template/my-microservice.cfg
deleted file mode 100755
index 05c7638..0000000
---
a/juneau-microservice/juneau-microservice-springboot-template/my-microservice.cfg
+++ /dev/null
@@ -1,168 +0,0 @@
-#
***************************************************************************************************************************
-# * 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.
*
-#
***************************************************************************************************************************
-
-#=======================================================================================================================
-# Basic configuration file for REST microservices
-# Subprojects can use this as a starting point.
-#=======================================================================================================================
-
-# What to do when the config file is saved.
-# Possible values:
-# NOTHING - Don't do anything. (default)
-# RESTART_SERVER - Restart the Jetty server.
-# RESTART_SERVICE - Shutdown and exit with code '3'.
-saveConfigAction = RESTART_SERVER
-
-#=======================================================================================================================
-# Jetty settings
-#=======================================================================================================================
-[Jetty]
-
-# Path of the jetty.xml file used to configure the Jetty server.
-config = files/jetty.xml
-
-# Resolve Juneau variables in the jetty.xml file.
-resolveVars = true
-
-# Port to use for the jetty server.
-# You can specify multiple ports. The first available will be used. '0'
indicates to try a random port.
-# The resulting available port gets set as the system property "availablePort"
which can be referenced in the
-# jetty.xml file as "$S{availablePort}" (assuming resolveVars is enabled).
-port = 10000,0,0,0
-
-#=======================================================================================================================
-# REST settings
-#=======================================================================================================================
-[REST]
-
-staticFiles = htdocs:files/htdocs
-
-# Stylesheet to use for HTML views.
-theme = servlet:/htdocs/themes/devops.css
-
-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 src='$U{$C{REST/footerIcon}}'
style='float:right;padding-right:20px;height:32px'/>
- </a>
-
-#=======================================================================================================================
-# Console settings
-#=======================================================================================================================
-[Console]
-
-enabled = true
-
-# List of available console commands.
-# These are classes that implements ConsoleCommand that allow you to submit
commands to the microservice via
-# the console.
-# When listed here, the implementations must provide a no-arg constructor.
-# They can also be provided dynamically by overriding the
Microservice.createConsoleCommands() method.
-commands =
- org.apache.juneau.microservice.console.ExitCommand,
- org.apache.juneau.microservice.console.RestartCommand,
- org.apache.juneau.microservice.console.HelpCommand
-
-#=======================================================================================================================
-# Logger settings
-#-----------------------------------------------------------------------------------------------------------------------
-# See FileHandler Java class for details.
-#=======================================================================================================================
-[Logging]
-
-# The directory where to create the log file.
-# Default is "."
-logDir = logs
-
-# The name of the log file to create for the main logger.
-# The logDir and logFile make up the pattern that's passed to the FileHandler
-# constructor.
-# If value is not specified, then logging to a file will not be set up.
-logFile = microservice.%g.log
-
-# Whether to append to the existing log file or create a new one.
-append = false
-
-# The SimpleDateFormat format to use for dates.
-dateFormat = yyyy.MM.dd hh:mm:ss
-
-# The log message format.
-# The value can contain any of the following variables:
-# {date} - The date, formatted per dateFormat.
-# {class} - The class name.
-# {method} - The method name.
-# {logger} - The logger name.
-# {level} - The log level name.
-# {msg} - The log message.
-# {threadid} - The thread ID.
-# {exception} - The localized exception message.
-format = [{date} {level}] {msg}%n
-
-# The maximum log file size.
-# Suffixes available for numbers.
-# See Config.getInt(String,int) for details.
-limit = 1M
-
-# Max number of log files.
-count = 5
-
-# Default log levels.
-# Format is lax-JSON.
-# Keys are logger names.
-# Values are serialized Level POJOs (SEVERE, WARNING, INFO, CONFIG, FINE,
FINER, FINEST)
-levels =
- {
- '': 'WARNING',
- org.apache.juneau: 'WARNING',
- org.eclipse.jetty: 'WARNING'
- }
-
-# Only print unique stack traces once and then refer to them by a simple 8
character hash identifier.
-# Useful for preventing log files from filling up with duplicate stack traces.
-useStackTraceHashes = true
-
-# The default level for the console logger.
-# Values are serialized Level POJOs (SEVERE, WARNING, INFO, CONFIG, FINE,
FINER, FINEST)
-consoleLevel = WARNING
-
-# The default level for the file logger.
-# Values are serialized Level POJOs (SEVERE, WARNING, INFO, CONFIG, FINE,
FINER, FINEST)
-fileLevel = INFO
-
-#=======================================================================================================================
-# System properties
-#-----------------------------------------------------------------------------------------------------------------------
-# These are arbitrary system properties that are set during startup.
-#=======================================================================================================================
-[SystemProperties]
-
-# Configure Jetty for StdErrLog Logging
-# org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StrErrLog
-
-# Configure Jetty to log using java-util logging
-org.eclipse.jetty.util.log.class = org.apache.juneau.microservice.JettyLogger
-
-# Jetty logging level
-# Possible values: ALL, DEBUG, INFO, WARN, OFF
-org.eclipse.jetty.LEVEL = WARN
-
-derby.stream.error.file = $C{Logging/logDir}/derby-errors.log
diff --git
a/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch
b/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch
index 5c57739..d069147 100644
---
a/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch
+++
b/juneau-microservice/juneau-microservice-springboot-template/my-microservice.launch
@@ -1,18 +1,11 @@
<?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"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</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.springboot.App"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="my-microservice.cfg"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="juneau-microservice-jetty-template"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.apache.juneau.microservice.sample.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/pom.xml
b/juneau-microservice/juneau-microservice-springboot-template/pom.xml
index e828902..32e53eb 100644
--- a/juneau-microservice/juneau-microservice-springboot-template/pom.xml
+++ b/juneau-microservice/juneau-microservice-springboot-template/pom.xml
@@ -43,7 +43,12 @@
<dependencies>
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-microservice-server</artifactId>
+ <artifactId>juneau-examples-rest</artifactId>
+ <version>${juneau.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-server-springboot</artifactId>
<version>${juneau.version}</version>
</dependency>
</dependencies>
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/sample/App.java
new file mode 100644
index 0000000..2e0fe42
--- /dev/null
+++
b/juneau-microservice/juneau-microservice-springboot-template/src/main/java/org/apache/juneau/microservice/sample/App.java
@@ -0,0 +1,48 @@
+//
***************************************************************************************************************************
+// * 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. *
+//
***************************************************************************************************************************
+package org.apache.juneau.microservice.sample;
+
+import org.apache.juneau.examples.rest.RootResources;
+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.context.annotation.*;
+import org.springframework.stereotype.Controller;
+
+/**
+ * Entry point for Examples REST application when deployed as a Spring Boot
application.
+ */
+@SpringBootApplication
+@Controller
+public class App {
+
+ /**
+ * Entry point method.
+ *
+ * @param args Command-line arguments
+ */
+ public static void main(String[] args) {
+ new SpringApplicationBuilder(App.class)
+ .initializers(new JuneauRestInitializer(App.class))
+ .run(args);
+ }
+
+ /**
+ * @return Our root resource.
+ */
+ @Bean @JuneauRest
+ public RootResources getRootResources() {
+ return new RootResources();
+ }
+}
diff --git
a/juneau-microservice/juneau-microservice-springboot-template/files/htdocs/images/asf.png
b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/images/asf.png
similarity index 100%
rename from
juneau-microservice/juneau-microservice-springboot-template/files/htdocs/images/asf.png
rename to
juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/images/asf.png
diff --git
a/juneau-microservice/juneau-microservice-springboot-template/files/htdocs/images/juneau.png
b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/images/juneau.png
similarity index 100%
rename from
juneau-microservice/juneau-microservice-springboot-template/files/htdocs/images/juneau.png
rename to
juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/images/juneau.png
diff --git
a/juneau-microservice/juneau-microservice-springboot-template/files/htdocs/styles/SwaggerUI.css
b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/styles/SwaggerUI.css
similarity index 100%
rename from
juneau-microservice/juneau-microservice-springboot-template/files/htdocs/styles/SwaggerUI.css
rename to
juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/styles/SwaggerUI.css
diff --git
a/juneau-microservice/juneau-microservice-springboot-template/files/htdocs/themes/dark.css
b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/dark.css
similarity index 100%
rename from
juneau-microservice/juneau-microservice-springboot-template/files/htdocs/themes/dark.css
rename to
juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/dark.css
diff --git
a/juneau-microservice/juneau-microservice-springboot-template/files/htdocs/themes/devops.css
b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/devops.css
similarity index 100%
rename from
juneau-microservice/juneau-microservice-springboot-template/files/htdocs/themes/devops.css
rename to
juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/devops.css
diff --git
a/juneau-microservice/juneau-microservice-springboot-template/files/htdocs/themes/light.css
b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/light.css
similarity index 100%
rename from
juneau-microservice/juneau-microservice-springboot-template/files/htdocs/themes/light.css
rename to
juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/light.css
diff --git
a/juneau-microservice/juneau-microservice-springboot-template/files/htdocs/themes/original.css
b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/htdocs/themes/original.css
similarity index 100%
rename from
juneau-microservice/juneau-microservice-springboot-template/files/htdocs/themes/original.css
rename to
juneau-microservice/juneau-microservice-springboot-template/src/main/resources/files/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
new file mode 100755
index 0000000..0d72fc3
--- /dev/null
+++
b/juneau-microservice/juneau-microservice-springboot-template/src/main/resources/juneau.cfg
@@ -0,0 +1,37 @@
+#
***************************************************************************************************************************
+# * 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.
*
+#
***************************************************************************************************************************
+
+#=======================================================================================================================
+# REST settings
+#=======================================================================================================================
+[REST]
+
+staticFiles = htdocs:files/htdocs
+
+# Stylesheet to use for HTML views.
+theme = servlet:/htdocs/themes/devops.css
+
+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 src='$U{$C{REST/footerIcon}}'
style='float:right;padding-right:20px;height:32px'/>
+ </a>
\ No newline at end of file
