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 044d075c0 Javadocs
044d075c0 is described below
commit 044d075c068381fd5376870856e0a69adfb2ba0b
Author: JamesBognar <[email protected]>
AuthorDate: Mon Jul 4 17:13:51 2022 -0400
Javadocs
---
.../docs/Topics/01.Overview/01.o.Marshalling.html | 2 +-
.../02.jrs.AnnotatedClasses/04.jrs.Deployment.html | 2 +-
.../08.juneau-rest-server/04.jrs.HttpParts.html | 6 -
.../02.jrs.HttpPartAnnotations.html | 120 +++---
.../04.jrs.HttpParts/04.jrs.RequestBeans.html | 2 +-
.../04.jrs.HttpParts/05.jrs.ResponseBeans.html | 2 +-
.../06.jrs.HandlingFormPosts.html | 2 +-
.../15.jrs.Swagger/05.jrs.SwaggerParameters.html | 4 +-
.../01.jrss.Overview.html | 2 +-
.../09.jrc.Proxies/06.jrc.Header.html | 2 +-
.../docs/Topics/14.juneau-microservice-core.html | 6 +-
.../01.jmc.Overview.html | 2 +-
.../02.jmc.LifecycleMethods.html | 2 +-
.../14.juneau-microservice-core/03.jmc.Args.html | 2 +-
.../04.jmc.Manifest.html | 2 +-
.../14.juneau-microservice-core/05.jmc.Config.html | 4 +-
.../06.jmc.SystemProperties.html | 2 +-
.../07.jmc.VarResolver.html | 2 +-
.../08.jmc.ConsoleCommands.html | 2 +-
.../09.jmc.Listeners.html | 2 +-
.../docs/Topics/15.juneau-microservice-jetty.html | 6 +-
.../01.jmj.Overview.html | 2 +-
.../02.jmj.LifecycleMethods.html | 2 +-
.../03.jmj.ResourceClasses.html | 2 +-
.../04.jmj.PredefinedResourceClasses.html | 4 +-
.../05.jmj.Config.html | 4 +-
.../06.jmj.JettyXml.html | 2 +-
.../07.jmj.UiCustomization.html | 4 +-
.../08.jmj.Extending.html | 2 +-
.../docs/Topics/16.my-jetty-microservice.html | 7 +-
.../01.mjm.Installing.html | 2 +-
.../16.my-jetty-microservice/02.mjm.Running.html | 2 +-
.../16.my-jetty-microservice/03.mjm.Building.html | 2 +-
.../01.msm.Installing.html | 154 ++++----
juneau-doc/src/main/javadoc/overview.html | 432 ++++++++++-----------
.../src/main/javadoc/resources/juneau-code.css | 10 +-
.../src/main/javadoc/resources/juneau-doc.css | 6 +-
37 files changed, 385 insertions(+), 428 deletions(-)
diff --git a/juneau-doc/docs/Topics/01.Overview/01.o.Marshalling.html
b/juneau-doc/docs/Topics/01.Overview/01.o.Marshalling.html
index 95a61bd5e..7383c4db7 100644
--- a/juneau-doc/docs/Topics/01.Overview/01.o.Marshalling.html
+++ b/juneau-doc/docs/Topics/01.Overview/01.o.Marshalling.html
@@ -67,7 +67,7 @@
<p class='bjava'>
| <jc>// Parse a JSON object as a bean.</jc>
| String <jv>json</jv> = <js>"{\"name\":\"John
Smith\","\age\":21}"</js>;
- | Person <jv>person</jv> =
Json.<jsm>from</jsm>(<jv>json</jv>, Person.<jk>class</jk>);
+ | Person <jv>person</jv> =
Json.<jsm>to</jsm>(<jv>json</jv>, Person.<jk>class</jk>);
</p>
<p>
Marshalling support is provided for a wide variety of POJO
types including:
diff --git
a/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/04.jrs.Deployment.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/04.jrs.Deployment.html
index 78f5b59c2..16519d4c6 100644
---
a/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/04.jrs.Deployment.html
+++
b/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/04.jrs.Deployment.html
@@ -33,7 +33,7 @@
not necessary.</b>
The only requirement is that the class be annotated
with <ja>@Rest</ja> and have one of the following constructors
if they aren't already Spring Beans:
- <ul class='javatree'>
+ <ul class='javatreec'>
<li class='jm'><c><jk>public</jk> T()</c>
<li class='jm'><c><jk>public</jk>
T(RestContext.Builder)</c>
</ul>
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts.html
index 8661c46d9..2e041b8f3 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts.html
@@ -60,12 +60,6 @@
<li class='ja'>{@link
oaj.http.annotation.StatusCode}
</ul>
</li>
- <li>Sub-annotations:
- <ul class='javatreec'>
- <li class='ja'>{@link
oaj.http.annotation.Schema}
- <li class='ja'>{@link oaj.http.annotation.Items}
- </ul>
- </li>
</ul>
<p>
These annotation can be used on method parameters or on the
parameter types themselves, or a combination
diff --git
a/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/02.jrs.HttpPartAnnotations.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/02.jrs.HttpPartAnnotations.html
index 42cd8074d..f4a04140e 100644
---
a/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/02.jrs.HttpPartAnnotations.html
+++
b/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/02.jrs.HttpPartAnnotations.html
@@ -102,66 +102,66 @@
</li>
<li><b>Common schema annotation:</b>
<ul class='javatree'>
- <li class='ja'>{@link
oaj.http.annotation.Schema}
+ <li class='ja'>{@link oaj.annotation.Schema}
<ul class='javatreec'>
- <li class='jma'>{@link
oaj.http.annotation.Schema#_default() _default}
- <li class='jma'>{@link
oaj.http.annotation.Schema#_enum() _enum}
- <li class='jma'>{@link
oaj.http.annotation.Schema#$ref() $ref}
- <li class='jma'>{@link
oaj.http.annotation.Schema#additionalProperties() additionalProperties}
- <li class='jma'>{@link
oaj.http.annotation.Schema#aev() aev}
- <li class='jma'>{@link
oaj.http.annotation.Schema#allOf() allOf}
- <li class='jma'>{@link
oaj.http.annotation.Schema#allowEmptyValue() allowEmptyValue}
- <li class='jma'>{@link
oaj.http.annotation.Schema#cf() cf}
- <li class='jma'>{@link
oaj.http.annotation.Schema#collectionFormat() collectionFormat}
- <li class='jma'>{@link
oaj.http.annotation.Schema#d() d}
- <li class='jma'>{@link
oaj.http.annotation.Schema#description() description}
- <li class='jma'>{@link
oaj.http.annotation.Schema#df() df}
- <li class='jma'>{@link
oaj.http.annotation.Schema#discriminator() discriminator}
- <li class='jma'>{@link
oaj.http.annotation.Schema#e() e}
- <li class='jma'>{@link
oaj.http.annotation.Schema#emax() emax}
- <li class='jma'>{@link
oaj.http.annotation.Schema#emin() emin}
- <li class='jma'>{@link
oaj.http.annotation.Schema#exclusiveMaximum() exclusiveMaximum}
- <li class='jma'>{@link
oaj.http.annotation.Schema#exclusiveMinimum() exclusiveMinimum}
- <li class='jma'>{@link
oaj.http.annotation.Schema#externalDocs() externalDocs}
- <li class='jma'>{@link
oaj.http.annotation.Schema#f() f}
- <li class='jma'>{@link
oaj.http.annotation.Schema#format() format}
- <li class='jma'>{@link
oaj.http.annotation.Schema#ignore() ignore}
- <li class='jma'>{@link
oaj.http.annotation.Schema#items() items}
- <li class='jma'>{@link
oaj.http.annotation.Schema#max() max}
- <li class='jma'>{@link
oaj.http.annotation.Schema#maxi() maxi}
- <li class='jma'>{@link
oaj.http.annotation.Schema#maximum() maximum}
- <li class='jma'>{@link
oaj.http.annotation.Schema#maxItems() maxItems}
- <li class='jma'>{@link
oaj.http.annotation.Schema#maxl() maxl}
- <li class='jma'>{@link
oaj.http.annotation.Schema#maxLength() maxLength}
- <li class='jma'>{@link
oaj.http.annotation.Schema#maxp() maxp}
- <li class='jma'>{@link
oaj.http.annotation.Schema#maxProperties() maxProperties}
- <li class='jma'>{@link
oaj.http.annotation.Schema#min() min}
- <li class='jma'>{@link
oaj.http.annotation.Schema#mini() mini}
- <li class='jma'>{@link
oaj.http.annotation.Schema#minimum() minimum}
- <li class='jma'>{@link
oaj.http.annotation.Schema#minItems() minItems}
- <li class='jma'>{@link
oaj.http.annotation.Schema#minl() minl}
- <li class='jma'>{@link
oaj.http.annotation.Schema#minLength() minLength}
- <li class='jma'>{@link
oaj.http.annotation.Schema#minp() minp}
- <li class='jma'>{@link
oaj.http.annotation.Schema#minProperties() minProperties}
- <li class='jma'>{@link
oaj.http.annotation.Schema#mo() mo}
- <li class='jma'>{@link
oaj.http.annotation.Schema#multipleOf() multipleOf}
- <li class='jma'>{@link
oaj.http.annotation.Schema#on() on}
- <li class='jma'>{@link
oaj.http.annotation.Schema#onClass() onClass}
- <li class='jma'>{@link
oaj.http.annotation.Schema#p() p}
- <li class='jma'>{@link
oaj.http.annotation.Schema#pattern() pattern}
- <li class='jma'>{@link
oaj.http.annotation.Schema#properties() properties}
- <li class='jma'>{@link
oaj.http.annotation.Schema#r() r}
- <li class='jma'>{@link
oaj.http.annotation.Schema#readOnly() readOnly}
- <li class='jma'>{@link
oaj.http.annotation.Schema#required() required}
- <li class='jma'>{@link
oaj.http.annotation.Schema#ro() ro}
- <li class='jma'>{@link
oaj.http.annotation.Schema#sie() sie}
- <li class='jma'>{@link
oaj.http.annotation.Schema#skipIfEmpty() v}
- <li class='jma'>{@link
oaj.http.annotation.Schema#t() t}
- <li class='jma'>{@link
oaj.http.annotation.Schema#title() title}
- <li class='jma'>{@link
oaj.http.annotation.Schema#type() type}
- <li class='jma'>{@link
oaj.http.annotation.Schema#ui() ui}
- <li class='jma'>{@link
oaj.http.annotation.Schema#uniqueItems() uniqueItems}
- <li class='jma'>{@link
oaj.http.annotation.Schema#xml() xml}
+ <li class='jma'>{@link
oaj.annotation.Schema#_default() _default}
+ <li class='jma'>{@link
oaj.annotation.Schema#_enum() _enum}
+ <li class='jma'>{@link
oaj.annotation.Schema#$ref() $ref}
+ <li class='jma'>{@link
oaj.annotation.Schema#additionalProperties() additionalProperties}
+ <li class='jma'>{@link
oaj.annotation.Schema#aev() aev}
+ <li class='jma'>{@link
oaj.annotation.Schema#allOf() allOf}
+ <li class='jma'>{@link
oaj.annotation.Schema#allowEmptyValue() allowEmptyValue}
+ <li class='jma'>{@link
oaj.annotation.Schema#cf() cf}
+ <li class='jma'>{@link
oaj.annotation.Schema#collectionFormat() collectionFormat}
+ <li class='jma'>{@link
oaj.annotation.Schema#d() d}
+ <li class='jma'>{@link
oaj.annotation.Schema#description() description}
+ <li class='jma'>{@link
oaj.annotation.Schema#df() df}
+ <li class='jma'>{@link
oaj.annotation.Schema#discriminator() discriminator}
+ <li class='jma'>{@link
oaj.annotation.Schema#e() e}
+ <li class='jma'>{@link
oaj.annotation.Schema#emax() emax}
+ <li class='jma'>{@link
oaj.annotation.Schema#emin() emin}
+ <li class='jma'>{@link
oaj.annotation.Schema#exclusiveMaximum() exclusiveMaximum}
+ <li class='jma'>{@link
oaj.annotation.Schema#exclusiveMinimum() exclusiveMinimum}
+ <li class='jma'>{@link
oaj.annotation.Schema#externalDocs() externalDocs}
+ <li class='jma'>{@link
oaj.annotation.Schema#f() f}
+ <li class='jma'>{@link
oaj.annotation.Schema#format() format}
+ <li class='jma'>{@link
oaj.annotation.Schema#ignore() ignore}
+ <li class='jma'>{@link
oaj.annotation.Schema#items() items}
+ <li class='jma'>{@link
oaj.annotation.Schema#max() max}
+ <li class='jma'>{@link
oaj.annotation.Schema#maxi() maxi}
+ <li class='jma'>{@link
oaj.annotation.Schema#maximum() maximum}
+ <li class='jma'>{@link
oaj.annotation.Schema#maxItems() maxItems}
+ <li class='jma'>{@link
oaj.annotation.Schema#maxl() maxl}
+ <li class='jma'>{@link
oaj.annotation.Schema#maxLength() maxLength}
+ <li class='jma'>{@link
oaj.annotation.Schema#maxp() maxp}
+ <li class='jma'>{@link
oaj.annotation.Schema#maxProperties() maxProperties}
+ <li class='jma'>{@link
oaj.annotation.Schema#min() min}
+ <li class='jma'>{@link
oaj.annotation.Schema#mini() mini}
+ <li class='jma'>{@link
oaj.annotation.Schema#minimum() minimum}
+ <li class='jma'>{@link
oaj.annotation.Schema#minItems() minItems}
+ <li class='jma'>{@link
oaj.annotation.Schema#minl() minl}
+ <li class='jma'>{@link
oaj.annotation.Schema#minLength() minLength}
+ <li class='jma'>{@link
oaj.annotation.Schema#minp() minp}
+ <li class='jma'>{@link
oaj.annotation.Schema#minProperties() minProperties}
+ <li class='jma'>{@link
oaj.annotation.Schema#mo() mo}
+ <li class='jma'>{@link
oaj.annotation.Schema#multipleOf() multipleOf}
+ <li class='jma'>{@link
oaj.annotation.Schema#on() on}
+ <li class='jma'>{@link
oaj.annotation.Schema#onClass() onClass}
+ <li class='jma'>{@link
oaj.annotation.Schema#p() p}
+ <li class='jma'>{@link
oaj.annotation.Schema#pattern() pattern}
+ <li class='jma'>{@link
oaj.annotation.Schema#properties() properties}
+ <li class='jma'>{@link
oaj.annotation.Schema#r() r}
+ <li class='jma'>{@link
oaj.annotation.Schema#readOnly() readOnly}
+ <li class='jma'>{@link
oaj.annotation.Schema#required() required}
+ <li class='jma'>{@link
oaj.annotation.Schema#ro() ro}
+ <li class='jma'>{@link
oaj.annotation.Schema#sie() sie}
+ <li class='jma'>{@link
oaj.annotation.Schema#skipIfEmpty() v}
+ <li class='jma'>{@link
oaj.annotation.Schema#t() t}
+ <li class='jma'>{@link
oaj.annotation.Schema#title() title}
+ <li class='jma'>{@link
oaj.annotation.Schema#type() type}
+ <li class='jma'>{@link
oaj.annotation.Schema#ui() ui}
+ <li class='jma'>{@link
oaj.annotation.Schema#uniqueItems() uniqueItems}
+ <li class='jma'>{@link
oaj.annotation.Schema#xml() xml}
</ul>
</li>
</ul>
@@ -331,7 +331,7 @@
</p>
<p>
The default registered part marshallers, {@link
oaj.oapi.OpenApiSerializer} and {@link oaj.oapi.OpenApiParser}, are used to
- marshall POJOs using schemas defined via the {@link
oaj.http.annotation.Schema @Schema} annotation.
+ marshall POJOs using schemas defined via the {@link
oaj.annotation.Schema @Schema} annotation.
</p>
<p>
For example, the following shows how a pipe-delimited list of
comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to
a 2-dimensional array of <c>Longs</c>:
diff --git
a/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/04.jrs.RequestBeans.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/04.jrs.RequestBeans.html
index aed7be225..4228f2147 100644
---
a/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/04.jrs.RequestBeans.html
+++
b/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/04.jrs.RequestBeans.html
@@ -26,7 +26,7 @@
<li class='ja'>{@link oaj.http.annotation.FormData}
<li class='ja'>{@link oaj.http.annotation.Path}
<li class='ja'>{@link oaj.http.annotation.Content}
- <li class='ja'>{@link oaj.http.annotation.Schema}
+ <li class='ja'>{@link oaj.annotation.Schema}
</ul>
<h5 class='figure'>Example:</h5>
diff --git
a/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/05.jrs.ResponseBeans.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/05.jrs.ResponseBeans.html
index 207029138..0f5b885fd 100644
---
a/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/05.jrs.ResponseBeans.html
+++
b/juneau-doc/docs/Topics/08.juneau-rest-server/04.jrs.HttpParts/05.jrs.ResponseBeans.html
@@ -24,7 +24,7 @@
<li class='ja'>{@link oaj.http.annotation.StatusCode}
<li class='ja'>{@link oaj.http.annotation.Header}
<li class='ja'>{@link oaj.http.annotation.Content}
- <li class='ja'>{@link oaj.http.annotation.Schema}
+ <li class='ja'>{@link oaj.annotation.Schema}
</ul>
<p>
diff --git
a/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html
index 285d1e85d..89b21b66e 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html
@@ -78,7 +78,7 @@
If you want to be able to consume url-encoded form post bodies
as POJOs in Spring Boot, you'll need to
add the following Spring Bean to your configuration to prevent
Spring Boot from automatically
consuming the body itself:
- <p class='bjava'>
+ <p class='bjava' style='max-width:700px'>
| <ja>@SpringBootApplication</ja>
| <ja>@Controller</ja>
| <jk>public class</jk> SpringBootAppConfig {
diff --git
a/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/05.jrs.SwaggerParameters.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/05.jrs.SwaggerParameters.html
index 4dc222a0c..d028b437d 100644
---
a/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/05.jrs.SwaggerParameters.html
+++
b/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/05.jrs.SwaggerParameters.html
@@ -60,9 +60,9 @@
| }
</p>
<ul class='notes'>
- <li class='note'>The {@link oaj.http.annotation.Schema @Schema}
annotation can also be attached
+ <li class='note'>The {@link oaj.annotation.Schema @Schema}
annotation can also be attached
directly to the parameter or parameter type as well.
- <li class='note'>The {@link oaj.http.annotation.Schema#type()
type} and {@link oaj.http.annotation.Schema#collectionFormat()
collectionFormat} values above are optional and auto-detected based on the
+ <li class='note'>The {@link oaj.annotation.Schema#type() type}
and {@link oaj.annotation.Schema#collectionFormat() collectionFormat} values
above are optional and auto-detected based on the
parameter class type if omitted. They're included here
for clarity.
The examples will be explained in the next section.
</ul>
diff --git
a/juneau-doc/docs/Topics/11.juneau-rest-server-springboot/01.jrss.Overview.html
b/juneau-doc/docs/Topics/11.juneau-rest-server-springboot/01.jrss.Overview.html
index 62cde9e86..dfa69c487 100644
---
a/juneau-doc/docs/Topics/11.juneau-rest-server-springboot/01.jrss.Overview.html
+++
b/juneau-doc/docs/Topics/11.juneau-rest-server-springboot/01.jrss.Overview.html
@@ -110,7 +110,7 @@
| <js>" <p>Other features (such
as this aside) are added through annotations.</p>"</js>,
| <js>"</div>"</js>
| },
- | asideFloat="RIGHT"
+ | asideFloat=<js>"RIGHT"</js>
| )
| <ja>@SerializerConfig</ja>(
| quoteChar=<js>"'"</js>
diff --git
a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/06.jrc.Header.html
b/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/06.jrc.Header.html
index b163e78f9..9b8b871ad 100644
---
a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/06.jrc.Header.html
+++
b/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/06.jrc.Header.html
@@ -70,7 +70,7 @@
</p>
<ul class='spaced-list'>
<li>
- {@link oaj.http.HeaderList} - Serialized as individual
headers.
+ {@link oaj.http.header.HeaderList} - Serialized as
individual headers.
<li>
<c>Map</c> - Converted to key-value pairs.
<br>Values serialized using the registered
{@link oaj.httppart.HttpPartSerializer} ({@link oaj.oapi.OpenApiSerializer} by
default).
diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-core.html
b/juneau-doc/docs/Topics/14.juneau-microservice-core.html
index fef4453a6..40d495904 100644
--- a/juneau-doc/docs/Topics/14.juneau-microservice-core.html
+++ b/juneau-doc/docs/Topics/14.juneau-microservice-core.html
@@ -13,13 +13,9 @@
***************************************************************************************************************************/
-->
-{title:'juneau-microservice-core', created:'8.1.0', deprecated:'8.1.2'}
+{title:'juneau-microservice-core', created:'8.1.0'}
<div class='topic'>
- <div class='warn'>
- The Juneau Microservice libraries are likely to be removed in
Juneau 9.0 due to the popularity of the Spring Boot
- framework for creating microservices and the ability for Juneau
to be used within Spring Boot.
- </div>
<h5 class='figure'>Maven Dependency</h5>
<p class='bxml w500'>
diff --git
a/juneau-doc/docs/Topics/14.juneau-microservice-core/01.jmc.Overview.html
b/juneau-doc/docs/Topics/14.juneau-microservice-core/01.jmc.Overview.html
index fd0567d22..35a4fc29d 100644
--- a/juneau-doc/docs/Topics/14.juneau-microservice-core/01.jmc.Overview.html
+++ b/juneau-doc/docs/Topics/14.juneau-microservice-core/01.jmc.Overview.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Microservice Overview', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Microservice Overview', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/14.juneau-microservice-core/02.jmc.LifecycleMethods.html
b/juneau-doc/docs/Topics/14.juneau-microservice-core/02.jmc.LifecycleMethods.html
index f234b3536..cea08ac80 100644
---
a/juneau-doc/docs/Topics/14.juneau-microservice-core/02.jmc.LifecycleMethods.html
+++
b/juneau-doc/docs/Topics/14.juneau-microservice-core/02.jmc.LifecycleMethods.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Lifecycle Methods', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Lifecycle Methods', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/14.juneau-microservice-core/03.jmc.Args.html
b/juneau-doc/docs/Topics/14.juneau-microservice-core/03.jmc.Args.html
index 7c64c5b07..0ab673fb2 100644
--- a/juneau-doc/docs/Topics/14.juneau-microservice-core/03.jmc.Args.html
+++ b/juneau-doc/docs/Topics/14.juneau-microservice-core/03.jmc.Args.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Args', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Args', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/14.juneau-microservice-core/04.jmc.Manifest.html
b/juneau-doc/docs/Topics/14.juneau-microservice-core/04.jmc.Manifest.html
index a4c9ed0fc..8a829dfaf 100644
--- a/juneau-doc/docs/Topics/14.juneau-microservice-core/04.jmc.Manifest.html
+++ b/juneau-doc/docs/Topics/14.juneau-microservice-core/04.jmc.Manifest.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Manifest', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Manifest', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/14.juneau-microservice-core/05.jmc.Config.html
b/juneau-doc/docs/Topics/14.juneau-microservice-core/05.jmc.Config.html
index 78161ffd3..109d352a1 100644
--- a/juneau-doc/docs/Topics/14.juneau-microservice-core/05.jmc.Config.html
+++ b/juneau-doc/docs/Topics/14.juneau-microservice-core/05.jmc.Config.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Config', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Config', created:'8.0.0'}
<div class='topic'>
<p>
@@ -129,7 +129,7 @@
| String <jv>format</jv> =
<jv>config</jv>.get(<js>"Logging/format"</js>, <js>"[{date} {level}]
{msg}%n"</js>).orElse(<jk>null</jk>);
| <jk>long</jk> <jv>limit</jv> =
<jv>config</jv>.get(<js>"Logging/limit"</js>).asLong().orElse(<jk>null</jk>);
| Map<String,Level> <jv>levels</jv> =
<jv>config</jv>.get(<js>"Logging/levels"</js>).as(Map.<jk>class</jk>,
String.<jk>class</jk>, Level.<jk>class</jk>).orElse(<jk>null</jk>);
- </p)
+ </p>
<p>
Changes to the configuration file can trigger notifications
that can be used to restart your microservice or make various other
on-the-fly changes.
diff --git
a/juneau-doc/docs/Topics/14.juneau-microservice-core/06.jmc.SystemProperties.html
b/juneau-doc/docs/Topics/14.juneau-microservice-core/06.jmc.SystemProperties.html
index 6baaaa7bd..0cb0e62eb 100644
---
a/juneau-doc/docs/Topics/14.juneau-microservice-core/06.jmc.SystemProperties.html
+++
b/juneau-doc/docs/Topics/14.juneau-microservice-core/06.jmc.SystemProperties.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'System properties', created:'8.0.0', deprecated:'8.1.2'}
+{title:'System properties', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/14.juneau-microservice-core/07.jmc.VarResolver.html
b/juneau-doc/docs/Topics/14.juneau-microservice-core/07.jmc.VarResolver.html
index 04dc3c85d..0bd9760ef 100644
--- a/juneau-doc/docs/Topics/14.juneau-microservice-core/07.jmc.VarResolver.html
+++ b/juneau-doc/docs/Topics/14.juneau-microservice-core/07.jmc.VarResolver.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'VarResolver', created:'8.0.0', deprecated:'8.1.2'}
+{title:'VarResolver', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/14.juneau-microservice-core/08.jmc.ConsoleCommands.html
b/juneau-doc/docs/Topics/14.juneau-microservice-core/08.jmc.ConsoleCommands.html
index 23f44cbaf..8946f2c78 100644
---
a/juneau-doc/docs/Topics/14.juneau-microservice-core/08.jmc.ConsoleCommands.html
+++
b/juneau-doc/docs/Topics/14.juneau-microservice-core/08.jmc.ConsoleCommands.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Console Commands', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Console Commands', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/14.juneau-microservice-core/09.jmc.Listeners.html
b/juneau-doc/docs/Topics/14.juneau-microservice-core/09.jmc.Listeners.html
index 66b3d1e2f..798fa35f2 100644
--- a/juneau-doc/docs/Topics/14.juneau-microservice-core/09.jmc.Listeners.html
+++ b/juneau-doc/docs/Topics/14.juneau-microservice-core/09.jmc.Listeners.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Listeners', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Listeners', created:'8.0.0'}
<div class='topic'>
<p>
diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty.html
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty.html
index afd0ed477..c16939244 100644
--- a/juneau-doc/docs/Topics/15.juneau-microservice-jetty.html
+++ b/juneau-doc/docs/Topics/15.juneau-microservice-jetty.html
@@ -13,13 +13,9 @@
***************************************************************************************************************************/
-->
-{title:'juneau-microservice-jetty', created:'8.1.0', deprecated:'8.1.2'}
+{title:'juneau-microservice-jetty', created:'8.1.0'}
<div class='topic'>
- <div class='warn'>
- The Juneau Microservice libraries are likely to be removed in
Juneau 9.0 due to the popularity of the Spring Boot
- framework for creating microservices and the ability for Juneau
to be used within Spring Boot.
- </div>
<h5 class='figure'>Maven Dependency</h5>
<p class='bxml w500'>
diff --git
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/01.jmj.Overview.html
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/01.jmj.Overview.html
index 14a4b4e0e..eeab630bf 100644
--- a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/01.jmj.Overview.html
+++ b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/01.jmj.Overview.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Overview', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Overview', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/02.jmj.LifecycleMethods.html
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/02.jmj.LifecycleMethods.html
index d0dde78c5..1d9e05e4b 100644
---
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/02.jmj.LifecycleMethods.html
+++
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/02.jmj.LifecycleMethods.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Lifecycle Methods', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Lifecycle Methods', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/03.jmj.ResourceClasses.html
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/03.jmj.ResourceClasses.html
index 33fcbc905..df5e09cac 100644
---
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/03.jmj.ResourceClasses.html
+++
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/03.jmj.ResourceClasses.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Resource Classes', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Resource Classes', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/04.jmj.PredefinedResourceClasses.html
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/04.jmj.PredefinedResourceClasses.html
index 16f812392..e0a46950b 100644
---
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/04.jmj.PredefinedResourceClasses.html
+++
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/04.jmj.PredefinedResourceClasses.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Predefined Resource Classes', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Predefined Resource Classes', created:'8.0.0'}
<div class='topic'>
<p>
@@ -24,8 +24,6 @@
- View and modify the external INI config file.
<li class='jc'>{@link
oaj.microservice.resources.DirectoryResource}
- View and modify file system directories.
- <li class='jc'>{@link oaj.microservice.resources.LogsResource}
- - View and control generated log files.
<li class='jc'>{@link
oaj.microservice.resources.SampleRootResource}
- A sample root resource class to get started from.
<li class='jc'>{@link
oaj.microservice.resources.ShutdownResource}
diff --git
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/05.jmj.Config.html
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/05.jmj.Config.html
index a9c0d1873..ab3643c95 100644
--- a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/05.jmj.Config.html
+++ b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/05.jmj.Config.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Config', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Config', created:'8.0.0'}
<div class='topic'>
<p>
@@ -24,7 +24,7 @@
</p>
<p>
The most common usage for the configuration file is to
reference values using the {@link oaj.config.vars.ConfigVar $C} variable in
annotations.
- For example, the {@del oajr.BasicRestConfig} interface that
defines the annotations that control the look-and-feel of
+ For example, the {@link oajr.config.BasicRestConfig} interface
that defines the annotations that control the look-and-feel of
classes that extend from {@link oajr.servlet.BasicRestServlet}
use several <c>$C</c> variables to externalize values:
</p>
<p class='bjava'>
diff --git
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/06.jmj.JettyXml.html
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/06.jmj.JettyXml.html
index 30572e6bc..112df939b 100644
--- a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/06.jmj.JettyXml.html
+++ b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/06.jmj.JettyXml.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Jetty.xml file', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Jetty.xml file', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/07.jmj.UiCustomization.html
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/07.jmj.UiCustomization.html
index bcda07f87..8f515ccb1 100644
---
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/07.jmj.UiCustomization.html
+++
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/07.jmj.UiCustomization.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'UI Customization', created:'8.0.0', deprecated:'8.1.2'}
+{title:'UI Customization', created:'8.0.0'}
<div class='topic'>
<p>
@@ -58,7 +58,7 @@
| <cv></a></cv>
</p>
<p>
- The {@del oajr.BasicRestConfig} interface (which defines the
default settings for {@link oajr.servlet.BasicRestServlet}
+ The {@link oajr.config.BasicRestConfig} interface (which
defines the default settings for {@link oajr.servlet.BasicRestServlet}
pulls in this information using {@link
oaj.config.vars.ConfigVar $C} and {@link oajr.vars.UrlVar $U} variables:
</p>
<p class='bjava'>
diff --git
a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/08.jmj.Extending.html
b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/08.jmj.Extending.html
index 3816e4ee8..5be7bd1f0 100644
--- a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/08.jmj.Extending.html
+++ b/juneau-doc/docs/Topics/15.juneau-microservice-jetty/08.jmj.Extending.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Extending JettyMicroservice', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Extending JettyMicroservice', created:'8.0.0'}
<div class='topic'>
<p>
diff --git a/juneau-doc/docs/Topics/16.my-jetty-microservice.html
b/juneau-doc/docs/Topics/16.my-jetty-microservice.html
index 8465f4e0f..508920de7 100644
--- a/juneau-doc/docs/Topics/16.my-jetty-microservice.html
+++ b/juneau-doc/docs/Topics/16.my-jetty-microservice.html
@@ -13,14 +13,9 @@
***************************************************************************************************************************/
-->
-{title:'my-jetty-microservice', created:'8.1.0', deprecated:'8.1.2'}
+{title:'my-jetty-microservice', created:'8.1.0'}
<div class='topic'>
- <div class='warn'>
- The Juneau Microservice libraries are likely to be removed in
Juneau 9.0 due to the popularity of the Spring Boot
- framework for creating microservices and the ability for Juneau
to be used within Spring Boot.
- </div>
-
<h5 class='figure'>Starter Project Zip</h5>
<p class='bcode w500'>
| my-jetty-microservice-{@property juneauVersion}.zip
diff --git
a/juneau-doc/docs/Topics/16.my-jetty-microservice/01.mjm.Installing.html
b/juneau-doc/docs/Topics/16.my-jetty-microservice/01.mjm.Installing.html
index 76c214304..5d6ecd2c7 100644
--- a/juneau-doc/docs/Topics/16.my-jetty-microservice/01.mjm.Installing.html
+++ b/juneau-doc/docs/Topics/16.my-jetty-microservice/01.mjm.Installing.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Installing in Eclipse', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Installing in Eclipse', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/16.my-jetty-microservice/02.mjm.Running.html
b/juneau-doc/docs/Topics/16.my-jetty-microservice/02.mjm.Running.html
index 217ea9375..986f6b7a1 100644
--- a/juneau-doc/docs/Topics/16.my-jetty-microservice/02.mjm.Running.html
+++ b/juneau-doc/docs/Topics/16.my-jetty-microservice/02.mjm.Running.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Running in Eclipse', created:'8.0.0', deprecated:'8.1.2'}
+{title:'Running in Eclipse', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/16.my-jetty-microservice/03.mjm.Building.html
b/juneau-doc/docs/Topics/16.my-jetty-microservice/03.mjm.Building.html
index 9e912ff36..ac29d6111 100644
--- a/juneau-doc/docs/Topics/16.my-jetty-microservice/03.mjm.Building.html
+++ b/juneau-doc/docs/Topics/16.my-jetty-microservice/03.mjm.Building.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-{title:'Building and Running from Command-Line', created:'8.0.0',
deprecated:'8.1.2'}
+{title:'Building and Running from Command-Line', created:'8.0.0'}
<div class='topic'>
<p>
diff --git
a/juneau-doc/docs/Topics/17.my-springboot-microservice/01.msm.Installing.html
b/juneau-doc/docs/Topics/17.my-springboot-microservice/01.msm.Installing.html
index 91947cc51..96c2d58ec 100644
---
a/juneau-doc/docs/Topics/17.my-springboot-microservice/01.msm.Installing.html
+++
b/juneau-doc/docs/Topics/17.my-springboot-microservice/01.msm.Installing.html
@@ -46,21 +46,21 @@
<br>Only the top-level resource needs to be annotated
with {@del oaj.rest.springboot.annotation.JuneauRestRoot @JuneauRestRoot}
<br><br>
<p class='bjava'>
- <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 @JuneauRestRoot</ja>
- <jk>public</jk> RootResources getRootResources() {
- <jk>return new</jk> RootResources();
- }
- }
+ | <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 @JuneauRestRoot</ja>
+ | <jk>public</jk> RootResources
getRootResources() {
+ | <jk>return new</jk>
RootResources();
+ | }
+ | }
</p>
<li>
<l>RootResources.java</l> - The top-level REST
resource.
@@ -68,28 +68,28 @@
<br>This is identical to the Jetty example.
<br><br>
<p class='bjava'>
- <ja>@Rest</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>
BasicRestServletGroup <jk>implements</jk> BasicUniversalConfig {
- <jc>// No code</jc>
- }
+ | <ja>@Rest</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> BasicRestServletGroup <jk>implements</jk> BasicUniversalConfig
{
+ | <jc>// No code</jc>
+ | }
</p>
<li>
<l>juneau.cfg</l> - The configuration file.
@@ -99,46 +99,46 @@
<br>Also it's located in the classpath so that our
microservice can be built as a single executable jar.
<br><br>
<p class='bini'>
-
<cc>#=======================================================================================================================
- # Basic configuration file for REST microservices
- # Subprojects can use this as a starting point.
-
#=======================================================================================================================</cc>
-
-
<cc>#=======================================================================================================================
- # REST settings
-
#=======================================================================================================================</cc>
- <cs>[REST]</cs>
-
- <cc># Comma-delimited list of key-value pairs that represent
locations of static files that can be served up by your @Rest-annotated
- # classes. These are static files that are served up by the
servlet under the specified sub-paths.
- # For example, given the following setting...
- # staticFiles = htdocs:my-docs,styles/my-styles
- # ...the URI "/servletPath/htdocs/javadoc.css" resolves to the
path "/my-docs/javadoc.css".
- # This path can be relative to the working directory, classpath
root, or package of your resource class.
- # Used by the BasicRestConfig interface that defines the
following value:
- # staticFiles="$C{REST/staticFiles}"</cc>
- <ck>staticFiles</ck> = htdocs:htdocs
-
- <cc># Stylesheet to use for HTML views.
- # Used by the BasicRestConfig interface that defines the
following value:
- #
stylesheet="$C{REST/theme,servlet:/htdocs/themes/devops.css}"</cc>
- <ck>theme</ck> = <cv>servlet:/htdocs/themes/devops.css</cv>
-
- <cc># Various look-and-feel settings used in the
BasicRestConfig interface.</cc>
- <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>
+ |
<cc>#=======================================================================================================================
+ | # Basic configuration file for REST
microservices
+ | # Subprojects can use this as a
starting point.
+ |
#=======================================================================================================================</cc>
+ |
+ |
<cc>#=======================================================================================================================
+ | # REST settings
+ |
#=======================================================================================================================</cc>
+ | <cs>[REST]</cs>
+ |
+ | <cc># Comma-delimited list of key-value
pairs that represent locations of static files that can be served up by your
@Rest-annotated
+ | # classes. These are static files that
are served up by the servlet under the specified sub-paths.
+ | # For example, given the following
setting...
+ | # staticFiles =
htdocs:my-docs,styles/my-styles
+ | # ...the URI
"/servletPath/htdocs/javadoc.css" resolves to the path "/my-docs/javadoc.css".
+ | # This path can be relative to the
working directory, classpath root, or package of your resource class.
+ | # Used by the BasicRestConfig interface
that defines the following value:
+ | #
staticFiles="$C{REST/staticFiles}"</cc>
+ | <ck>staticFiles</ck> = htdocs:htdocs
+ |
+ | <cc># Stylesheet to use for HTML views.
+ | # Used by the BasicRestConfig interface
that defines the following value:
+ | #
stylesheet="$C{REST/theme,servlet:/htdocs/themes/devops.css}"</cc>
+ | <ck>theme</ck> =
<cv>servlet:/htdocs/themes/devops.css</cv>
+ |
+ | <cc># Various look-and-feel settings
used in the BasicRestConfig interface.</cc>
+ | <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.
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index 97dda3f54..a754a9902 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -380,34 +380,34 @@
<ol>
<li><p><a class='doclink'
href='#juneau-rest-mock.jrm.MockRestClient'>MockRestClient</a><span
class='update'>created: 8.2.0, updated: <b>9.0.0</b></span></p>
</ol>
- <li><p class='toc2'><a class='doclink'
href='#juneau-microservice-core'>juneau-microservice-core</a><span
class='update'>created: 8.1.0, deprecated: 8.1.2</span></p>
+ <li><p class='toc2'><a class='doclink'
href='#juneau-microservice-core'>juneau-microservice-core</a><span
class='update'>created: 8.1.0</span></p>
<ol>
- <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.Overview'>Microservice Overview</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.LifecycleMethods'>Lifecycle
Methods</a><span class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.Args'>Args</a><span class='update'>created:
8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.Manifest'>Manifest</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.Config'>Config</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.SystemProperties'>System
properties</a><span class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.VarResolver'>VarResolver</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.ConsoleCommands'>Console Commands</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.Listeners'>Listeners</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.Overview'>Microservice Overview</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.LifecycleMethods'>Lifecycle
Methods</a><span class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.Args'>Args</a><span class='update'>created:
8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.Manifest'>Manifest</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.Config'>Config</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.SystemProperties'>System
properties</a><span class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.VarResolver'>VarResolver</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.ConsoleCommands'>Console Commands</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-core.jmc.Listeners'>Listeners</a><span
class='update'>created: 8.0.0</span></p>
</ol>
- <li><p class='toc2'><a class='doclink'
href='#juneau-microservice-jetty'>juneau-microservice-jetty</a><span
class='update'>created: 8.1.0, deprecated: 8.1.2</span></p>
+ <li><p class='toc2'><a class='doclink'
href='#juneau-microservice-jetty'>juneau-microservice-jetty</a><span
class='update'>created: 8.1.0</span></p>
<ol>
- <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.Overview'>Overview</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.LifecycleMethods'>Lifecycle
Methods</a><span class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.ResourceClasses'>Resource Classes</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.PredefinedResourceClasses'>Predefined
Resource Classes</a><span class='update'>created: 8.0.0, deprecated:
8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.Config'>Config</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.JettyXml'>Jetty.xml file</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.UiCustomization'>UI Customization</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.Extending'>Extending
JettyMicroservice</a><span class='update'>created: 8.0.0, deprecated:
8.1.2</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.Overview'>Overview</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.LifecycleMethods'>Lifecycle
Methods</a><span class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.ResourceClasses'>Resource Classes</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.PredefinedResourceClasses'>Predefined
Resource Classes</a><span class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.Config'>Config</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.JettyXml'>Jetty.xml file</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.UiCustomization'>UI Customization</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#juneau-microservice-jetty.jmj.Extending'>Extending
JettyMicroservice</a><span class='update'>created: 8.0.0</span></p>
</ol>
- <li><p class='toc2'><a class='doclink'
href='#my-jetty-microservice'>my-jetty-microservice</a><span
class='update'>created: 8.1.0, deprecated: 8.1.2</span></p>
+ <li><p class='toc2'><a class='doclink'
href='#my-jetty-microservice'>my-jetty-microservice</a><span
class='update'>created: 8.1.0</span></p>
<ol>
- <li><p><a class='doclink'
href='#my-jetty-microservice.mjm.Installing'>Installing in Eclipse</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#my-jetty-microservice.mjm.Running'>Running in Eclipse</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></p>
- <li><p><a class='doclink'
href='#my-jetty-microservice.mjm.Building'>Building and Running from
Command-Line</a><span class='update'>created: 8.0.0, deprecated:
8.1.2</span></p>
+ <li><p><a class='doclink'
href='#my-jetty-microservice.mjm.Installing'>Installing in Eclipse</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#my-jetty-microservice.mjm.Running'>Running in Eclipse</a><span
class='update'>created: 8.0.0</span></p>
+ <li><p><a class='doclink'
href='#my-jetty-microservice.mjm.Building'>Building and Running from
Command-Line</a><span class='update'>created: 8.0.0</span></p>
</ol>
<li><p class='toc2'><a class='doclink'
href='#my-springboot-microservice'>my-springboot-microservice</a><span
class='update'>created: 8.0.0</span></p>
<ol>
@@ -771,7 +771,7 @@
<p class='bjava'>
<jc>// Parse a JSON object as a bean.</jc>
String <jv>json</jv> = <js>"{\"name\":\"John Smith\","\age\":21}"</js>;
- Person <jv>person</jv> = Json.<jsm>from</jsm>(<jv>json</jv>,
Person.<jk>class</jk>);
+ Person <jv>person</jv> = Json.<jsm>to</jsm>(<jv>json</jv>,
Person.<jk>class</jk>);
</p>
<p>
Marshalling support is provided for a wide variety of POJO
types including:
@@ -16240,7 +16240,7 @@
<li class='jp'>{@link
org.apache.juneau.examples.rest.springboot}
</ul>
<p>
- The {@link org.apache.juneau.examples.rest.springboot}
application is described in the section {@doc jrss.Overview}.
+ The {@link org.apache.juneau.examples.rest.springboot}
application is described in the section {@doc jrss.Overview SpringBoot
Overview}.
</p>
<p>
The Jetty application consists of the following application
class that registers our top-level servlet:
@@ -16669,7 +16669,8 @@
<ja>@Rest</ja>(
path=<js>"/child"</js> <jc>// Path relative to parent
resource.</jc>
)
- <jk>public</jk> MyChildResource {...} <jc>// Note that we don't need to
extend from RestServlet.</jc>
+ <jc>// Note that we don't need to extend from RestServlet.</jc>
+ <jk>public</jk> MyChildResource <jk>extends</jk> BasicRestObject
<jk>implements</jk> BasicUniversalConfig {...}
</p>
<p>
The path of the child resource gets appended to the path of the
parent resource.
@@ -16744,7 +16745,7 @@
not necessary.</b>
The only requirement is that the class be annotated
with <ja>@Rest</ja> and have one of the following constructors
if they aren't already Spring Beans:
- <ul class='javatree'>
+ <ul class='javatreec'>
<li class='jm'><c><jk>public</jk> T()</c>
<li class='jm'><c><jk>public</jk>
T(RestContext.Builder)</c>
</ul>
@@ -16776,8 +16777,8 @@
}
<ja>@Bean</ja>
- <jk>public</jk> ServletRegistrationBean>Servlet>
getRootServlet(RootResources <jv>rootResources</jv>) {
- <jk>return new</jk>
ServletRegistrationBean>>(<jv>rootResources</jv>, <js>"/*"</js>);
+ <jk>public</jk> ServletRegistrationBean<Servlet>
getRootServlet(RootResources <jv>rootResources</jv>) {
+ <jk>return new</jk>
ServletRegistrationBean<>(<jv>rootResources</jv>, <js>"/*"</js>);
}
}
</p>
@@ -16797,7 +16798,7 @@
</p>
<p class='bjava'>
<ja>@Rest</ja>(...)
- <jk>public class</jk> MyResource {
+ <jk>public class</jk> MyResource <jk>extends</jk> BasicRestObject
<jk>implements</jk> BasicUniversalConfig {
<jc>// Our database.</jc>
<jk>private</jk> Map<Integer,Object> <jf>myDatabase</jf>;
@@ -16813,7 +16814,7 @@
</p>
<p class='bjava'>
<ja>@Rest</ja>(...)
- <jk>public class</jk> MyResource {
+ <jk>public class</jk> MyResource <jk>extends</jk> BasicRestObject
<jk>implements</jk> BasicUniversalConfig {
<jc>// Add a request attribute to all incoming requests.</jc>
<ja>@RestHook</ja>(<jsf>PRE_CALL</jsf>)
@@ -17007,12 +17008,12 @@
<ul class='spaced-list'>
<li>Request objects:
<ul class='javatreec'>
- <li class='jic'>{@link
javax.servlet.AsyncContext}
+ <li class='jic'>{@code
AsyncContext}
<li class='jc'>{@link
org.apache.juneau.rest.arg.CookieList}
- <li class='je'>{@link
javax.servlet.DispatcherType}
+ <li class='je'>{@code
DispatcherType}
<li class='jc'>{@link
org.apache.juneau.httppart.HttpPartParserSession}
<li class='jc'>{@link
org.apache.juneau.httppart.HttpPartSerializerSession}
- <li class='jic'>{@link
javax.servlet.HttpServletRequest}
+ <li class='jic'>{@code
HttpServletRequest}
<li class='jc'>{@link
java.io.InputStream}
<li class='jac'>{@link
org.apache.juneau.parser.InputStreamParser}
<li class='jc'>{@link
java.util.Locale}
@@ -17029,7 +17030,7 @@
<li class='jc'>{@link
org.apache.juneau.rest.httppart.RequestQueryParams}
<li class='jc'>{@link
java.util.ResourceBundle}
<li class='jc'>{@link
org.apache.juneau.rest.RestRequest}
- <li class='jic'>{@link
javax.servlet.ServletInputStream}
+ <li class='jic'>{@code
ServletInputStream}
<li class='jc'>{@link
org.apache.juneau.dto.swagger.Swagger}
<li class='jc'>{@link
java.util.TimeZone}
<li class='jc'>{@link
org.apache.juneau.UriContext}
@@ -17039,16 +17040,16 @@
</li>
<li>Response objects:
<ul class='javatreec'>
- <li class='jic'>{@link
javax.servlet.HttpServletResponse}
+ <li class='jic'>{@code
HttpServletResponse}
<li class='jc'>{@link
java.io.OutputStream}
<li class='jc'>{@link
org.apache.juneau.rest.RestResponse}
- <li class='jic'>{@link
javax.servlet.ServletOutputStream}
+ <li class='jic'>{@code
ServletOutputStream}
<li class='jc'>{@link
java.io.Writer}
</ul>
</li>
<li>Session objects:
<ul class='javatreec'>
- <li class='jic'>{@link
javax.servlet.http.HttpSession}
+ <li class='jic'>{@code
HttpSession}
<li class='jc'>{@link
org.apache.juneau.rest.RestSession}
<li class='jc'>{@link
org.apache.juneau.rest.util.UrlPath}
<li class='jc'>{@link
org.apache.juneau.rest.util.UrlPathMatch}
@@ -17099,6 +17100,7 @@
<li>Context values:
<ul class='javatreec'>
<li class='jc'>{@link
org.apache.juneau.BeanContext}
+ <li class='jc'>{@link
org.apache.juneau.rest.logger.CallLogger}
<li class='jc'>{@link
org.apache.juneau.config.Config}
<li class='jic'>{@link
org.apache.juneau.rest.debug.DebugEnablement}
<li class='jc'>{@link
org.apache.juneau.encoders.EncoderSet}
@@ -17110,7 +17112,6 @@
<li class='jc'>{@link
org.apache.juneau.rest.RestChildren}
<li class='jc'>{@link
org.apache.juneau.rest.RestContext}
<li class='jc'>{@link
org.apache.juneau.rest.stats.RestContextStats}
- <li class='jic'>{@link
org.apache.juneau.rest.logging.RestLogger}
<li class='jc'>{@link
org.apache.juneau.rest.RestOpContext}
<li class='jc'>{@link
org.apache.juneau.rest.RestOperations}
<li class='jc'>{@link
org.apache.juneau.serializer.SerializerSet}
@@ -17662,12 +17663,6 @@
<li class='ja'>{@link
org.apache.juneau.http.annotation.StatusCode}
</ul>
</li>
- <li>Sub-annotations:
- <ul class='javatreec'>
- <li class='ja'>{@link
org.apache.juneau.http.annotation.Schema}
- <li class='ja'>{@link
org.apache.juneau.http.annotation.Items}
- </ul>
- </li>
</ul>
<p>
These annotation can be used on method parameters or on the
parameter types themselves, or a combination
@@ -17831,66 +17826,66 @@
</li>
<li><b>Common schema annotation:</b>
<ul class='javatree'>
- <li class='ja'>{@link
org.apache.juneau.http.annotation.Schema}
+ <li class='ja'>{@link
org.apache.juneau.annotation.Schema}
<ul class='javatreec'>
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#_default() _default}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#_enum() _enum}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#$ref() $ref}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#additionalProperties()
additionalProperties}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#aev() aev}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#allOf() allOf}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#allowEmptyValue() allowEmptyValue}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#cf() cf}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#collectionFormat() collectionFormat}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#d() d}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#description() description}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#df() df}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#discriminator() discriminator}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#e() e}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#emax() emax}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#emin() emin}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#exclusiveMaximum() exclusiveMaximum}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#exclusiveMinimum() exclusiveMinimum}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#externalDocs() externalDocs}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#f() f}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#format() format}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#ignore() ignore}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#items() items}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#max() max}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#maxi() maxi}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#maximum() maximum}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#maxItems() maxItems}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#maxl() maxl}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#maxLength() maxLength}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#maxp() maxp}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#maxProperties() maxProperties}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#min() min}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#mini() mini}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#minimum() minimum}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#minItems() minItems}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#minl() minl}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#minLength() minLength}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#minp() minp}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#minProperties() minProperties}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#mo() mo}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#multipleOf() multipleOf}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#on() on}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#onClass() onClass}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#p() p}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#pattern() pattern}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#properties() properties}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#r() r}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#readOnly() readOnly}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#required() required}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#ro() ro}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#sie() sie}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#skipIfEmpty() v}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#t() t}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#title() title}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#type() type}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#ui() ui}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#uniqueItems() uniqueItems}
- <li class='jma'>{@link
org.apache.juneau.http.annotation.Schema#xml() xml}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#_default() _default}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#_enum() _enum}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#$ref() $ref}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#additionalProperties() additionalProperties}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#aev() aev}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#allOf() allOf}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#allowEmptyValue() allowEmptyValue}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#cf() cf}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#collectionFormat() collectionFormat}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#d() d}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#description() description}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#df() df}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#discriminator() discriminator}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#e() e}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#emax() emax}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#emin() emin}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#exclusiveMaximum() exclusiveMaximum}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#exclusiveMinimum() exclusiveMinimum}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#externalDocs() externalDocs}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#f() f}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#format() format}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#ignore() ignore}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#items() items}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#max() max}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#maxi() maxi}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#maximum() maximum}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#maxItems() maxItems}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#maxl() maxl}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#maxLength() maxLength}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#maxp() maxp}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#maxProperties() maxProperties}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#min() min}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#mini() mini}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#minimum() minimum}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#minItems() minItems}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#minl() minl}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#minLength() minLength}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#minp() minp}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#minProperties() minProperties}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#mo() mo}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#multipleOf() multipleOf}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#on() on}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#onClass() onClass}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#p() p}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#pattern() pattern}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#properties() properties}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#r() r}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#readOnly() readOnly}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#required() required}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#ro() ro}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#sie() sie}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#skipIfEmpty() v}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#t() t}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#title() title}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#type() type}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#ui() ui}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#uniqueItems() uniqueItems}
+ <li class='jma'>{@link
org.apache.juneau.annotation.Schema#xml() xml}
</ul>
</li>
</ul>
@@ -18060,7 +18055,7 @@
</p>
<p>
The default registered part marshallers, {@link
org.apache.juneau.oapi.OpenApiSerializer} and {@link
org.apache.juneau.oapi.OpenApiParser}, are used to
- marshall POJOs using schemas defined via the {@link
org.apache.juneau.http.annotation.Schema @Schema} annotation.
+ marshall POJOs using schemas defined via the {@link
org.apache.juneau.annotation.Schema @Schema} annotation.
</p>
<p>
For example, the following shows how a pipe-delimited list of
comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to
a 2-dimensional array of <c>Longs</c>:
@@ -18312,7 +18307,7 @@
<li class='ja'>{@link
org.apache.juneau.http.annotation.FormData}
<li class='ja'>{@link org.apache.juneau.http.annotation.Path}
<li class='ja'>{@link org.apache.juneau.http.annotation.Content}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Schema}
+ <li class='ja'>{@link org.apache.juneau.annotation.Schema}
</ul>
<h5 class='figure'>Example:</h5>
@@ -18406,7 +18401,7 @@
<li class='ja'>{@link
org.apache.juneau.http.annotation.StatusCode}
<li class='ja'>{@link org.apache.juneau.http.annotation.Header}
<li class='ja'>{@link
org.apache.juneau.http.annotation.Content}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Schema}
+ <li class='ja'>{@link org.apache.juneau.annotation.Schema}
</ul>
<p>
@@ -18775,7 +18770,7 @@
If you want to be able to consume url-encoded form post bodies
as POJOs in Spring Boot, you'll need to
add the following Spring Bean to your configuration to prevent
Spring Boot from automatically
consuming the body itself:
- <p class='bjava'>
+ <p class='bjava' style='max-width:700px'>
<ja>@SpringBootApplication</ja>
<ja>@Controller</ja>
<jk>public class</jk> SpringBootAppConfig {
@@ -20190,9 +20185,9 @@
}
</p>
<ul class='notes'>
- <li class='note'>The {@link
org.apache.juneau.http.annotation.Schema @Schema} annotation can also be
attached
+ <li class='note'>The {@link org.apache.juneau.annotation.Schema
@Schema} annotation can also be attached
directly to the parameter or parameter type as well.
- <li class='note'>The {@link
org.apache.juneau.http.annotation.Schema#type() type} and {@link
org.apache.juneau.http.annotation.Schema#collectionFormat() collectionFormat}
values above are optional and auto-detected based on the
+ <li class='note'>The {@link
org.apache.juneau.annotation.Schema#type() type} and {@link
org.apache.juneau.annotation.Schema#collectionFormat() collectionFormat} values
above are optional and auto-detected based on the
parameter class type if omitted. They're included here
for clarity.
The examples will be explained in the next section.
</ul>
@@ -22906,7 +22901,7 @@
<js>" <p>Other features (such as this aside)
are added through annotations.</p>"</js>,
<js>"</div>"</js>
},
- asideFloat="RIGHT"
+ asideFloat=<js>"RIGHT"</js>
)
<ja>@SerializerConfig</ja>(
quoteChar=<js>"'"</js>
@@ -24610,7 +24605,7 @@
</p>
<ul class='spaced-list'>
<li>
- {@link org.apache.juneau.http.HeaderList} - Serialized
as individual headers.
+ {@link org.apache.juneau.http.header.HeaderList} -
Serialized as individual headers.
<li>
<c>Map</c> - Converted to key-value pairs.
<br>Values serialized using the registered
{@link org.apache.juneau.httppart.HttpPartSerializer} ({@link
org.apache.juneau.oapi.OpenApiSerializer} by default).
@@ -25677,13 +25672,9 @@
<!--
====================================================================================================
-->
-<h2 class='topic' onclick='toggle(this)'><a href='#juneau-microservice-core'
id='juneau-microservice-core'>14 - juneau-microservice-core</a><span
class='update'>created: 8.1.0, deprecated: 8.1.2</span></h2>
+<h2 class='topic' onclick='toggle(this)'><a href='#juneau-microservice-core'
id='juneau-microservice-core'>14 - juneau-microservice-core</a><span
class='update'>created: 8.1.0</span></h2>
<div class='topic'><!-- START: 14 - juneau-microservice-core -->
<div class='topic'>
- <div class='warn'>
- The Juneau Microservice libraries are likely to be removed in
Juneau 9.0 due to the popularity of the Spring Boot
- framework for creating microservices and the ability for Juneau
to be used within Spring Boot.
- </div>
<h5 class='figure'>Maven Dependency</h5>
<p class='bxml w500'>
@@ -25725,7 +25716,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.Overview'
id='juneau-microservice-core.jmc.Overview'>14.1 - Microservice
Overview</a><span class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.Overview'
id='juneau-microservice-core.jmc.Overview'>14.1 - Microservice
Overview</a><span class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 14.1 - juneau-microservice-core.jmc.Overview -->
<div class='topic'>
<p>
@@ -25786,7 +25777,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.LifecycleMethods'
id='juneau-microservice-core.jmc.LifecycleMethods'>14.2 - Lifecycle
Methods</a><span class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.LifecycleMethods'
id='juneau-microservice-core.jmc.LifecycleMethods'>14.2 - Lifecycle
Methods</a><span class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 14.2 -
juneau-microservice-core.jmc.LifecycleMethods -->
<div class='topic'>
<p>
@@ -25875,7 +25866,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.Args'
id='juneau-microservice-core.jmc.Args'>14.3 - Args</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.Args'
id='juneau-microservice-core.jmc.Args'>14.3 - Args</a><span
class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 14.3 - juneau-microservice-core.jmc.Args -->
<div class='topic'>
<p>
@@ -25955,7 +25946,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.Manifest'
id='juneau-microservice-core.jmc.Manifest'>14.4 - Manifest</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.Manifest'
id='juneau-microservice-core.jmc.Manifest'>14.4 - Manifest</a><span
class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 14.4 - juneau-microservice-core.jmc.Manifest -->
<div class='topic'>
<p>
@@ -26020,7 +26011,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.Config'
id='juneau-microservice-core.jmc.Config'>14.5 - Config</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.Config'
id='juneau-microservice-core.jmc.Config'>14.5 - Config</a><span
class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 14.5 - juneau-microservice-core.jmc.Config -->
<div class='topic'>
<p>
@@ -26136,7 +26127,7 @@
String <jv>format</jv> = <jv>config</jv>.get(<js>"Logging/format"</js>,
<js>"[{date} {level}] {msg}%n"</js>).orElse(<jk>null</jk>);
<jk>long</jk> <jv>limit</jv> =
<jv>config</jv>.get(<js>"Logging/limit"</js>).asLong().orElse(<jk>null</jk>);
Map<String,Level> <jv>levels</jv> =
<jv>config</jv>.get(<js>"Logging/levels"</js>).as(Map.<jk>class</jk>,
String.<jk>class</jk>, Level.<jk>class</jk>).orElse(<jk>null</jk>);
- </p)
+ </p>
<p>
Changes to the configuration file can trigger notifications
that can be used to restart your microservice or make various other
on-the-fly changes.
@@ -26153,7 +26144,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.SystemProperties'
id='juneau-microservice-core.jmc.SystemProperties'>14.6 - System
properties</a><span class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.SystemProperties'
id='juneau-microservice-core.jmc.SystemProperties'>14.6 - System
properties</a><span class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 14.6 -
juneau-microservice-core.jmc.SystemProperties -->
<div class='topic'>
<p>
@@ -26185,7 +26176,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.VarResolver'
id='juneau-microservice-core.jmc.VarResolver'>14.7 - VarResolver</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.VarResolver'
id='juneau-microservice-core.jmc.VarResolver'>14.7 - VarResolver</a><span
class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 14.7 - juneau-microservice-core.jmc.VarResolver
-->
<div class='topic'>
<p>
@@ -26236,7 +26227,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.ConsoleCommands'
id='juneau-microservice-core.jmc.ConsoleCommands'>14.8 - Console
Commands</a><span class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.ConsoleCommands'
id='juneau-microservice-core.jmc.ConsoleCommands'>14.8 - Console
Commands</a><span class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 14.8 -
juneau-microservice-core.jmc.ConsoleCommands -->
<div class='topic'>
<p>
@@ -26329,7 +26320,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.Listeners'
id='juneau-microservice-core.jmc.Listeners'>14.9 - Listeners</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-core.jmc.Listeners'
id='juneau-microservice-core.jmc.Listeners'>14.9 - Listeners</a><span
class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 14.9 - juneau-microservice-core.jmc.Listeners
-->
<div class='topic'>
<p>
@@ -26391,13 +26382,9 @@
<!--
====================================================================================================
-->
-<h2 class='topic' onclick='toggle(this)'><a href='#juneau-microservice-jetty'
id='juneau-microservice-jetty'>15 - juneau-microservice-jetty</a><span
class='update'>created: 8.1.0, deprecated: 8.1.2</span></h2>
+<h2 class='topic' onclick='toggle(this)'><a href='#juneau-microservice-jetty'
id='juneau-microservice-jetty'>15 - juneau-microservice-jetty</a><span
class='update'>created: 8.1.0</span></h2>
<div class='topic'><!-- START: 15 - juneau-microservice-jetty -->
<div class='topic'>
- <div class='warn'>
- The Juneau Microservice libraries are likely to be removed in
Juneau 9.0 due to the popularity of the Spring Boot
- framework for creating microservices and the ability for Juneau
to be used within Spring Boot.
- </div>
<h5 class='figure'>Maven Dependency</h5>
<p class='bxml w500'>
@@ -26426,7 +26413,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.Overview'
id='juneau-microservice-jetty.jmj.Overview'>15.1 - Overview</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.Overview'
id='juneau-microservice-jetty.jmj.Overview'>15.1 - Overview</a><span
class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 15.1 - juneau-microservice-jetty.jmj.Overview
-->
<div class='topic'>
<p>
@@ -26480,7 +26467,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.LifecycleMethods'
id='juneau-microservice-jetty.jmj.LifecycleMethods'>15.2 - Lifecycle
Methods</a><span class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.LifecycleMethods'
id='juneau-microservice-jetty.jmj.LifecycleMethods'>15.2 - Lifecycle
Methods</a><span class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 15.2 -
juneau-microservice-jetty.jmj.LifecycleMethods -->
<div class='topic'>
<p>
@@ -26579,7 +26566,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.ResourceClasses'
id='juneau-microservice-jetty.jmj.ResourceClasses'>15.3 - Resource
Classes</a><span class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.ResourceClasses'
id='juneau-microservice-jetty.jmj.ResourceClasses'>15.3 - Resource
Classes</a><span class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 15.3 -
juneau-microservice-jetty.jmj.ResourceClasses -->
<div class='topic'>
<p>
@@ -26724,7 +26711,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.PredefinedResourceClasses'
id='juneau-microservice-jetty.jmj.PredefinedResourceClasses'>15.4 - Predefined
Resource Classes</a><span class='update'>created: 8.0.0, deprecated:
8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.PredefinedResourceClasses'
id='juneau-microservice-jetty.jmj.PredefinedResourceClasses'>15.4 - Predefined
Resource Classes</a><span class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 15.4 -
juneau-microservice-jetty.jmj.PredefinedResourceClasses -->
<div class='topic'>
<p>
@@ -26735,8 +26722,6 @@
- View and modify the external INI config file.
<li class='jc'>{@link
org.apache.juneau.microservice.resources.DirectoryResource}
- View and modify file system directories.
- <li class='jc'>{@link
org.apache.juneau.microservice.resources.LogsResource}
- - View and control generated log files.
<li class='jc'>{@link
org.apache.juneau.microservice.resources.SampleRootResource}
- A sample root resource class to get started from.
<li class='jc'>{@link
org.apache.juneau.microservice.resources.ShutdownResource}
@@ -26747,7 +26732,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.Config'
id='juneau-microservice-jetty.jmj.Config'>15.5 - Config</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.Config'
id='juneau-microservice-jetty.jmj.Config'>15.5 - Config</a><span
class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 15.5 - juneau-microservice-jetty.jmj.Config -->
<div class='topic'>
<p>
@@ -26758,7 +26743,7 @@
</p>
<p>
The most common usage for the configuration file is to
reference values using the {@link org.apache.juneau.config.vars.ConfigVar $C}
variable in annotations.
- For example, the {@del org.apache.juneau.rest.BasicRestConfig}
interface that defines the annotations that control the look-and-feel of
+ For example, the {@link
org.apache.juneau.rest.config.BasicRestConfig} interface that defines the
annotations that control the look-and-feel of
classes that extend from {@link
org.apache.juneau.rest.servlet.BasicRestServlet} use several <c>$C</c>
variables to externalize values:
</p>
<p class='bjava'>
@@ -26958,7 +26943,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.JettyXml'
id='juneau-microservice-jetty.jmj.JettyXml'>15.6 - Jetty.xml file</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.JettyXml'
id='juneau-microservice-jetty.jmj.JettyXml'>15.6 - Jetty.xml file</a><span
class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 15.6 - juneau-microservice-jetty.jmj.JettyXml
-->
<div class='topic'>
<p>
@@ -27048,7 +27033,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.UiCustomization'
id='juneau-microservice-jetty.jmj.UiCustomization'>15.7 - UI
Customization</a><span class='update'>created: 8.0.0, deprecated:
8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.UiCustomization'
id='juneau-microservice-jetty.jmj.UiCustomization'>15.7 - UI
Customization</a><span class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 15.7 -
juneau-microservice-jetty.jmj.UiCustomization -->
<div class='topic'>
<p>
@@ -27093,7 +27078,7 @@
<cv></a></cv>
</p>
<p>
- The {@del org.apache.juneau.rest.BasicRestConfig} interface
(which defines the default settings for {@link
org.apache.juneau.rest.servlet.BasicRestServlet}
+ The {@link org.apache.juneau.rest.config.BasicRestConfig}
interface (which defines the default settings for {@link
org.apache.juneau.rest.servlet.BasicRestServlet}
pulls in this information using {@link
org.apache.juneau.config.vars.ConfigVar $C} and {@link
org.apache.juneau.rest.vars.UrlVar $U} variables:
</p>
<p class='bjava'>
@@ -27162,7 +27147,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.Extending'
id='juneau-microservice-jetty.jmj.Extending'>15.8 - Extending
JettyMicroservice</a><span class='update'>created: 8.0.0, deprecated:
8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-microservice-jetty.jmj.Extending'
id='juneau-microservice-jetty.jmj.Extending'>15.8 - Extending
JettyMicroservice</a><span class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 15.8 - juneau-microservice-jetty.jmj.Extending
-->
<div class='topic'>
<p>
@@ -27244,14 +27229,9 @@
<!--
====================================================================================================
-->
-<h2 class='topic' onclick='toggle(this)'><a href='#my-jetty-microservice'
id='my-jetty-microservice'>16 - my-jetty-microservice</a><span
class='update'>created: 8.1.0, deprecated: 8.1.2</span></h2>
+<h2 class='topic' onclick='toggle(this)'><a href='#my-jetty-microservice'
id='my-jetty-microservice'>16 - my-jetty-microservice</a><span
class='update'>created: 8.1.0</span></h2>
<div class='topic'><!-- START: 16 - my-jetty-microservice -->
<div class='topic'>
- <div class='warn'>
- The Juneau Microservice libraries are likely to be removed in
Juneau 9.0 due to the popularity of the Spring Boot
- framework for creating microservices and the ability for Juneau
to be used within Spring Boot.
- </div>
-
<h5 class='figure'>Starter Project Zip</h5>
<p class='bcode w500'>
my-jetty-microservice-{@property juneauVersion}.zip
@@ -27268,7 +27248,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#my-jetty-microservice.mjm.Installing'
id='my-jetty-microservice.mjm.Installing'>16.1 - Installing in Eclipse</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#my-jetty-microservice.mjm.Installing'
id='my-jetty-microservice.mjm.Installing'>16.1 - Installing in Eclipse</a><span
class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 16.1 - my-jetty-microservice.mjm.Installing -->
<div class='topic'>
<p>
@@ -27527,7 +27507,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#my-jetty-microservice.mjm.Running'
id='my-jetty-microservice.mjm.Running'>16.2 - Running in Eclipse</a><span
class='update'>created: 8.0.0, deprecated: 8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#my-jetty-microservice.mjm.Running'
id='my-jetty-microservice.mjm.Running'>16.2 - Running in Eclipse</a><span
class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 16.2 - my-jetty-microservice.mjm.Running -->
<div class='topic'>
<p>
@@ -27565,7 +27545,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#my-jetty-microservice.mjm.Building'
id='my-jetty-microservice.mjm.Building'>16.3 - Building and Running from
Command-Line</a><span class='update'>created: 8.0.0, deprecated:
8.1.2</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#my-jetty-microservice.mjm.Building'
id='my-jetty-microservice.mjm.Building'>16.3 - Building and Running from
Command-Line</a><span class='update'>created: 8.0.0</span></h3>
<div class='topic'><!-- START: 16.3 - my-jetty-microservice.mjm.Building -->
<div class='topic'>
<p>
@@ -27671,21 +27651,21 @@
<br>Only the top-level resource needs to be annotated
with {@del org.apache.juneau.rest.springboot.annotation.JuneauRestRoot
@JuneauRestRoot}
<br><br>
<p class='bjava'>
- <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 @JuneauRestRoot</ja>
- <jk>public</jk> RootResources getRootResources() {
- <jk>return new</jk> RootResources();
- }
+ <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 @JuneauRestRoot</ja>
+ <jk>public</jk> RootResources getRootResources() {
+ <jk>return new</jk> RootResources();
+ }
+ }
</p>
<li>
<l>RootResources.java</l> - The top-level REST
resource.
@@ -27693,28 +27673,28 @@
<br>This is identical to the Jetty example.
<br><br>
<p class='bjava'>
- <ja>@Rest</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>
+ <ja>@Rest</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>
}
- )
- <jk>public class</jk> RootResources <jk>extends</jk>
BasicRestServletGroup <jk>implements</jk> BasicUniversalConfig {
- <jc>// No code</jc>
+ ),
+ children={
+ HelloWorldResource.<jk>class</jk>,
+ ConfigResource.<jk>class</jk>,
+ LogsResource.<jk>class</jk>
}
+ )
+ <jk>public class</jk> RootResources <jk>extends</jk>
BasicRestServletGroup <jk>implements</jk> BasicUniversalConfig {
+ <jc>// No code</jc>
+ }
</p>
<li>
<l>juneau.cfg</l> - The configuration file.
@@ -27724,45 +27704,45 @@
<br>Also it's located in the classpath so that our
microservice can be built as a single executable jar.
<br><br>
<p class='bini'>
-
<cc>#=======================================================================================================================
- # Basic configuration file for REST microservices
- # Subprojects can use this as a starting point.
-
#=======================================================================================================================</cc>
-
-
<cc>#=======================================================================================================================
- # REST settings
-
#=======================================================================================================================</cc>
- <cs>[REST]</cs>
-
- <cc># Comma-delimited list of key-value pairs that represent
locations of static files that can be served up by your @Rest-annotated
- # classes. These are static files that are served up by the
servlet under the specified sub-paths.
- # For example, given the following setting...
- # staticFiles = htdocs:my-docs,styles/my-styles
- # ...the URI "/servletPath/htdocs/javadoc.css" resolves to the
path "/my-docs/javadoc.css".
- # This path can be relative to the working directory, classpath
root, or package of your resource class.
- # Used by the BasicRestConfig interface that defines the
following value:
- # staticFiles="$C{REST/staticFiles}"</cc>
- <ck>staticFiles</ck> = htdocs:htdocs
-
- <cc># Stylesheet to use for HTML views.
- # Used by the BasicRestConfig interface that defines the
following value:
- #
stylesheet="$C{REST/theme,servlet:/htdocs/themes/devops.css}"</cc>
- <ck>theme</ck> = <cv>servlet:/htdocs/themes/devops.css</cv>
-
- <cc># Various look-and-feel settings used in the
BasicRestConfig interface.</cc>
- <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>
+
<cc>#=======================================================================================================================
+ # Basic configuration file for REST microservices
+ # Subprojects can use this as a starting point.
+
#=======================================================================================================================</cc>
+
+
<cc>#=======================================================================================================================
+ # REST settings
+
#=======================================================================================================================</cc>
+ <cs>[REST]</cs>
+
+ <cc># Comma-delimited list of key-value pairs that represent locations
of static files that can be served up by your @Rest-annotated
+ # classes. These are static files that are served up by the servlet
under the specified sub-paths.
+ # For example, given the following setting...
+ # staticFiles = htdocs:my-docs,styles/my-styles
+ # ...the URI "/servletPath/htdocs/javadoc.css" resolves to the path
"/my-docs/javadoc.css".
+ # This path can be relative to the working directory, classpath root,
or package of your resource class.
+ # Used by the BasicRestConfig interface that defines the following
value:
+ # staticFiles="$C{REST/staticFiles}"</cc>
+ <ck>staticFiles</ck> = htdocs:htdocs
+
+ <cc># Stylesheet to use for HTML views.
+ # Used by the BasicRestConfig interface that defines the following
value:
+ #
stylesheet="$C{REST/theme,servlet:/htdocs/themes/devops.css}"</cc>
+ <ck>theme</ck> = <cv>servlet:/htdocs/themes/devops.css</cv>
+
+ <cc># Various look-and-feel settings used in the BasicRestConfig
interface.</cc>
+ <ck>headerIcon</ck> = <cv>servlet:/htdocs/images/juneau.png</cv>
+ v <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>
diff --git a/juneau-doc/src/main/javadoc/resources/juneau-code.css
b/juneau-doc/src/main/javadoc/resources/juneau-code.css
index 971979516..d93e85158 100644
--- a/juneau-doc/src/main/javadoc/resources/juneau-code.css
+++ b/juneau-doc/src/main/javadoc/resources/juneau-code.css
@@ -90,13 +90,10 @@ bc {
/*--- Bordered code ---*/
p.bcode,p.bjava,p.bjson,p.bxml,p.bini,p.buon,p.burlenc,p.bconsole,p.bschema,
div.bcode,div.bjava,div.bjson,div.bxml,div.bini,div.buon,div.burlenc,div.bconsole,div.bschema
{
- border: 1px solid black;
- margin: 0px 20px;
- border-radius: 10px;
- overflow: hidden;
+ border-left: 3px solid #4c6b87;
+ margin: 0px 20px 5px 20px;
+ overflow: auto;
background-color: #f8f8f8;
- border-color: #cccccc;
- box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.5);
}
/*--- Bordered code in a section of a method doc ---*/
@@ -111,6 +108,7 @@ dd p.bschema, dd div.bschema,
dd p.bconsole, dd div.bconsole {
margin-left:0px;
margin-right:20px;
+ margin-bottom:5px;
}
/* Override padding bottom in javadoc comments. */
diff --git a/juneau-doc/src/main/javadoc/resources/juneau-doc.css
b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
index 34dbeb97e..dfbb7c3c5 100755
--- a/juneau-doc/src/main/javadoc/resources/juneau-doc.css
+++ b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
@@ -97,7 +97,7 @@ ul.normal { margin-top:0px; }
ul.normal li { font-size:100%; list-style:disc; }
/*--- Bordered images ---*/
-.bordered { border:1px solid #cccccc; margin:0px 20px; border-radius:10px;
box-shadow:1px 1px 1px 0px rgba(0, 0, 0, 0.5); }
+.bordered { border:1px solid #cccccc; margin:0px 20px; border-radius:10px; }
ol.toc, ul.toc, .toc ol, .toc ul { background:#dee3e9; margin:0px;
padding:0px; max-width:900px;}
ul.toc, .toc ul { list-style: disc; }
@@ -138,7 +138,7 @@ body > p:first-child {
}
/* Header styles */
-h5.toc, h5.topic { color:#2C4557; padding:5px 30px; margin-bottom:0px;
border-radius:10px 10px 10px 0px; text-decoration:none; box-shadow:1px 1px 1px
0px rgba(0, 0, 0, 0.5); }
+h5.toc, h5.topic { color:#2C4557; padding:5px 30px; margin-bottom:0px;
border-radius:10px 10px 10px 0px; text-decoration:none; }
/* Light-colored title on package summary pages */
div.docSummary > div.block,
@@ -217,7 +217,7 @@ hr { text-align:left; margin-left:0; max-width:900px; }
div.info, div.warn, div.severe {
background-image:url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhLS0gQ3JlYXRlZCB3aXRoIElua3NjYXBlIChodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy8pIC0tPgo8c3ZnIAoJaWQ9InN2ZzI4MTAiIAoJeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiAKCXhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiAKCWhlaWdodD0iMjQiIAoJd2lkdGg9IjQyIiAKCXZlcnNpb249IjEuMCIgCgl2aWV3Qm94PSIwIDAgNDgwIDQ4MCI+Cgk8ZGVmcyBpZD0iZGVmczI4MzYiPgoJCTxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWF
[...]
- background-repeat:no-repeat; background-position:left center;
padding:15px 50px; margin:10px 0px; width:800px;
+ background-repeat:no-repeat; background-position:left center;
padding:15px 50px; margin:10px 0px; width:720px;
}
div.info { background-color:#e9eefc; border-left:3px solid #1c43ba; }
div.warn { background-color:#faecd1; border-left:3px solid #b37700; }
