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
commit 75fc5bb00c1f3113bf1db08717946b427cdc8d34 Author: JamesBognar <[email protected]> AuthorDate: Sun Sep 18 08:29:17 2022 -0400 Javadocs --- juneau-doc/docs/Topics/01.Overview.html | 15 +--- ....juneau.http.html => 01.jrc.HelperClasses.html} | 15 +++- ...ttp.annotation.html => 02.jrc.Annotations.html} | 4 +- ...au.http.header.html => 03.jrc.HttpHeaders.html} | 2 +- ...juneau.http.part.html => 04.jrc.HttpParts.html} | 2 +- ...ntity.html => 05.HttpEntitiesAndResources.html} | 31 +++++++- ...ttp.response.html => 06.jrc.HttpResponses.html} | 2 +- .../06.jrc.org.apache.juneau.http.resource.html | 84 --------------------- ...mote.html => 07.jrc.RemoteProxyInterfaces.html} | 2 +- .../01.jrs.PredefinedClasses.html | 12 --- .../docs/Topics/09.juneau-rest-server-rdf.html | 43 ----------- ....html => 09.juneau-rest-server-springboot.html} | 0 .../01.jrss.Overview.html | 0 .../doc-files/jrss.Overview.HelloWorldResource.png | Bin .../doc-files/jrss.Overview.RootResources.json.png | Bin .../doc-files/jrss.Overview.RootResources.png | Bin ...rest-client.html => 10.juneau-rest-client.html} | 0 .../01.jrc.PojoMarshalling.html | 0 .../02.jrc.RequestParts.html | 0 .../03.jrc.RequestContent.html | 0 .../04.jrc.ResponseStatus.html | 0 .../05.jrc.ResponseHeaders.html | 0 .../06.jrc.ResponseContent.html | 0 .../07.jrc.CustomCallHandlers.html | 0 .../08.jrc.Interceptors.html | 0 .../09.jrc.Proxies.html | 0 .../09.jrc.Proxies/01.jrc.Remote.html | 0 .../09.jrc.Proxies/02.jrc.RemoteMethod.html | 0 .../09.jrc.Proxies/03.jrc.Content.html | 0 .../09.jrc.Proxies/04.jrc.FormData.html | 0 .../09.jrc.Proxies/05.jrc.Query.html | 0 .../09.jrc.Proxies/06.jrc.Header.html | 0 .../09.jrc.Proxies/07.jrc.Path.html | 0 .../09.jrc.Proxies/08.jrc.Request.html | 0 .../09.jrc.Proxies/09.jrc.Response.html | 0 .../10.jrc.DualPurposeInterfaces.html | 0 .../10.jrc.LoggingAndDebugging.html | 0 .../11.jrc.CustomizingHttpClient.html | 0 .../12.jrc.ExtendingRestClient.html | 0 .../13.jrc.Authentication.html | 0 .../01.jrc.AuthenticationBASIC.html | 0 .../02.jrc.AuthenticationForm.html | 0 .../03.jrc.AuthenticationOIDC.html | 0 .../docs/Topics/10.juneau-rest-server-jaxrs.html | 43 ----------- .../01.jrsj.BaseProvider.html | 80 -------------------- ...eau-rest-mock.html => 11.juneau-rest-mock.html} | 0 .../01.jrm.MockRestClient.html | 0 ...-core.html => 12.juneau-microservice-core.html} | 0 .../01.jmc.Overview.html | 0 .../02.jmc.LifecycleMethods.html | 0 .../03.jmc.Args.html | 0 .../04.jmc.Manifest.html | 0 .../05.jmc.Config.html | 0 .../06.jmc.SystemProperties.html | 0 .../07.jmc.VarResolver.html | 0 .../08.jmc.ConsoleCommands.html | 0 .../09.jmc.Listeners.html | 0 ...etty.html => 13.juneau-microservice-jetty.html} | 0 .../01.jmj.Overview.html | 0 .../02.jmj.LifecycleMethods.html | 0 .../03.jmj.ResourceClasses.html | 0 .../04.jmj.PredefinedResourceClasses.html | 0 .../05.jmj.Config.html | 0 .../06.jmj.JettyXml.html | 0 .../07.jmj.UiCustomization.html | 0 .../08.jmj.Extending.html | 0 .../doc-files/jmj.ResourceClasses.1.png | Bin .../doc-files/jmj.Running.1.png | Bin .../doc-files/jmj.UiCustomization.1.png | Bin ...oservice.html => 14.my-jetty-microservice.html} | 0 .../01.mjm.Installing.html | 0 .../02.mjm.Running.html | 0 .../03.mjm.Building.html | 0 .../doc-files/mjm.Installing.1.png | Bin .../doc-files/mjm.Installing.2.png | Bin .../doc-files/mjm.Installing.3.png | Bin .../doc-files/mjm.Running.1.png | Bin ...ice.html => 15.my-springboot-microservice.html} | 0 .../01.msm.Installing.html | 0 .../02.msm.Running.html | 0 .../03.msm.Building.html | 0 .../doc-files/msm.Installing.1.png | Bin .../doc-files/msm.Installing.2.png | Bin .../doc-files/msm.Installing.3.png | Bin .../doc-files/msm.Running.1.png | Bin ...uneau-petstore.html => 16.juneau-petstore.html} | 0 .../01.jp.RunningTheApp.html | 0 .../02.jp.juneau-petstore-api.html | 0 .../03.jp.juneau-petstore-client.html | 0 .../04.jp.juneau-petstore-server.html | 0 .../doc-files/9a.png | Bin .../doc-files/9b.png | Bin .../doc-files/9c.png | Bin .../doc-files/9d.png | Bin .../doc-files/9e.png | Bin .../doc-files/9f.png | Bin .../doc-files/9g.png | Bin .../doc-files/9h.png | Bin .../doc-files/PetStore.png | Bin .../doc-files/PetStore_pets.png | Bin .../doc-files/RootResources.png | Bin .../{19.Glossaries.html => 17.Glossaries.html} | 0 .../01.g.LanguageSupport.html | 0 .../02.g.Annotations.html | 0 .../Topics/{20.Security.html => 18.Security.html} | 0 .../01.s.Marshall.html | 0 .../{20.Security => 18.Security}/02.s.Svl.html | 0 .../{20.Security => 18.Security}/03.s.Rest.html | 0 108 files changed, 46 insertions(+), 289 deletions(-) diff --git a/juneau-doc/docs/Topics/01.Overview.html b/juneau-doc/docs/Topics/01.Overview.html index 889c00b52..7675a5b2e 100644 --- a/juneau-doc/docs/Topics/01.Overview.html +++ b/juneau-doc/docs/Topics/01.Overview.html @@ -97,7 +97,7 @@ </td> </tr> <tr class='light bb'> - <td rowspan="7" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-rest</td> + <td rowspan="6" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-rest</td> <td class='code'><a class='doclink' href='#juneau-rest-server'>juneau-rest-common</a></td> <td> <ul> @@ -136,19 +136,6 @@ </ul> </td> </tr> - <tr class='light bb'> - <td class='code'><a class='doclink' href='#juneau-rest-server-jaxrs'>juneau-rest-server-jaxrs</a></td> - <td> - <ul> - <li>REST JAX-RS integration - <ul> - </td> - <td> - <ul style='margin:0px 10px;'> - <li>JAX-RS 2+</li> - </ul> - </td> - </tr> <tr class='light bb'> <td class='code'><a class='doclink' href='#juneau-rest-client'>juneau-rest-client</a></td> <td> diff --git a/juneau-doc/docs/Topics/07.juneau-rest-common/01.jrc.org.apache.juneau.http.html b/juneau-doc/docs/Topics/07.juneau-rest-common/01.jrc.HelperClasses.html similarity index 96% rename from juneau-doc/docs/Topics/07.juneau-rest-common/01.jrc.org.apache.juneau.http.html rename to juneau-doc/docs/Topics/07.juneau-rest-common/01.jrc.HelperClasses.html index c0e35bed6..9cc4f08c2 100644 --- a/juneau-doc/docs/Topics/07.juneau-rest-common/01.jrc.org.apache.juneau.http.html +++ b/juneau-doc/docs/Topics/07.juneau-rest-common/01.jrc.HelperClasses.html @@ -13,7 +13,7 @@ ***************************************************************************************************************************/ --> -{title:'org.apache.juneau.http', created:'9.0.0'} +{title:'Helper Classes', created:'9.0.0'} <div class='topic'> <p> @@ -182,6 +182,15 @@ <p> HTTP entities are automatically supported in both the server and client REST APIs for requests and responses. </p> + <h5 class='figure'>Example:</h5> + <p class='bjava'> + | <jk>import static</jk> org.apache.juneau.http.HttpResources.*; + | + | <ja>@RestDelete</ja>(path=<js>"/{id}"</js>) + | <jk>public</jk> HttpEntity helloWold(...) { + | <jk>return</jk> <jsm>stringEntity</jsm>(<js>"Hello!"</js>).contentType(<js>"text/plain"</js>); + | } + </p> <h5 class='topic'>HttpResources</h5> <p> @@ -209,7 +218,7 @@ | | <ja>@RestDelete</ja>(path=<js>"/{id}"</js>) | <jk>public</jk> HttpResource helloWold(...) { - | <jk>return</jk> <jsm>stringResource</jsm>(<js>"Hello!"</js>).contentType(<js>"text/plain"</js>); + | <jk>return</jk> <jsm>stringResource</jsm>(<js>"Hello!"</js>).contentType(<js>"text/plain"</js>).header(<js>"Cache-Control"</js>, <js>"none"</js>); | } </p> @@ -291,7 +300,7 @@ | <jk>public</jk> Ok doDelete(...) <jk>throws</jk> Unauthorized { | <jk>if</jk> (<jc>/* user not authorized*/</jc>) | <jk>throw</jk> <jsm>unauthorized</jsm>(); - | <jk>return</jk> <jsm>ok</jsm>().content(<js>"OK"</js>).header(<jsm>contentType</jsm>(<js>"text/plain"</js>)); + | <jk>return</jk> <jsm>ok</jsm>().content(<js>"Delete was successful"</js>); | } </p> </div> \ No newline at end of file diff --git a/juneau-doc/docs/Topics/07.juneau-rest-common/02.jrc.org.apache.juneau.http.annotation.html b/juneau-doc/docs/Topics/07.juneau-rest-common/02.jrc.Annotations.html similarity index 95% rename from juneau-doc/docs/Topics/07.juneau-rest-common/02.jrc.org.apache.juneau.http.annotation.html rename to juneau-doc/docs/Topics/07.juneau-rest-common/02.jrc.Annotations.html index ae88862b8..6ffb9b343 100644 --- a/juneau-doc/docs/Topics/07.juneau-rest-common/02.jrc.org.apache.juneau.http.annotation.html +++ b/juneau-doc/docs/Topics/07.juneau-rest-common/02.jrc.Annotations.html @@ -13,7 +13,7 @@ ***************************************************************************************************************************/ --> -{title:'org.apache.juneau.http.annotation', created:'9.0.0'} +{title:'Annotations', created:'9.0.0'} <div class='topic'> <p> @@ -38,6 +38,6 @@ </ul> <p> These annotations are used in a variety of places in the server and client side REST interfaces, especially for - remote proxies. + remote proxies. These will be described later in those sections. </p> </div> \ No newline at end of file diff --git a/juneau-doc/docs/Topics/07.juneau-rest-common/03.jrc.org.apache.juneau.http.header.html b/juneau-doc/docs/Topics/07.juneau-rest-common/03.jrc.HttpHeaders.html similarity index 99% rename from juneau-doc/docs/Topics/07.juneau-rest-common/03.jrc.org.apache.juneau.http.header.html rename to juneau-doc/docs/Topics/07.juneau-rest-common/03.jrc.HttpHeaders.html index e4ea9662b..0d25a8511 100644 --- a/juneau-doc/docs/Topics/07.juneau-rest-common/03.jrc.org.apache.juneau.http.header.html +++ b/juneau-doc/docs/Topics/07.juneau-rest-common/03.jrc.HttpHeaders.html @@ -13,7 +13,7 @@ ***************************************************************************************************************************/ --> -{title:'org.apache.juneau.http.header', created:'9.0.0'} +{title:'HTTP Headers', created:'9.0.0'} <div class='topic'> <p> diff --git a/juneau-doc/docs/Topics/07.juneau-rest-common/04.jrc.org.apache.juneau.http.part.html b/juneau-doc/docs/Topics/07.juneau-rest-common/04.jrc.HttpParts.html similarity index 99% rename from juneau-doc/docs/Topics/07.juneau-rest-common/04.jrc.org.apache.juneau.http.part.html rename to juneau-doc/docs/Topics/07.juneau-rest-common/04.jrc.HttpParts.html index 8a2f2714b..d3dea2b75 100644 --- a/juneau-doc/docs/Topics/07.juneau-rest-common/04.jrc.org.apache.juneau.http.part.html +++ b/juneau-doc/docs/Topics/07.juneau-rest-common/04.jrc.HttpParts.html @@ -13,7 +13,7 @@ ***************************************************************************************************************************/ --> -{title:'org.apache.juneau.http.part', created:'9.0.0'} +{title:'HTTP Parts', created:'9.0.0'} <div class='topic'> <p> diff --git a/juneau-doc/docs/Topics/07.juneau-rest-common/05.jrc.org.apache.juneau.http.entity.html b/juneau-doc/docs/Topics/07.juneau-rest-common/05.HttpEntitiesAndResources.html similarity index 67% rename from juneau-doc/docs/Topics/07.juneau-rest-common/05.jrc.org.apache.juneau.http.entity.html rename to juneau-doc/docs/Topics/07.juneau-rest-common/05.HttpEntitiesAndResources.html index f693a16c1..c73e9a143 100644 --- a/juneau-doc/docs/Topics/07.juneau-rest-common/05.jrc.org.apache.juneau.http.entity.html +++ b/juneau-doc/docs/Topics/07.juneau-rest-common/05.HttpEntitiesAndResources.html @@ -13,11 +13,17 @@ ***************************************************************************************************************************/ --> -{title:'org.apache.juneau.http.entity', created:'9.0.0'} +{title:'HTTP Entities and Resources', created:'9.0.0'} <div class='topic'> <p> - The {@link oaj.http.entity} package contains implementations of <c>org.apache.http.HttpEntity</c>. + The {@link oaj.http.entity} package contains implementations of <c>org.apache.http.HttpEntity</c>. These are + entities that can be sent or received with an HTTP message. They consist of a message body and the headers + <c>Content-Type</c>, <c>Content-Length</c>, and <c>Content-Encoding</c>. + </p> + <p> + The {@link oaj.http.resource} package contains implementations of {@link oaj.http.resource.HttpResource} which are extensions of <c>org.apache.http.HttpEntity</c> with + arbitrary headers added beyond the standard content headers. </p> <ul class='javatree'> <li class='jic'>{@code org.apache.http.HttpEntity} @@ -31,6 +37,17 @@ <li class='jc'>{@link oaj.http.entity.SerializedEntity} <li class='jc'>{@link oaj.http.entity.StringEntity} </ul> + <li class='jic'>{@link oaj.http.resource.HttpResource} + <ul> + <li class='jc'>{@link oaj.http.resource.BasicResource} + <ul class='javatreec'> + <li class='jc'>{@link oaj.http.resource.ByteArrayResource} + <li class='jc'>{@link oaj.http.resource.FileResource} + <li class='jc'>{@link oaj.http.resource.StreamResource} + <li class='jc'>{@link oaj.http.resource.ReaderResource} + <li class='jc'>{@link oaj.http.resource.StringResource} + </ul> + </ul> </ul> </ul> @@ -51,18 +68,24 @@ </p> <p> - HttpEntities can be used by both the server and client side APIs described in later sections. + HTTP entities and resources can be used by both the server and client side APIs described in later sections. </p> <h5 class='figure'>Server-side example:</h5> <p class='bjava'> | <jc>// REST endpoint that simply echos an HTTP entity.</jc> - | | <ja>@RestPost</ja>(path=<js>"/entity"</js>) | <jk>public</jk> HttpEntity echoMyEntity(HttpEntity <jv>entity</jv>) { | <jk>return</jk> <jv>entity</jv>; | } + | + | <jc>// REST endpoint that serves up a static file.</jc> + | <ja>@RestGet</ja>(path=<js>"/resource/{fileName}"</js>) + | <jk>public</jk> HttpResource getStaticFile(<ja>@Path</ja> String <jv>fileName</jv>, Locale <jv>locale</jv>) { + | getContext().getStaticFiles().resolve(<jv>fileName</jv>, <jv>locale</jv>).orElseThrow(NotFound::<jk>new</jk>); + | } </p> + <h5 class='figure'>Client-side example:</h5> <p class='bjava'> | <jc>// REST client that uses the echo REST endpoint above.</jc> diff --git a/juneau-doc/docs/Topics/07.juneau-rest-common/07.jrc.org.apache.juneau.http.response.html b/juneau-doc/docs/Topics/07.juneau-rest-common/06.jrc.HttpResponses.html similarity index 98% rename from juneau-doc/docs/Topics/07.juneau-rest-common/07.jrc.org.apache.juneau.http.response.html rename to juneau-doc/docs/Topics/07.juneau-rest-common/06.jrc.HttpResponses.html index f597e23f8..800817c41 100644 --- a/juneau-doc/docs/Topics/07.juneau-rest-common/07.jrc.org.apache.juneau.http.response.html +++ b/juneau-doc/docs/Topics/07.juneau-rest-common/06.jrc.HttpResponses.html @@ -13,7 +13,7 @@ ***************************************************************************************************************************/ --> -{title:'org.apache.juneau.http.response', created:'9.0.0'} +{title:'HTTP Responses', created:'9.0.0'} <div class='topic'> <p> diff --git a/juneau-doc/docs/Topics/07.juneau-rest-common/06.jrc.org.apache.juneau.http.resource.html b/juneau-doc/docs/Topics/07.juneau-rest-common/06.jrc.org.apache.juneau.http.resource.html deleted file mode 100644 index 6915462a8..000000000 --- a/juneau-doc/docs/Topics/07.juneau-rest-common/06.jrc.org.apache.juneau.http.resource.html +++ /dev/null @@ -1,84 +0,0 @@ -<!-- -/*************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - ***************************************************************************************************************************/ - --> - -{title:'org.apache.juneau.http.resource', created:'9.0.0'} - -<div class='topic'> - <p> - The {@link oaj.http.resource} package contains implementations of {@link oaj.http.resource.HttpResource} which are extensions of <c>org.apache.http.HttpEntity</c> with - arbitrary headers added. - </p> - <ul class='javatree'> - <li class='jic'>{@code org.apache.http.HttpEntity} - <ul> - <li class='jic'>{@link oaj.http.resource.HttpResource} - <ul> - <li class='jc'>{@link oaj.http.resource.BasicResource} - <ul class='javatreec'> - <li class='jc'>{@link oaj.http.resource.ByteArrayResource} - <li class='jc'>{@link oaj.http.resource.FileResource} - <li class='jc'>{@link oaj.http.resource.StreamResource} - <li class='jc'>{@link oaj.http.resource.ReaderResource} - <li class='jc'>{@link oaj.http.resource.StringResource} - </ul> - </ul> - </ul> - </ul> - - <h5 class='figure'>Example</h5> - <p class='bjava'> - | <jk>import static</jk> org.apache.juneau.http.HttpResources.*; - | - | <jk>byte</jk>[] <jv>payload</jv> = {...}; - | - | <jc>// Create via type builder.</jc> - | HttpResource <jv>resource</jv> = ByteArrayResource - | .<jsm>create</jsm>() - | .content(<jv>payload</jv>) - | .contentType(ContentType.<jsf>APPLICATION_OCTET_STREAM</jsf>); - | - | <jc>// Create via HttpResources.</jc> - | HttpResource <jv>resource</jv> = <jsm>byteArrayResource</jsm>(<jv>payload</jv>, ContentType.<jsf>APPLICATION_OCTET_STREAM</jsf>); - </p> - - <p> - HttpResources can be used by both the server and client side APIs described in later sections. - </p> - <h5 class='figure'>Server-side example:</h5> - <p class='bjava'> - | <jc>// REST endpoint that simply echos an HTTP resource.</jc> - | - | <ja>@RestPost</ja>(path=<js>"/resource"</js>) - | <jk>public</jk> HttpResource echoMyEntity(HttpResource <jv>resource</jv>) { - | <jk>return</jk> <jv>resource</jv>; - | } - </p> - - <h5 class='figure'>Client-side example:</h5> - <p class='bjava'> - | <jc>// REST client that uses the echo REST endpoint above.</jc> - | - | HttpEntity <jv>resource</jv> = <jsm>byteArrayResource</jsm>(...); - | - | <jv>resource</jv> = RestClient.<jsm>create</jsm>() - | .build() - | .rootUrl(<jsf>URI</jsf>) - | .post(<js>"/resource"</js>, <jv>resource</jv>) - | .run() - | .assertStatus().asCode().is(200) - | .getContent().as(ByteArrayResource.<jk>class</jk>); - </p> - -</div> \ No newline at end of file diff --git a/juneau-doc/docs/Topics/07.juneau-rest-common/08.jrc.org.apache.juneau.http.remote.html b/juneau-doc/docs/Topics/07.juneau-rest-common/07.jrc.RemoteProxyInterfaces.html similarity index 96% rename from juneau-doc/docs/Topics/07.juneau-rest-common/08.jrc.org.apache.juneau.http.remote.html rename to juneau-doc/docs/Topics/07.juneau-rest-common/07.jrc.RemoteProxyInterfaces.html index d8a82940a..c9d9b2765 100644 --- a/juneau-doc/docs/Topics/07.juneau-rest-common/08.jrc.org.apache.juneau.http.remote.html +++ b/juneau-doc/docs/Topics/07.juneau-rest-common/07.jrc.RemoteProxyInterfaces.html @@ -13,7 +13,7 @@ ***************************************************************************************************************************/ --> -{title:'org.apache.juneau.http.remote', created:'9.0.0'} +{title:'Remote Proxy Interfaces', created:'9.0.0'} <div class='topic'> <p> diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html b/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html index fc4858d0c..ed264a532 100644 --- a/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html +++ b/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html @@ -85,18 +85,6 @@ <ul class='javatree'> <li class='jac'>{@link oajr.servlet.RestServlet} <ul class='spaced-list'> - <li>Predefined lifecycle hook methods: - <ul class='javatreec'> - <li class='jm'>{@link oajr.servlet.RestServlet#onInit(RestContext.Builder) onInit()} - <li class='jm'>{@link oajr.servlet.RestServlet#onPostInit(RestContext) onPostInit()} - <li class='jm'>{@link oajr.servlet.RestServlet#onPostInitChildFirst(RestContext) onPostInitChildFirst()} - <li class='jm'>{@link oajr.servlet.RestServlet#onStartCall(HttpServletRequest,HttpServletResponse) onStartCall()} - <li class='jm'>{@link oajr.servlet.RestServlet#onPreCall(RestRequest,RestResponse) onPreCall()} - <li class='jm'>{@link oajr.servlet.RestServlet#onPostCall(RestRequest,RestResponse) onPostCall()} - <li class='jm'>{@link oajr.servlet.RestServlet#onEndCall(HttpServletRequest,HttpServletResponse) onEndCall()} - <li class='jm'>{@link oajr.servlet.RestServlet#onDestroy(RestContext) onDestroy()} - </ul> - </li> <li>Logging methods: <ul class='javatreec'> <li class='jm'>{@link oajr.servlet.RestServlet#log(Level,String,Object...) log(Level,String,Object...)} diff --git a/juneau-doc/docs/Topics/09.juneau-rest-server-rdf.html b/juneau-doc/docs/Topics/09.juneau-rest-server-rdf.html deleted file mode 100644 index 4151d059d..000000000 --- a/juneau-doc/docs/Topics/09.juneau-rest-server-rdf.html +++ /dev/null @@ -1,43 +0,0 @@ -<!-- -/*************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - ***************************************************************************************************************************/ - --> - -{title:'juneau-rest-server-rdf'} - -<div class='topic'> - <h5 class='figure'>Maven Dependency</h5> - <p class='bxml w500'> - | <xt><dependency></xt> - | <xt><groupId></xt>org.apache.juneau<xt></groupId></xt> - | <xt><artifactId></xt>juneau-rest-server-jaxrs<xt></artifactId></xt> - | <xt><version></xt>{@property juneauVersion}<xt></version></xt> - | <xt></dependency></xt> - </p> - - <h5 class='figure'>Java Library</h5> - <p class='bcode w500'> - | juneau-rest-server-jaxrs-{@property juneauVersion}.jar - </p> - - <h5 class='figure'>OSGi Module</h5> - <p class='bcode w500'> - | org.apache.juneau.rest.server_{@property juneauVersion}.jar - </p> - - <p> - The <c>juneau-rest-server-jaxrs</c> library provides an implementation of a <c>MessageBodyReader</c> - and <c>MessageBodyWriter</c> to allow any of the Juneau serializers and parsers to be used in a - JAX/RS environment. - </p> -</div> \ No newline at end of file diff --git a/juneau-doc/docs/Topics/11.juneau-rest-server-springboot.html b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot.html similarity index 100% rename from juneau-doc/docs/Topics/11.juneau-rest-server-springboot.html rename to juneau-doc/docs/Topics/09.juneau-rest-server-springboot.html diff --git a/juneau-doc/docs/Topics/11.juneau-rest-server-springboot/01.jrss.Overview.html b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html similarity index 100% rename from juneau-doc/docs/Topics/11.juneau-rest-server-springboot/01.jrss.Overview.html rename to juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html diff --git a/juneau-doc/docs/Topics/11.juneau-rest-server-springboot/doc-files/jrss.Overview.HelloWorldResource.png b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/doc-files/jrss.Overview.HelloWorldResource.png similarity index 100% rename from juneau-doc/docs/Topics/11.juneau-rest-server-springboot/doc-files/jrss.Overview.HelloWorldResource.png rename to juneau-doc/docs/Topics/09.juneau-rest-server-springboot/doc-files/jrss.Overview.HelloWorldResource.png diff --git a/juneau-doc/docs/Topics/11.juneau-rest-server-springboot/doc-files/jrss.Overview.RootResources.json.png b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/doc-files/jrss.Overview.RootResources.json.png similarity index 100% rename from juneau-doc/docs/Topics/11.juneau-rest-server-springboot/doc-files/jrss.Overview.RootResources.json.png rename to juneau-doc/docs/Topics/09.juneau-rest-server-springboot/doc-files/jrss.Overview.RootResources.json.png diff --git a/juneau-doc/docs/Topics/11.juneau-rest-server-springboot/doc-files/jrss.Overview.RootResources.png b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/doc-files/jrss.Overview.RootResources.png similarity index 100% rename from juneau-doc/docs/Topics/11.juneau-rest-server-springboot/doc-files/jrss.Overview.RootResources.png rename to juneau-doc/docs/Topics/09.juneau-rest-server-springboot/doc-files/jrss.Overview.RootResources.png diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client.html b/juneau-doc/docs/Topics/10.juneau-rest-client.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client.html rename to juneau-doc/docs/Topics/10.juneau-rest-client.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/01.jrc.PojoMarshalling.html b/juneau-doc/docs/Topics/10.juneau-rest-client/01.jrc.PojoMarshalling.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/01.jrc.PojoMarshalling.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/01.jrc.PojoMarshalling.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/02.jrc.RequestParts.html b/juneau-doc/docs/Topics/10.juneau-rest-client/02.jrc.RequestParts.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/02.jrc.RequestParts.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/02.jrc.RequestParts.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/03.jrc.RequestContent.html b/juneau-doc/docs/Topics/10.juneau-rest-client/03.jrc.RequestContent.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/03.jrc.RequestContent.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/03.jrc.RequestContent.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/04.jrc.ResponseStatus.html b/juneau-doc/docs/Topics/10.juneau-rest-client/04.jrc.ResponseStatus.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/04.jrc.ResponseStatus.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/04.jrc.ResponseStatus.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/05.jrc.ResponseHeaders.html b/juneau-doc/docs/Topics/10.juneau-rest-client/05.jrc.ResponseHeaders.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/05.jrc.ResponseHeaders.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/05.jrc.ResponseHeaders.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/06.jrc.ResponseContent.html b/juneau-doc/docs/Topics/10.juneau-rest-client/06.jrc.ResponseContent.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/06.jrc.ResponseContent.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/06.jrc.ResponseContent.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/07.jrc.CustomCallHandlers.html b/juneau-doc/docs/Topics/10.juneau-rest-client/07.jrc.CustomCallHandlers.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/07.jrc.CustomCallHandlers.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/07.jrc.CustomCallHandlers.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/08.jrc.Interceptors.html b/juneau-doc/docs/Topics/10.juneau-rest-client/08.jrc.Interceptors.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/08.jrc.Interceptors.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/08.jrc.Interceptors.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies.html b/juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/01.jrc.Remote.html b/juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/01.jrc.Remote.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/01.jrc.Remote.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/01.jrc.Remote.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/02.jrc.RemoteMethod.html b/juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/02.jrc.RemoteMethod.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/02.jrc.RemoteMethod.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/02.jrc.RemoteMethod.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/03.jrc.Content.html b/juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/03.jrc.Content.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/03.jrc.Content.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/03.jrc.Content.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/04.jrc.FormData.html b/juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/04.jrc.FormData.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/04.jrc.FormData.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/04.jrc.FormData.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/05.jrc.Query.html b/juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/05.jrc.Query.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/05.jrc.Query.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/05.jrc.Query.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/06.jrc.Header.html b/juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/06.jrc.Header.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/06.jrc.Header.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/06.jrc.Header.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/07.jrc.Path.html b/juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/07.jrc.Path.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/07.jrc.Path.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/07.jrc.Path.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/08.jrc.Request.html b/juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/08.jrc.Request.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/08.jrc.Request.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/08.jrc.Request.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/09.jrc.Response.html b/juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/09.jrc.Response.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/09.jrc.Response.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/09.jrc.Response.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/10.jrc.DualPurposeInterfaces.html b/juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/10.jrc.DualPurposeInterfaces.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/09.jrc.Proxies/10.jrc.DualPurposeInterfaces.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/09.jrc.Proxies/10.jrc.DualPurposeInterfaces.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/10.jrc.LoggingAndDebugging.html b/juneau-doc/docs/Topics/10.juneau-rest-client/10.jrc.LoggingAndDebugging.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/10.jrc.LoggingAndDebugging.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/10.jrc.LoggingAndDebugging.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/11.jrc.CustomizingHttpClient.html b/juneau-doc/docs/Topics/10.juneau-rest-client/11.jrc.CustomizingHttpClient.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/11.jrc.CustomizingHttpClient.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/11.jrc.CustomizingHttpClient.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/12.jrc.ExtendingRestClient.html b/juneau-doc/docs/Topics/10.juneau-rest-client/12.jrc.ExtendingRestClient.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/12.jrc.ExtendingRestClient.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/12.jrc.ExtendingRestClient.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/13.jrc.Authentication.html b/juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/13.jrc.Authentication.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/13.jrc.Authentication/01.jrc.AuthenticationBASIC.html b/juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication/01.jrc.AuthenticationBASIC.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/13.jrc.Authentication/01.jrc.AuthenticationBASIC.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication/01.jrc.AuthenticationBASIC.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/13.jrc.Authentication/02.jrc.AuthenticationForm.html b/juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication/02.jrc.AuthenticationForm.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/13.jrc.Authentication/02.jrc.AuthenticationForm.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication/02.jrc.AuthenticationForm.html diff --git a/juneau-doc/docs/Topics/12.juneau-rest-client/13.jrc.Authentication/03.jrc.AuthenticationOIDC.html b/juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication/03.jrc.AuthenticationOIDC.html similarity index 100% rename from juneau-doc/docs/Topics/12.juneau-rest-client/13.jrc.Authentication/03.jrc.AuthenticationOIDC.html rename to juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication/03.jrc.AuthenticationOIDC.html diff --git a/juneau-doc/docs/Topics/10.juneau-rest-server-jaxrs.html b/juneau-doc/docs/Topics/10.juneau-rest-server-jaxrs.html deleted file mode 100644 index 82edc8e11..000000000 --- a/juneau-doc/docs/Topics/10.juneau-rest-server-jaxrs.html +++ /dev/null @@ -1,43 +0,0 @@ -<!-- -/*************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - ***************************************************************************************************************************/ - --> - -{title:'juneau-rest-server-jaxrs'} - -<div class='topic'> - <h5 class='figure'>Maven Dependency</h5> - <p class='bxml w500'> - | <xt><dependency></xt> - | <xt><groupId></xt>org.apache.juneau<xt></groupId></xt> - | <xt><artifactId></xt>juneau-rest-server-jaxrs<xt></artifactId></xt> - | <xt><version></xt>{@property juneauVersion}<xt></version></xt> - | <xt></dependency></xt> - </p> - - <h5 class='figure'>Java Library</h5> - <p class='bcode w500'> - | juneau-rest-server-jaxrs-{@property juneauVersion}.jar - </p> - - <h5 class='figure'>OSGi Module</h5> - <p class='bcode w500'> - | org.apache.juneau.rest.server_{@property juneauVersion}.jar - </p> - - <p> - The <c>juneau-rest-server-jaxrs</c> library provides an implementation of a <c>MessageBodyReader</c> - and <c>MessageBodyWriter</c> to allow any of the Juneau serializers and parsers to be used in a - JAX/RS environment. - </p> -</div> \ No newline at end of file diff --git a/juneau-doc/docs/Topics/10.juneau-rest-server-jaxrs/01.jrsj.BaseProvider.html b/juneau-doc/docs/Topics/10.juneau-rest-server-jaxrs/01.jrsj.BaseProvider.html deleted file mode 100644 index 44f4c4055..000000000 --- a/juneau-doc/docs/Topics/10.juneau-rest-server-jaxrs/01.jrsj.BaseProvider.html +++ /dev/null @@ -1,80 +0,0 @@ -<!-- -/*************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - ***************************************************************************************************************************/ - --> - -{title:'Juneau JAX-RS Provider'} - -<div class='topic'> - <p> - The Juneau framework contains the <l>juneau-rest-server-jaxrs</l> bundle for performing simple - integration of Juneau serializers and parsers in JAX-RS compliant environments. - </p> - <p> - It should be noted that although some of the functionality of the Juneau Server API is provided through the JAX-RS - integration components, it is not nearly as flexible as using the {@link oajr.servlet.RestServlet} class directly. - </p> - <p> - What you can do with the Juneau JAX-RS provider classes: - </p> - <ul class='spaced-list'> - <li> - Use existing Juneau serializers and parsers for converting streams to POJOs and vis-versa. - <li> - Use annotations to specify filters and properties using the {@link oajr.annotation.RestOp @RestOp} - and {@link oajr.jaxrs.JuneauProvider} annotations. - </ul> - <p> - What you can't do with the Juneau JAX-RS provider classes: - </p> - <ul class='spaced-list'> - <li> - Specify or override serializers/parsers at the Java class and method levels. - <br>JAX-RS does not provide the capability to use different providers for the same media types - at the class or method levels. - <li> - Specify or override filters and properties at the Java class level. - <li> - Default stylesheets for the {@link oaj.html.HtmlDocSerializer} class. - <br>It will produce HTML but it won't contain any styles applied. - <li> - The ability to specify HTTP method, headers, and content using GET parameters. - <br>These make debugging REST interfaces using only a browser possible. - <li> - Class or method level encoding. - <li> - Class or method level guards. - <li> - Class or method level converters. - </ul> - - <p> - The Juneau JAX-RS provider API consists of the following classes: - </p> - <ul class='javatree'> - <li class='jc'> - {@link oajr.jaxrs.BaseProvider} - The base provider class that implements the JAX-RS - <c>MessageBodyReader</c> and <c>MessageBodyWriter</c> interfaces. - <li class='jc'> - {@link oajr.jaxrs.JuneauProvider} - Annotation that is applied to subclasses of <c>BaseProvider</c> - to specify the serializers/parsers associated with a provider, and optionally filters and properties to - apply to those serializers and parsers. - <li class='jc'> - {@link oajr.jaxrs.BasicProvider} - A default provider that provides the same level - of media type support as the {@link oajr.servlet.BasicRestServlet} class. - </ul> - <p> - For the most part, when using these components, you'll either use the existing <l>BasicProvider</l>, - or define your own by subclassing <l>BaseProvider</l>. - </p> -</div> \ No newline at end of file diff --git a/juneau-doc/docs/Topics/13.juneau-rest-mock.html b/juneau-doc/docs/Topics/11.juneau-rest-mock.html similarity index 100% rename from juneau-doc/docs/Topics/13.juneau-rest-mock.html rename to juneau-doc/docs/Topics/11.juneau-rest-mock.html diff --git a/juneau-doc/docs/Topics/13.juneau-rest-mock/01.jrm.MockRestClient.html b/juneau-doc/docs/Topics/11.juneau-rest-mock/01.jrm.MockRestClient.html similarity index 100% rename from juneau-doc/docs/Topics/13.juneau-rest-mock/01.jrm.MockRestClient.html rename to juneau-doc/docs/Topics/11.juneau-rest-mock/01.jrm.MockRestClient.html diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-core.html b/juneau-doc/docs/Topics/12.juneau-microservice-core.html similarity index 100% rename from juneau-doc/docs/Topics/14.juneau-microservice-core.html rename to juneau-doc/docs/Topics/12.juneau-microservice-core.html diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-core/01.jmc.Overview.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/01.jmc.Overview.html similarity index 100% rename from juneau-doc/docs/Topics/14.juneau-microservice-core/01.jmc.Overview.html rename to juneau-doc/docs/Topics/12.juneau-microservice-core/01.jmc.Overview.html diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-core/02.jmc.LifecycleMethods.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/02.jmc.LifecycleMethods.html similarity index 100% rename from juneau-doc/docs/Topics/14.juneau-microservice-core/02.jmc.LifecycleMethods.html rename to juneau-doc/docs/Topics/12.juneau-microservice-core/02.jmc.LifecycleMethods.html diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-core/03.jmc.Args.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/03.jmc.Args.html similarity index 100% rename from juneau-doc/docs/Topics/14.juneau-microservice-core/03.jmc.Args.html rename to juneau-doc/docs/Topics/12.juneau-microservice-core/03.jmc.Args.html diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-core/04.jmc.Manifest.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/04.jmc.Manifest.html similarity index 100% rename from juneau-doc/docs/Topics/14.juneau-microservice-core/04.jmc.Manifest.html rename to juneau-doc/docs/Topics/12.juneau-microservice-core/04.jmc.Manifest.html diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-core/05.jmc.Config.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/05.jmc.Config.html similarity index 100% rename from juneau-doc/docs/Topics/14.juneau-microservice-core/05.jmc.Config.html rename to juneau-doc/docs/Topics/12.juneau-microservice-core/05.jmc.Config.html diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-core/06.jmc.SystemProperties.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/06.jmc.SystemProperties.html similarity index 100% rename from juneau-doc/docs/Topics/14.juneau-microservice-core/06.jmc.SystemProperties.html rename to juneau-doc/docs/Topics/12.juneau-microservice-core/06.jmc.SystemProperties.html diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-core/07.jmc.VarResolver.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/07.jmc.VarResolver.html similarity index 100% rename from juneau-doc/docs/Topics/14.juneau-microservice-core/07.jmc.VarResolver.html rename to juneau-doc/docs/Topics/12.juneau-microservice-core/07.jmc.VarResolver.html diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-core/08.jmc.ConsoleCommands.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/08.jmc.ConsoleCommands.html similarity index 100% rename from juneau-doc/docs/Topics/14.juneau-microservice-core/08.jmc.ConsoleCommands.html rename to juneau-doc/docs/Topics/12.juneau-microservice-core/08.jmc.ConsoleCommands.html diff --git a/juneau-doc/docs/Topics/14.juneau-microservice-core/09.jmc.Listeners.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/09.jmc.Listeners.html similarity index 100% rename from juneau-doc/docs/Topics/14.juneau-microservice-core/09.jmc.Listeners.html rename to juneau-doc/docs/Topics/12.juneau-microservice-core/09.jmc.Listeners.html diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty.html similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty.html rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty.html diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/01.jmj.Overview.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/01.jmj.Overview.html similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty/01.jmj.Overview.html rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty/01.jmj.Overview.html diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/02.jmj.LifecycleMethods.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/02.jmj.LifecycleMethods.html similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty/02.jmj.LifecycleMethods.html rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty/02.jmj.LifecycleMethods.html diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/03.jmj.ResourceClasses.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/03.jmj.ResourceClasses.html similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty/03.jmj.ResourceClasses.html rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty/03.jmj.ResourceClasses.html diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/04.jmj.PredefinedResourceClasses.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/04.jmj.PredefinedResourceClasses.html similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty/04.jmj.PredefinedResourceClasses.html rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty/04.jmj.PredefinedResourceClasses.html diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/05.jmj.Config.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.jmj.Config.html similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty/05.jmj.Config.html rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.jmj.Config.html diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/06.jmj.JettyXml.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/06.jmj.JettyXml.html similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty/06.jmj.JettyXml.html rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty/06.jmj.JettyXml.html diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/07.jmj.UiCustomization.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.jmj.UiCustomization.html similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty/07.jmj.UiCustomization.html rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.jmj.UiCustomization.html diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/08.jmj.Extending.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/08.jmj.Extending.html similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty/08.jmj.Extending.html rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty/08.jmj.Extending.html diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/doc-files/jmj.ResourceClasses.1.png b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/doc-files/jmj.ResourceClasses.1.png similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty/doc-files/jmj.ResourceClasses.1.png rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty/doc-files/jmj.ResourceClasses.1.png diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/doc-files/jmj.Running.1.png b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/doc-files/jmj.Running.1.png similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty/doc-files/jmj.Running.1.png rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty/doc-files/jmj.Running.1.png diff --git a/juneau-doc/docs/Topics/15.juneau-microservice-jetty/doc-files/jmj.UiCustomization.1.png b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/doc-files/jmj.UiCustomization.1.png similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-microservice-jetty/doc-files/jmj.UiCustomization.1.png rename to juneau-doc/docs/Topics/13.juneau-microservice-jetty/doc-files/jmj.UiCustomization.1.png diff --git a/juneau-doc/docs/Topics/16.my-jetty-microservice.html b/juneau-doc/docs/Topics/14.my-jetty-microservice.html similarity index 100% rename from juneau-doc/docs/Topics/16.my-jetty-microservice.html rename to juneau-doc/docs/Topics/14.my-jetty-microservice.html diff --git a/juneau-doc/docs/Topics/16.my-jetty-microservice/01.mjm.Installing.html b/juneau-doc/docs/Topics/14.my-jetty-microservice/01.mjm.Installing.html similarity index 100% rename from juneau-doc/docs/Topics/16.my-jetty-microservice/01.mjm.Installing.html rename to juneau-doc/docs/Topics/14.my-jetty-microservice/01.mjm.Installing.html diff --git a/juneau-doc/docs/Topics/16.my-jetty-microservice/02.mjm.Running.html b/juneau-doc/docs/Topics/14.my-jetty-microservice/02.mjm.Running.html similarity index 100% rename from juneau-doc/docs/Topics/16.my-jetty-microservice/02.mjm.Running.html rename to juneau-doc/docs/Topics/14.my-jetty-microservice/02.mjm.Running.html diff --git a/juneau-doc/docs/Topics/16.my-jetty-microservice/03.mjm.Building.html b/juneau-doc/docs/Topics/14.my-jetty-microservice/03.mjm.Building.html similarity index 100% rename from juneau-doc/docs/Topics/16.my-jetty-microservice/03.mjm.Building.html rename to juneau-doc/docs/Topics/14.my-jetty-microservice/03.mjm.Building.html diff --git a/juneau-doc/docs/Topics/16.my-jetty-microservice/doc-files/mjm.Installing.1.png b/juneau-doc/docs/Topics/14.my-jetty-microservice/doc-files/mjm.Installing.1.png similarity index 100% rename from juneau-doc/docs/Topics/16.my-jetty-microservice/doc-files/mjm.Installing.1.png rename to juneau-doc/docs/Topics/14.my-jetty-microservice/doc-files/mjm.Installing.1.png diff --git a/juneau-doc/docs/Topics/16.my-jetty-microservice/doc-files/mjm.Installing.2.png b/juneau-doc/docs/Topics/14.my-jetty-microservice/doc-files/mjm.Installing.2.png similarity index 100% rename from juneau-doc/docs/Topics/16.my-jetty-microservice/doc-files/mjm.Installing.2.png rename to juneau-doc/docs/Topics/14.my-jetty-microservice/doc-files/mjm.Installing.2.png diff --git a/juneau-doc/docs/Topics/16.my-jetty-microservice/doc-files/mjm.Installing.3.png b/juneau-doc/docs/Topics/14.my-jetty-microservice/doc-files/mjm.Installing.3.png similarity index 100% rename from juneau-doc/docs/Topics/16.my-jetty-microservice/doc-files/mjm.Installing.3.png rename to juneau-doc/docs/Topics/14.my-jetty-microservice/doc-files/mjm.Installing.3.png diff --git a/juneau-doc/docs/Topics/16.my-jetty-microservice/doc-files/mjm.Running.1.png b/juneau-doc/docs/Topics/14.my-jetty-microservice/doc-files/mjm.Running.1.png similarity index 100% rename from juneau-doc/docs/Topics/16.my-jetty-microservice/doc-files/mjm.Running.1.png rename to juneau-doc/docs/Topics/14.my-jetty-microservice/doc-files/mjm.Running.1.png diff --git a/juneau-doc/docs/Topics/17.my-springboot-microservice.html b/juneau-doc/docs/Topics/15.my-springboot-microservice.html similarity index 100% rename from juneau-doc/docs/Topics/17.my-springboot-microservice.html rename to juneau-doc/docs/Topics/15.my-springboot-microservice.html diff --git a/juneau-doc/docs/Topics/17.my-springboot-microservice/01.msm.Installing.html b/juneau-doc/docs/Topics/15.my-springboot-microservice/01.msm.Installing.html similarity index 100% rename from juneau-doc/docs/Topics/17.my-springboot-microservice/01.msm.Installing.html rename to juneau-doc/docs/Topics/15.my-springboot-microservice/01.msm.Installing.html diff --git a/juneau-doc/docs/Topics/17.my-springboot-microservice/02.msm.Running.html b/juneau-doc/docs/Topics/15.my-springboot-microservice/02.msm.Running.html similarity index 100% rename from juneau-doc/docs/Topics/17.my-springboot-microservice/02.msm.Running.html rename to juneau-doc/docs/Topics/15.my-springboot-microservice/02.msm.Running.html diff --git a/juneau-doc/docs/Topics/17.my-springboot-microservice/03.msm.Building.html b/juneau-doc/docs/Topics/15.my-springboot-microservice/03.msm.Building.html similarity index 100% rename from juneau-doc/docs/Topics/17.my-springboot-microservice/03.msm.Building.html rename to juneau-doc/docs/Topics/15.my-springboot-microservice/03.msm.Building.html diff --git a/juneau-doc/docs/Topics/17.my-springboot-microservice/doc-files/msm.Installing.1.png b/juneau-doc/docs/Topics/15.my-springboot-microservice/doc-files/msm.Installing.1.png similarity index 100% rename from juneau-doc/docs/Topics/17.my-springboot-microservice/doc-files/msm.Installing.1.png rename to juneau-doc/docs/Topics/15.my-springboot-microservice/doc-files/msm.Installing.1.png diff --git a/juneau-doc/docs/Topics/17.my-springboot-microservice/doc-files/msm.Installing.2.png b/juneau-doc/docs/Topics/15.my-springboot-microservice/doc-files/msm.Installing.2.png similarity index 100% rename from juneau-doc/docs/Topics/17.my-springboot-microservice/doc-files/msm.Installing.2.png rename to juneau-doc/docs/Topics/15.my-springboot-microservice/doc-files/msm.Installing.2.png diff --git a/juneau-doc/docs/Topics/17.my-springboot-microservice/doc-files/msm.Installing.3.png b/juneau-doc/docs/Topics/15.my-springboot-microservice/doc-files/msm.Installing.3.png similarity index 100% rename from juneau-doc/docs/Topics/17.my-springboot-microservice/doc-files/msm.Installing.3.png rename to juneau-doc/docs/Topics/15.my-springboot-microservice/doc-files/msm.Installing.3.png diff --git a/juneau-doc/docs/Topics/17.my-springboot-microservice/doc-files/msm.Running.1.png b/juneau-doc/docs/Topics/15.my-springboot-microservice/doc-files/msm.Running.1.png similarity index 100% rename from juneau-doc/docs/Topics/17.my-springboot-microservice/doc-files/msm.Running.1.png rename to juneau-doc/docs/Topics/15.my-springboot-microservice/doc-files/msm.Running.1.png diff --git a/juneau-doc/docs/Topics/18.juneau-petstore.html b/juneau-doc/docs/Topics/16.juneau-petstore.html similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore.html rename to juneau-doc/docs/Topics/16.juneau-petstore.html diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/01.jp.RunningTheApp.html b/juneau-doc/docs/Topics/16.juneau-petstore/01.jp.RunningTheApp.html similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/01.jp.RunningTheApp.html rename to juneau-doc/docs/Topics/16.juneau-petstore/01.jp.RunningTheApp.html diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/02.jp.juneau-petstore-api.html b/juneau-doc/docs/Topics/16.juneau-petstore/02.jp.juneau-petstore-api.html similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/02.jp.juneau-petstore-api.html rename to juneau-doc/docs/Topics/16.juneau-petstore/02.jp.juneau-petstore-api.html diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/03.jp.juneau-petstore-client.html b/juneau-doc/docs/Topics/16.juneau-petstore/03.jp.juneau-petstore-client.html similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/03.jp.juneau-petstore-client.html rename to juneau-doc/docs/Topics/16.juneau-petstore/03.jp.juneau-petstore-client.html diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/04.jp.juneau-petstore-server.html b/juneau-doc/docs/Topics/16.juneau-petstore/04.jp.juneau-petstore-server.html similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/04.jp.juneau-petstore-server.html rename to juneau-doc/docs/Topics/16.juneau-petstore/04.jp.juneau-petstore-server.html diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9a.png b/juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9a.png similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9a.png rename to juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9a.png diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9b.png b/juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9b.png similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9b.png rename to juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9b.png diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9c.png b/juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9c.png similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9c.png rename to juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9c.png diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9d.png b/juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9d.png similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9d.png rename to juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9d.png diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9e.png b/juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9e.png similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9e.png rename to juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9e.png diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9f.png b/juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9f.png similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9f.png rename to juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9f.png diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9g.png b/juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9g.png similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9g.png rename to juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9g.png diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9h.png b/juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9h.png similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/doc-files/9h.png rename to juneau-doc/docs/Topics/16.juneau-petstore/doc-files/9h.png diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/doc-files/PetStore.png b/juneau-doc/docs/Topics/16.juneau-petstore/doc-files/PetStore.png similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/doc-files/PetStore.png rename to juneau-doc/docs/Topics/16.juneau-petstore/doc-files/PetStore.png diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/doc-files/PetStore_pets.png b/juneau-doc/docs/Topics/16.juneau-petstore/doc-files/PetStore_pets.png similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/doc-files/PetStore_pets.png rename to juneau-doc/docs/Topics/16.juneau-petstore/doc-files/PetStore_pets.png diff --git a/juneau-doc/docs/Topics/18.juneau-petstore/doc-files/RootResources.png b/juneau-doc/docs/Topics/16.juneau-petstore/doc-files/RootResources.png similarity index 100% rename from juneau-doc/docs/Topics/18.juneau-petstore/doc-files/RootResources.png rename to juneau-doc/docs/Topics/16.juneau-petstore/doc-files/RootResources.png diff --git a/juneau-doc/docs/Topics/19.Glossaries.html b/juneau-doc/docs/Topics/17.Glossaries.html similarity index 100% rename from juneau-doc/docs/Topics/19.Glossaries.html rename to juneau-doc/docs/Topics/17.Glossaries.html diff --git a/juneau-doc/docs/Topics/19.Glossaries/01.g.LanguageSupport.html b/juneau-doc/docs/Topics/17.Glossaries/01.g.LanguageSupport.html similarity index 100% rename from juneau-doc/docs/Topics/19.Glossaries/01.g.LanguageSupport.html rename to juneau-doc/docs/Topics/17.Glossaries/01.g.LanguageSupport.html diff --git a/juneau-doc/docs/Topics/19.Glossaries/02.g.Annotations.html b/juneau-doc/docs/Topics/17.Glossaries/02.g.Annotations.html similarity index 100% rename from juneau-doc/docs/Topics/19.Glossaries/02.g.Annotations.html rename to juneau-doc/docs/Topics/17.Glossaries/02.g.Annotations.html diff --git a/juneau-doc/docs/Topics/20.Security.html b/juneau-doc/docs/Topics/18.Security.html similarity index 100% rename from juneau-doc/docs/Topics/20.Security.html rename to juneau-doc/docs/Topics/18.Security.html diff --git a/juneau-doc/docs/Topics/20.Security/01.s.Marshall.html b/juneau-doc/docs/Topics/18.Security/01.s.Marshall.html similarity index 100% rename from juneau-doc/docs/Topics/20.Security/01.s.Marshall.html rename to juneau-doc/docs/Topics/18.Security/01.s.Marshall.html diff --git a/juneau-doc/docs/Topics/20.Security/02.s.Svl.html b/juneau-doc/docs/Topics/18.Security/02.s.Svl.html similarity index 100% rename from juneau-doc/docs/Topics/20.Security/02.s.Svl.html rename to juneau-doc/docs/Topics/18.Security/02.s.Svl.html diff --git a/juneau-doc/docs/Topics/20.Security/03.s.Rest.html b/juneau-doc/docs/Topics/18.Security/03.s.Rest.html similarity index 100% rename from juneau-doc/docs/Topics/20.Security/03.s.Rest.html rename to juneau-doc/docs/Topics/18.Security/03.s.Rest.html
