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 ba7aa19  Javadocs
ba7aa19 is described below

commit ba7aa19a9d77721bb38db647de3bba92c68b6379
Author: JamesBognar <[email protected]>
AuthorDate: Mon Jan 3 13:28:21 2022 -0500

    Javadocs
---
 juneau-doc/docs/ReleaseNotes/5.0.0.04.html         |  4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.11.html         |  2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.13.html         |  2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.19.html         |  2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.20.html         |  2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.27.html         |  2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.33.html         |  2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.34.html         |  2 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.10.html         |  2 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.11.html         |  2 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.14.html         |  2 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.17.html         |  6 +--
 juneau-doc/docs/ReleaseNotes/5.1.0.18.html         |  2 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.20.html         |  4 +-
 juneau-doc/docs/ReleaseNotes/5.2.0.0.html          |  4 +-
 juneau-doc/docs/ReleaseNotes/6.0.0.html            |  2 +-
 juneau-doc/docs/ReleaseNotes/6.2.0.html            |  4 +-
 juneau-doc/docs/ReleaseNotes/6.3.1.html            |  2 +-
 juneau-doc/docs/ReleaseNotes/6.4.0.html            |  4 +-
 juneau-doc/docs/ReleaseNotes/7.1.0.html            |  8 ++--
 juneau-doc/docs/ReleaseNotes/8.0.0.html            |  4 +-
 juneau-doc/docs/ReleaseNotes/8.1.0.html            | 10 ++---
 juneau-doc/docs/ReleaseNotes/8.1.1.html            |  2 +-
 juneau-doc/docs/ReleaseNotes/8.2.0.html            | 28 +++++++-------
 .../docs/Topics/01.Overview/05.o.RestServer.html   | 18 ++++-----
 .../docs/Topics/04.juneau-dto/04.jd.SwaggerUi.html |  2 +-
 juneau-doc/docs/Topics/06.juneau-rest-server.html  |  2 +-
 .../01.jrs.HelloWorldExample.html                  | 12 +++---
 .../02.jrs.AnnotatedClasses.html                   | 43 ++++++++++------------
 .../01.jrs.BasicRestServlet.html                   | 10 ++---
 .../02.jrs.BasicRestServletGroup.html              | 12 +++---
 .../06.juneau-rest-server/05.jrs.Marshalling.html  | 20 +++++-----
 .../11.jrs.ConfigurationFiles.html                 |  2 +-
 .../06.juneau-rest-server/13.jrs.StaticFiles.html  |  2 +-
 .../01.jrs.BasicRestServletSwagger.html            |  4 +-
 .../16.jrs.ExecutionStatistics.html                |  2 +-
 .../05.jrs.HtmlStylesheets.html                    |  2 +-
 .../01.jrsj.BaseProvider.html                      |  4 +-
 .../01.jrss.Overview.html                          |  4 +-
 .../02.jrss.ChildResources.html                    |  2 +-
 .../03.jmj.ResourceClasses.html                    |  2 +-
 .../05.jmj.Config.html                             |  2 +-
 .../07.jmj.UiCustomization.html                    |  2 +-
 .../01.msm.Installing.html                         |  2 +-
 .../01.jer.RootResources.html                      | 17 +++------
 .../02.jer.HelloWorldResource.html                 |  4 +-
 .../01.jers.Installing.html                        |  2 +-
 47 files changed, 134 insertions(+), 142 deletions(-)

diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.04.html 
b/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
index a3cb4ba..e53cae2 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
@@ -21,9 +21,9 @@
        </p>
        <ul class='spaced-list'>
                <li>
-                       New {@del oajr.annotation.RestMethod @RestMethod} 
annotation on {@link oajr.RestServlet} methods.<br>
+                       New {@del oajr.annotation.RestMethod @RestMethod} 
annotation on {@del oajr.RestServlet} methods.<br>
                        Allows the usage of URL pattern matching and automatic 
conversion of URL variables to arguments passed to method handlers.<br>
-                       See {@link oajr.RestServlet} for more information.
+                       See {@del oajr.RestServlet} for more information.
                </li>
                <li>
                        Enhancements to {@del 
BeanContext#convertToType(Object,Class)} to be able to convert <c>Strings</c> 
to classes with 
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.11.html 
b/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
index 5f00013..71d03a5 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
@@ -26,7 +26,7 @@
                        Allows parsing form posts directly to POJOs.
                </li>
                <li>
-                       Support for <c>Accept</c> and <c>Content-Type</c> 
<js>"application/x-www-form-urlencoded"</js> added by default on {@link 
oajr.BasicRestServlet}.
+                       Support for <c>Accept</c> and <c>Content-Type</c> 
<js>"application/x-www-form-urlencoded"</js> added by default on {@del 
oajr.BasicRestServlet}.
                </li>
                <li>
                        New {@del 
RestServlet#renderError(HttpServletRequest,HttpServletResponse,RestException)} 
method to allow customized handling of response errors.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.13.html 
b/juneau-doc/docs/ReleaseNotes/5.0.0.13.html
index ba0f9e2..b6156ca 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.13.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.13.html
@@ -47,7 +47,7 @@
        <h5 class='topic w800'>REST server API changes</h5>
        <ul class='spaced-list'>
                <li>
-                       Improvements to {@link oajr.RestServlet} to 
automatically handle relative URIs in POJOs.
+                       Improvements to {@del oajr.RestServlet} to 
automatically handle relative URIs in POJOs.
                        <ul>
                                
<li><c>SerializerContext.SERIALIZER_uriContext</c> property set by default to 
web app context root.</li>
                                
<li><c>SerializerContext.SERIALIZER_uriAuthority</c> property set by default to 
the request scheme+hostname+port.</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.19.html 
b/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
index 604b310..571e7cb 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
@@ -21,7 +21,7 @@
        </p>
        <ul class='spaced-list'>
                <li>
-                       New methods on {@link oajr.RestServlet}:
+                       New methods on {@del oajr.RestServlet}:
                        <ul>
                                <li>{@del 
RestServlet#onPreCall(RestRequest)}</li>
                                <li>{@del 
RestServlet#onPostCall(RestRequest,RestResponse)}</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.20.html 
b/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
index b6e768d..26696c7 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
@@ -63,7 +63,7 @@
                        It's redundant with the introduction of inheritable 
annotations.
                </li>
                <li>
-                       New methods on {@link oajr.RestServlet}:
+                       New methods on {@del oajr.RestServlet}:
                        <ul>
                                
<li><c>RestServlet.createConfigFactory()</c></li>
                                <li><c>RestServlet.createSerializers()</c></li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.27.html 
b/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
index 570549e..6b6f4f2 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
@@ -24,7 +24,7 @@
                        Fixed some HTML formatting issues in {@link 
oaj.html.HtmlSerializer}.
                </li>
                <li>
-                               {@link oajr.BasicRestServlet} now includes 
{@link oaj.plaintext.PlainTextSerializer} and {@link 
oaj.plaintext.PlainTextParser} for plain-text support.
+                               {@del oajr.BasicRestServlet} now includes 
{@link oaj.plaintext.PlainTextSerializer} and {@link 
oaj.plaintext.PlainTextParser} for plain-text support.
                        </li>
                        <li>
                        Child resources now render on default <c>OPTIONS</c> 
pages through new method {@del ResourceOptions#getChildren()}.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.33.html 
b/juneau-doc/docs/ReleaseNotes/5.0.0.33.html
index b7f0d8d..a484f85 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.33.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.33.html
@@ -59,7 +59,7 @@
                        While the old behavior was as-designed, the new 
behavior is more in-line with expected behavior.
                </li>
                <li>
-                       Added support for HTTP header 
<js>"X-Response-Headers"</js> to {@link oajr.RestServlet}. <br>
+                       Added support for HTTP header 
<js>"X-Response-Headers"</js> to {@del oajr.RestServlet}. <br>
                        Allows you to specify one or more headers that should 
be returned on the response from the servlet.<br>
                        For example, to get a page to automatically refresh 
every 1 second, you can append the following to a URL:  
<c>?x-response-headers={Refresh=1}</c>
                </li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.34.html 
b/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
index 0b14901..d0dd5fd 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
@@ -55,7 +55,7 @@
                        </ul>
                </li>
                <li>
-                       New methods on {@link oajr.RestServlet} that allow 
easier customization by subclasses:
+                       New methods on {@del oajr.RestServlet} that allow 
easier customization by subclasses:
                        <ul>
                                <li>{@del 
RestServlet#createConfigFactory()}</li>
                                <li>{@del RestServlet#createConverters()}</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.10.html 
b/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
index df13709..888766e 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
@@ -49,7 +49,7 @@
                <li>Removed properties parameters from {@del 
RestServlet#onPreCall(RestRequest)} and {@del 
RestServlet#onPostCall(RestRequest,RestResponse)} methods
                        since the properties are already accessible through 
<c>RestRequest.getProperties()</c>.
                <li>Added {@link oaj.uon.UonSerializer} and {@link 
oaj.uon.UonParser} to serializer and parser lists on 
-                       {@link oajr.BasicRestServlet} and {@del 
RestServletJenaDefault}.
+                       {@del oajr.BasicRestServlet} and {@del 
RestServletJenaDefault}.
        </ul>
        
        <h5 class='topic w800'>Client</h5>              
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.11.html 
b/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
index c687a18..fc2dae7 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
@@ -78,7 +78,7 @@
                <li><c>&amp;noTrace=true</c> now prevents any errors from being 
logged in log file.
                <li>Workaround for Jetty issue where 
<c>ServletContext.getContextPath()</c> always ends with <js>"null"</js>.
                <li><c>RestServletProperties.REST_allowMethodParam</c> is now 
<jk>true</jk> by default on all subclasses 
-                       of {@link oajr.BasicRestServlet} and {@del 
RestServletJenaDefault}.
+                       of {@del oajr.BasicRestServlet} and {@del 
RestServletJenaDefault}.
        </ul>
                        
        <h5 class='topic w800'>Client</h5>              
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.14.html 
b/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
index f84dd03..018812b 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
@@ -41,7 +41,7 @@
        
        <h5 class='topic w800'>Server</h5>              
        <ul class='spaced-list'>
-               <li>Added a default OPTIONS page to {@link 
oajr.BasicRestServlet} and {@del RestServletJenaDefault}.
+               <li>Added a default OPTIONS page to {@del 
oajr.BasicRestServlet} and {@del RestServletJenaDefault}.
                <li><c>RestServletProperties.REST_allowMethodParam</c> has been 
enhanced to allow you to
                        explicitly specify which HTTP methods can be used in 
the <c>&amp;method</c> parameter.
                <li>New methods added to {@link oajr.RestRequest}:
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.17.html 
b/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
index 5ea31ad..bcf391a 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
@@ -90,19 +90,19 @@
                                <li><c>$E{var}</c> - Environment variables.
                        </ul>
                <li>Added methods {@del 
RestServlet#getDescription(RestRequest)} and {@del 
RestServlet#getLabel(RestRequest)}.
-               <li>{@link oajr.BasicRestServlet} and {@del 
RestServletJenaDefault} now provide default HTML titles
+               <li>{@del oajr.BasicRestServlet} and {@del 
RestServletJenaDefault} now provide default HTML titles
                        and descriptions:
                        <p class='bcode w800'>
                <ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, 
value=<js>"$R{resourceTitle}"</js>),
                <ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, 
value=<js>"$R{resourceDescription}"</js>)
                        </p>
-               <li>Options pages on {@link oajr.BasicRestServlet} and {@del 
RestServletJenaDefault} now provide default descriptions and back links:
+               <li>Options pages on {@del oajr.BasicRestServlet} and {@del 
RestServletJenaDefault} now provide default descriptions and back links:
                        and descriptions:
                        <p class='bcode w800'>
                <ja>@Property</ja>(name=<jsf>HTMLDOC_navlinks</jsf>, 
value=<js>"{back:'$R{servletURI}"</js>),
                <ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, 
value=<js>"Resource options"</js>)
                        </p>
-               <li>New {@link oajr.BasicRestServletGroup} class.
+               <li>New {@del oajr.BasicRestServletGroup} class.
                <li>Removed 
<c>RestServletProperties.REST_trimTrailingUriSlashes</c> and 
<c>RestServletProperties.REST_pathInfoBlankForNull</c>. 
                <li>New annotations for providing labels and descriptions.  
Useful if you don't plan on having to support other languages, so you don't 
                        want to provide labels in resource bundles.
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.18.html 
b/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
index 9444c90..87d3cac 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
@@ -27,7 +27,7 @@
                <li>New {@del RestMethod#input()} and {@del 
RestMethod#responses()}
                        annotations.
                        These replace the various <c>description</c> 
annotations added 2 days ago with a simpler design.
-               <li>New methods on {@link oajr.RestServlet}:
+               <li>New methods on {@del oajr.RestServlet}:
                        <ul>
                                <li>{@del 
RestServlet#getMethodDescription(String,RestRequest)} so that subclasses
                                        can override the method description in 
the OPTIONS page.
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html 
b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
index 14f5116..284b4a1 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
@@ -54,7 +54,7 @@
        <ul class='spaced-list'>
                <li>You can now parse into non-static inner classes of a 
servlet for parameters/attributes/content.
                        Useful if you like to define your marshaller beans 
inside your servlet.
-               <li>Changes to {@link oajr.RestServlet}:
+               <li>Changes to {@del oajr.RestServlet}:
                        <ul>
                                <li>New methods for accessing external INI 
config files:<br>  
                                        {@del RestServlet#getConfig()}<br>
@@ -69,7 +69,7 @@
                                <li>New {@del 
RestServlet#handleNotFound(int,RestRequest,RestResponse)} method for customized 
handling
                                        of when a resource or method was not 
found.  
                        </ul>
-               <li>{@link oajr.BasicRestServlet}  now automatically processes 
<js>"/favicon.ico"</js> requests by 
+               <li>{@del oajr.BasicRestServlet}  now automatically processes 
<js>"/favicon.ico"</js> requests by 
                        overriding the new {@del 
RestServlet#handleNotFound(int,RestRequest,RestResponse)} method.
                <li>New {@link oajr.RestRequest} methods: 
                        <ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html 
b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
index da43428..ed59120 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
@@ -340,7 +340,7 @@
                        <ul>
                                <li>Don't set <c>Content-Encoding: identity</c> 
when no encoding is used.  Some clients don't interpret it correctly.
                        </ul>
-               <li>New methods in {@link oajr.RestServlet}:
+               <li>New methods in {@del oajr.RestServlet}:
                        <ul>
                                <li>{@del RestServlet#getChildClasses()}  - 
Programmatic equivalent to {@del @RestResource(children)} annotation.
                                <li>{@del 
RestServlet#shouldLog(HttpServletRequest,HttpServletResponse,RestException)} 
@@ -353,7 +353,7 @@
                                <li>{@del RestServlet#getConfigMgr()}
                        </ul>
                <li>Removed {@del oaj.jso.JsoParser}
-                       from {@link oajr.BasicRestServlet} and {@del 
RestServletJenaDefault}.  
+                       from {@del oajr.BasicRestServlet} and {@del 
RestServletJenaDefault}.  
                        These may represent a security risk if not handled 
correctly, so removed
                        them as a precaution.
                <li>Removed <c>RestServletProperties.REST_htDocsFolder</c>.  
Replaced with {@del @RestResource(staticFiles)}}.
diff --git a/juneau-doc/docs/ReleaseNotes/6.0.0.html 
b/juneau-doc/docs/ReleaseNotes/6.0.0.html
index feb89ca..95f7251 100644
--- a/juneau-doc/docs/ReleaseNotes/6.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.0.0.html
@@ -142,7 +142,7 @@
                                </li>                                   
                        </ul>
                <li>New {@del RestServletContext#paramFormat} context property.
-               <li>New/updated methods on {@link oajr.RestServlet}:
+               <li>New/updated methods on {@del oajr.RestServlet}:
                        <ul>
                                <li>{@del RestServlet#createProperties()}
                                <li>{@del 
RestServlet#createBeanContext(ObjectMap,Class[],Class[])}
diff --git a/juneau-doc/docs/ReleaseNotes/6.2.0.html 
b/juneau-doc/docs/ReleaseNotes/6.2.0.html
index 9980993..a4f12ce 100644
--- a/juneau-doc/docs/ReleaseNotes/6.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.2.0.html
@@ -115,7 +115,7 @@
        <h5 class='topic w800'>org.apache.juneau.rest</h5>
        <ul class='spaced-list'>
                <li>{@del @RestResource} annotation can now be applied to 
-                       any class!  You're no longer restricted to subclassing 
your resources from {@link oajr.RestServlet}.
+                       any class!  You're no longer restricted to subclassing 
your resources from {@del oajr.RestServlet}.
                        <br>This is a major enhancement in the API.  Anything 
you could do by subclassing from <c>RestServlet</c>
                        should have an equivalent for non-<c>RestServlet</c> 
classes.
                        <br>The only restriction is that the top-level resource 
must subclass from <c>RestServlet</c>.
@@ -127,7 +127,7 @@
                                <li>{@link oajr.RestContext} - A read-only 
configuration that's the result of a snapshot of the config.
                        </ul>
                        <br><br>
-                       The {@link oajr.RestServlet} class now has the 
following initialization method that allows you to override
+                       The {@del oajr.RestServlet} class now has the following 
initialization method that allows you to override
                        the config settings define via annotations:
                        <ul>
                                <li>{@del RestServlet#init(RestConfig)} - A 
modifiable configuration of a resource.
diff --git a/juneau-doc/docs/ReleaseNotes/6.3.1.html 
b/juneau-doc/docs/ReleaseNotes/6.3.1.html
index b2028f4..96e938c 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.1.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.1.html
@@ -181,7 +181,7 @@
                                <li><c>description()</c>
                                <li><c>branding()</c>
                        </ul>
-                       Instead, the {@link oajr.BasicRestServlet} class 
defines the following default header
+                       Instead, the {@del oajr.BasicRestServlet} class defines 
the following default header
                        that can be easily overridden: 
                        <p class='bcode w800'>
                htmldoc=<ja>@HtmlDoc</ja>(
diff --git a/juneau-doc/docs/ReleaseNotes/6.4.0.html 
b/juneau-doc/docs/ReleaseNotes/6.4.0.html
index 1caa552..0a45d15 100644
--- a/juneau-doc/docs/ReleaseNotes/6.4.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.4.0.html
@@ -383,11 +383,11 @@
                        Revamped and simplified servlet and REST-call lifecycle 
handling through new
                        {@link oajr.annotation.RestHook @RestHook} annotation.
                        <ul>
-                               <li>The {@link 
oajr.RestServlet#init(ServletConfig)} method is now final and can
+                               <li>The {@del 
oajr.RestServlet#init(ServletConfig)} method is now final and can
                                        no longer be extended.
                                        <br>Instead, use {@link 
oajr.annotation.HookEvent#INIT} or 
                                        {@link 
oajr.annotation.HookEvent#POST_INIT} for initialization.
-                               <li>The following methods on {@link 
oajr.RestServlet} have been removed:
+                               <li>The following methods on {@del 
oajr.RestServlet} have been removed:
                                        <ul>
                                                <li><c>init(RestConfig)</c> 
                                                        - Use {@link 
oajr.annotation.HookEvent#INIT} instead.
diff --git a/juneau-doc/docs/ReleaseNotes/7.1.0.html 
b/juneau-doc/docs/ReleaseNotes/7.1.0.html
index 24f53d7..07417aa 100644
--- a/juneau-doc/docs/ReleaseNotes/7.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.1.0.html
@@ -214,9 +214,9 @@
        <h5 class='topic w800'>juneau-rest-server</h5>
        <ul class='spaced-list'>
                <li>
-                       <c>RestServletDefault</c> renamed to {@link 
oajr.BasicRestServlet}.
+                       <c>RestServletDefault</c> renamed to {@del 
oajr.BasicRestServlet}.
                <li>
-                       <c>RestServletGroupDefault</c> renamed to {@link 
oajr.BasicRestServletGroup}.
+                       <c>RestServletGroupDefault</c> renamed to {@del 
oajr.BasicRestServletGroup}.
                <li>
                        The <js>"$R{...}"</js> variable has been split into the 
following:
                        <ul>
@@ -409,7 +409,7 @@
                        <br>The {@del oajr.reshandlers.DefaultHandler} class 
now calls <c>finish()</c>
                        instead of <c>close()</c> on the stream.
                <li>
-                       Added the following annotations to the {@link 
oajr.BasicRestServlet} class
+                       Added the following annotations to the {@del 
oajr.BasicRestServlet} class
                        (which were previously defined on the {@del Resource} 
class):
                        <p class='bcode w800'>
                <ja>@RestResource</ja>(
@@ -452,7 +452,7 @@
        <ul class='spaced-list'>
                <li>
                        <c>Resource</c> and <c>ResourceGroup</c> classes 
removed.
-                       <br>{@link oajr.BasicRestServlet} and {@link 
oajr.BasicRestServletGroup} can be used instead.
+                       <br>{@del oajr.BasicRestServlet} and {@del 
oajr.BasicRestServletGroup} can be used instead.
                <li>
                        <c>ResourceJena</c> and <c>ResourceJenaGroup</c> 
classes renamed to
                        {@del BasicRestServletJena} and {@del 
BasicRestServletJenaGroup}.
diff --git a/juneau-doc/docs/ReleaseNotes/8.0.0.html 
b/juneau-doc/docs/ReleaseNotes/8.0.0.html
index 4e8dd5c..59d6c7f 100644
--- a/juneau-doc/docs/ReleaseNotes/8.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.0.0.html
@@ -92,10 +92,10 @@
        <h5 class='topic w800'>juneau-rest-server</h5>
        <ul class='spaced-list'>
                <li>
-                       New methods on {@link oajr.RestServlet}:
+                       New methods on {@del oajr.RestServlet}:
                        <ul class='javatree'>
                                <li class='jm'>{@del 
oajr.RestServlet#setRestResourceResolver(RestResourceResolver) 
setRestResourceResolver(RestResourceResolver)}
-                               <li class='jm'>{@link 
oajr.RestServlet#getPath() getPath()}
+                               <li class='jm'>{@del oajr.RestServlet#getPath() 
getPath()}
                        </ul>
                <li>
                        The registered resource resolver is now used to 
instantiate objects of classes defined via {@del @RestResource}.
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.0.html 
b/juneau-doc/docs/ReleaseNotes/8.1.0.html
index c20ef47..e0b0ef8 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.0.html
@@ -248,13 +248,13 @@
                        </ul>
                <li>
                        Added the following classes that provide the same 
support as the servlet classes but doesn't extend from <c>HttpServlet</c>.
-                       <br>This fixes an issue where instances of {@link 
oajr.BasicRestServlet} are registered as top-level servlets even though
+                       <br>This fixes an issue where instances of {@del 
oajr.BasicRestServlet} are registered as top-level servlets even though
                        you don't want them to be.  
                        <ul class='javatree'>
-                               <li class='jac'>{@del oajr.BasicRest} - 
Non-servlet equivalent to {@link oajr.BasicRestServlet}
-                               <li class='jac'>{@del oajr.BasicRestGroup} - 
Non-servlet equivalent to {@link oajr.BasicRestServletGroup}
-                               <li class='jac'>{@link oajr.BasicRestJena} - 
Non-servlet equivalent to {@link oajr.BasicRestServletJena}
-                               <li class='jac'>{@link oajr.BasicRestJenaGroup} 
- Non-servlet equivalent to {@link oajr.BasicRestServletJenaGroup}
+                               <li class='jac'>{@del oajr.BasicRest} - 
Non-servlet equivalent to {@del oajr.BasicRestServlet}
+                               <li class='jac'>{@del oajr.BasicRestGroup} - 
Non-servlet equivalent to {@del oajr.BasicRestServletGroup}
+                               <li class='jac'>{@del oajr.BasicRestJena} - 
Non-servlet equivalent to {@del oajr.BasicRestServletJena}
+                               <li class='jac'>{@del oajr.BasicRestJenaGroup} 
- Non-servlet equivalent to {@del oajr.BasicRestServletJenaGroup}
                        </ul>
                <li>
                        HTML widgets now have access to the <c>RestResponse</c> 
object if they need access to the output bean.
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.1.html 
b/juneau-doc/docs/ReleaseNotes/8.1.1.html
index f70d39a..9a15c0c 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.1.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.1.html
@@ -67,7 +67,7 @@
                        The fix involves resolving the original bean class for 
resolving parameterized type while leaving
                        method invocation on the proxy method so as not to 
bypass Spring features.
                <li>
-                       New methods on {@del oajr.BasicRest} to provide 
feature-parity with {@link oajr.RestServlet}:
+                       New methods on {@del oajr.BasicRest} to provide 
feature-parity with {@del oajr.RestServlet}:
                        <ul class='javatree'>
                                <li class='jc'>{@del oajr.BasicRest}
                                        <ul class='javatreec'>
diff --git a/juneau-doc/docs/ReleaseNotes/8.2.0.html 
b/juneau-doc/docs/ReleaseNotes/8.2.0.html
index ddf4b4c..a9ab49d 100644
--- a/juneau-doc/docs/ReleaseNotes/8.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.2.0.html
@@ -284,7 +284,7 @@
                        </ul>
                        <br>The methods added for {@del oajr.RestInfoProvider} 
are:
                        <ul>
-                               <li class='jac'>{@link oajr.RestServlet}
+                               <li class='jac'>{@del oajr.RestServlet}
                                <ul>
                                        <li class='jm'>{@del 
getSwagger(RestRequest)}
                                        <li class='jm'>{@del 
getSiteName(RestRequest)}
@@ -305,7 +305,7 @@
                        </ul>
                        <br>The methods added for {@del oajr.RestCallLogger} 
are:
                        <ul>
-                               <li class='jac'>{@link oajr.RestServlet}
+                               <li class='jac'>{@del oajr.RestServlet}
                                <ul>
                                        <li class='jm'>{@del 
oajr.RestServlet#log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)
 log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)}
                                </ul>
@@ -316,7 +316,7 @@
                        </ul>
                        <br>The methods added for {@del 
oaj.utils.ClasspathResourceFinder} are:
                        <ul>
-                               <li class='jac'>{@link oajr.RestServlet}
+                               <li class='jac'>{@del oajr.RestServlet}
                                <ul>
                                        <li class='jm'>{@del 
oajr.RestServlet#findResource(Class,String,Locale) 
findResource(Class,String,Locale)}
                                </ul>
@@ -327,7 +327,7 @@
                        </ul>
                        <br>The methods added for {@del 
oajr.RestResourceResolver} are:
                        <ul>
-                               <li class='jac'>{@link oajr.RestServlet}
+                               <li class='jac'>{@del oajr.RestServlet}
                                <ul>
                                        <li class='jm'>{@del 
oajr.RestServlet#resolve(Object,Class,RestContext.Builder,Object...) 
resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)}
                                </ul>
@@ -337,18 +337,18 @@
                                </ul>
                        </ul>
                <li>
-                       Added the following convenience hook methods on the 
{@link oajr.RestServlet} and {@del oajr.BasicRest} classes:
+                       Added the following convenience hook methods on the 
{@del oajr.RestServlet} and {@del oajr.BasicRest} classes:
                        <ul>
-                               <li class='jac'>{@link oajr.RestServlet}
+                               <li class='jac'>{@del oajr.RestServlet}
                                <ul>
-                                       <li class='jm'>{@link 
oajr.RestServlet#onInit(RestContext.Builder) onInit(RestContext.Builder)}
-                                       <li class='jm'>{@link 
oajr.RestServlet#onPostInit(RestContext) onPostInit(RestContext)}
-                                       <li class='jm'>{@link 
oajr.RestServlet#onPostInitChildFirst(RestContext) 
onPostInitChildFirst(RestContext)}
-                                       <li class='jm'>{@link 
oajr.RestServlet#onDestroy(RestContext) onDestroy(RestContext)}
-                                       <li class='jm'>{@link 
oajr.RestServlet#onStartCall(HttpServletRequest,HttpServletResponse) 
onStartCall(HttpServletRequest,HttpServletResponse)}
-                                       <li class='jm'>{@link 
oajr.RestServlet#onPreCall(RestRequest,RestResponse) 
onPreCall(RestRequest,RestResponse)}
-                                       <li class='jm'>{@link 
oajr.RestServlet#onPostCall(RestRequest,RestResponse) 
onPostCall(RestRequest,RestResponse)}
-                                       <li class='jm'>{@link 
oajr.RestServlet#onEndCall(HttpServletRequest,HttpServletResponse) 
onEndCall(HttpServletRequest,HttpServletResponse)}
+                                       <li class='jm'>{@del 
oajr.RestServlet#onInit(RestContext.Builder) onInit(RestContext.Builder)}
+                                       <li class='jm'>{@del 
oajr.RestServlet#onPostInit(RestContext) onPostInit(RestContext)}
+                                       <li class='jm'>{@del 
oajr.RestServlet#onPostInitChildFirst(RestContext) 
onPostInitChildFirst(RestContext)}
+                                       <li class='jm'>{@del 
oajr.RestServlet#onDestroy(RestContext) onDestroy(RestContext)}
+                                       <li class='jm'>{@del 
oajr.RestServlet#onStartCall(HttpServletRequest,HttpServletResponse) 
onStartCall(HttpServletRequest,HttpServletResponse)}
+                                       <li class='jm'>{@del 
oajr.RestServlet#onPreCall(RestRequest,RestResponse) 
onPreCall(RestRequest,RestResponse)}
+                                       <li class='jm'>{@del 
oajr.RestServlet#onPostCall(RestRequest,RestResponse) 
onPostCall(RestRequest,RestResponse)}
+                                       <li class='jm'>{@del 
oajr.RestServlet#onEndCall(HttpServletRequest,HttpServletResponse) 
onEndCall(HttpServletRequest,HttpServletResponse)}
                                </ul>
                                <li class='jac'>{@del oajr.BasicRest}
                                <ul>
diff --git a/juneau-doc/docs/Topics/01.Overview/05.o.RestServer.html 
b/juneau-doc/docs/Topics/01.Overview/05.o.RestServer.html
index 4b63600..969e95c 100644
--- a/juneau-doc/docs/Topics/01.Overview/05.o.RestServer.html
+++ b/juneau-doc/docs/Topics/01.Overview/05.o.RestServer.html
@@ -13,13 +13,13 @@
  
***************************************************************************************************************************/
  -->
 
-{title:'REST Server Overview', created:'9.0.0'} 
+{title:'REST Server Overview', created:'9.0.0', flags:'todo'} 
 
 <h5 class='topic'>@Rest-Annotated Resources</h5>
 <div class='topic'>
        <p>
                A REST resource is simply a Java class annotated with {@link 
oajr.annotation.Rest}.
-               The most common case is a class that extends {@link 
oajr.RestServlet}, which itself is simply an 
+               The most common case is a class that extends {@link 
oajr.servlet.BasicRestServlet}, which itself is simply an 
                extension of {@link javax.servlet.http.HttpServlet} which 
allows it to be deployed as a servlet.  
        </p>
        <p class='bcode w800'>
@@ -42,7 +42,7 @@
                |               }
                |       )
                |       <ja>@BeanConfig</ja>(sortProperties=<js>"true"</js>)
-               |       <jk>public class</jk> HelloWorldResource 
<jk>extends</jk> BasicRestServlet {
+               |       <jk>public class</jk> HelloWorldResource 
<jk>extends</jk> BasicRestServlet <jk>implements</jk> BasicUniveralConfig {
                |       
                |               <ja>@RestGet</ja>(path=<js>"/*"</js>, 
summary=<js>"Responds with \"Hello world!\""</js>)
                |               <jk>public</jk> String sayHello() {
@@ -108,7 +108,7 @@
 <h5 class='topic'>REST Group Pages</h5>
 <div class='topic'>
        <p>
-               The {@link oajr.BasicRestServletGroup} class provides a default 
"router" page for 
+               The {@link oajr.servlet.BasicRestServletGroup} class provides a 
default "router" page for 
                child resources when a parent resource is nothing more than a 
grouping of child resources.
        </p>            
        <p>
@@ -131,7 +131,7 @@
                |                       ShutdownResource.<jk>class</jk>
                |               }
                |       )
-               |       <jk>public class</jk> RootResources <jk>extends</jk> 
BasicRestServletGroup {
+               |       <jk>public class</jk> RootResources <jk>extends</jk> 
BasicRestServletGroup <jk>implements</jk> BasicUniversalConfig {
                |               <jc>// NO CODE!!!</jc>
                |       }
        </p>
@@ -220,7 +220,7 @@
 <h5 class='topic'>Deploying as a Servlet</h5>
 <div class='topic'>
        <p>
-               The {@link oajr.RestServlet} class is the entry point for your 
REST resources.
+               The {@link oajr.servlet.RestServlet} class is the entry point 
for your REST resources.
                It extends directly from <l>HttpServlet</l> and is deployed 
like any other servlet (such as a standard <c>web.xml</c> file).
        </p>
        <p>
@@ -231,7 +231,7 @@
        </p>
        <p>
                Most developers are not going to be using the 
<l>RestServlet</l> class itself, and instead will
-               extend from one of the preconfigured default servlets such as 
{@link oajr.BasicRestServlet} and {@link oajr.BasicRestServletGroup} 
+               extend from one of the preconfigured default servlets such as 
{@link oajr.servlet.BasicRestServlet} and {@link 
oajr.servlet.BasicRestServletGroup} 
                which provides universal language support, basic 
instrumentation, and auto-generated Swagger UI.
        </p>
 </div>
@@ -253,7 +253,7 @@
        <p>
                Most developers are not going to be using the 
<l>RestServlet</l> class itself, and instead will
                extend from one of the preconfigured default servlets such as 
{@link oajr.springboot.BasicSpringRestServlet} and {@link 
oajr.springboot.BasicSpringRestServletGroup}
-               that have the same capabilites as the {@link 
oajr.BasicRestServlet} and {@link oajr.BasicRestServletGroup} counterparts.
+               that have the same capabilites as the {@link 
oajr.servlet.BasicRestServlet} and {@link oajr.servlet.BasicRestServletGroup} 
counterparts.
        </p>
        <h5 class='figure'>Example configuration file:</h5>
        <p class='bcode w800'>
@@ -294,7 +294,7 @@
                |                       HelloWorldResource.<jk>class</jk>
                |               }
                |       )
-               |       <jk>public class</jk> RootResources <jk>extends</jk> 
BasicSpringRestServletGroup {
+               |       <jk>public class</jk> RootResources <jk>extends</jk> 
BasicSpringRestServletGroup <jk>implements</jk> BasicUniversalConfig {
                |               <jc>// No code!</jc>
                |       }
        </p>
diff --git a/juneau-doc/docs/Topics/04.juneau-dto/04.jd.SwaggerUi.html 
b/juneau-doc/docs/Topics/04.juneau-dto/04.jd.SwaggerUi.html
index 19753e6..813ad6d 100644
--- a/juneau-doc/docs/Topics/04.juneau-dto/04.jd.SwaggerUi.html
+++ b/juneau-doc/docs/Topics/04.juneau-dto/04.jd.SwaggerUi.html
@@ -50,7 +50,7 @@
                |       }
        </p>
        <p>
-               The {@link oajr.BasicRestServlet} class (describe later) shows 
how this swap is used in the REST interface to 
+               The {@link oajr.servlet.BasicRestServlet} class (describe 
later) shows how this swap is used in the REST interface to 
                generate the Swagger UI shown above:
        </p>
        <p class='bcode w800'>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server.html 
b/juneau-doc/docs/Topics/06.juneau-rest-server.html
index 8232cc0..e503a45 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server.html
@@ -51,7 +51,7 @@
        </p>
        <p> 
                The API builds upon the existing JEE Servlet API.  
-               The root class, {@link oajr.RestServlet} is nothing but a 
specialized 
+               The root class, {@link oajr.servlet.RestServlet} is nothing but 
a specialized 
                {@link javax.servlet.http.HttpServlet}, and the {@link 
oajr.RestRequest} and 
                {@link oajr.RestResponse} classes are nothing more than 
specialized 
                {@link javax.servlet.http.HttpServletRequest} and {@link 
javax.servlet.http.HttpServletResponse} objects.  
diff --git 
a/juneau-doc/docs/Topics/06.juneau-rest-server/01.jrs.HelloWorldExample.html 
b/juneau-doc/docs/Topics/06.juneau-rest-server/01.jrs.HelloWorldExample.html
index d2ecb6d..e9fb0e2 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/01.jrs.HelloWorldExample.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/01.jrs.HelloWorldExample.html
@@ -13,12 +13,12 @@
  
***************************************************************************************************************************/
  -->
 
-{title:'Hello World Example', updated:'9.0.0'}
+{title:'Hello World Example', updated:'9.0.0', flags:'todo'}
 
 <div class='topic'>
        <p>
                A REST resource is simply a Java class annotated with {@link 
oajr.annotation.Rest}.
-               The most common case is a class that extends {@link 
oajr.RestServlet}, which itself is simply an 
+               The most common case is a class that extends {@link 
oajr.servlet.BasicRestServlet}, which itself is simply an 
                extension of {@link javax.servlet.http.HttpServlet} which 
allows it to be deployed as a servlet.  
        </p>
        <p>
@@ -64,7 +64,7 @@
                |                       <js>"&lt;/div&gt;"</js>
                |               }
                |       )
-               |       <jk>public class</jk> HelloWorldResource 
<jk>extends</jk> BasicRestServlet {
+               |       <jk>public class</jk> HelloWorldResource 
<jk>extends</jk> BasicRestServlet <jk>implements</jk> BasicUniversalConfig {
                |       
                |               <ja>@RestGet</ja>(path=<js>"/*"</js>, 
summary=<js>"Responds with \"Hello world!\""</js>)
                |               <jk>public</jk> String sayHello() {
@@ -86,9 +86,9 @@
                However, we could have returned any POJO consisting of beans, 
maps, collections, etc...
        </p>
        <p>
-               The {@link oajr.BasicRestServlet} class that we're using here 
is a subclass of 
-               {@link oajr.RestServlet} that provides default support for a 
variety of content types.  
+               The {@link oajr.servlet.BasicRestServlet} class that we're 
using here is a subclass of 
+               {@link oajr.servlet.RestServlet} that provides default support 
for a variety of content types.  
                Implementers can choose to use this class, or create their own 
subclass of 
-               {@link oajr.RestServlet} with their own specialized serializers 
and parsers.
+               {@link oajr.servlet.RestServlet} with their own specialized 
serializers and parsers.
        </p>
 </div>
\ No newline at end of file
diff --git 
a/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses.html 
b/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses.html
index 787f99f..e43e40d 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses.html
@@ -13,7 +13,7 @@
  
***************************************************************************************************************************/
  -->
 
-{title:'@Rest-Annotated Classes', updated:'8.1.2,9.0.0'}
+{title:'@Rest-Annotated Classes', updated:'8.1.2,9.0.0', flags:'todo'}
 
 <div class='topic'>
        <p>
@@ -101,28 +101,25 @@
                        {@link javax.servlet.http.HttpServlet 
javax.servlet.http.HttpServlet} 
                        <ul>
                                <li class='jac'>
-                                       {@link oajr.RestServlet 
org.apache.juneau.rest.RestServlet}
+                                       {@link oajr.servlet.RestServlet 
org.apache.juneau.rest.RestServlet}
                                        <br>Contains all the main logic.
                                        <ul>
-                                               <li class='jac'>{@link 
oajr.BasicRestServlet org.apache.juneau.rest.BasicRestServlet}
+                                               <li class='jac'>{@link 
oajr.servlet.BasicRestServlet org.apache.juneau.rest.BasicRestServlet}
                                                        <br>Provides a default 
set of serializers, parsers, options page, stylesheet, and other common 
settings.
                                                        <ul>
-                                                               <li 
class='jac'>{@link oajr.BasicRestServletGroup 
org.apache.juneau.rest.BasicRestServletGroup}
+                                                               <li 
class='jac'>{@link oajr.servlet.BasicRestServletGroup 
org.apache.juneau.rest.BasicRestServletGroup}
                                                                        <br>A 
default implementation for "router" pages.
                                                                </li>
                                                        </ul>
                                                </li>
-                                               <li class='jac'>{@link 
oajr.BasicRestServletJena org.apache.juneau.rest.BasicRestServletJena}
-                                                       <br>Same as {@link 
oajr.BasicRestServlet} but adds RDF marshalling support.
-                                               </li>
                                                <li class='jac'>{@link 
oajr.springboot.SpringRestServlet 
org.apache.juneau.rest.springboot.SpringRestServlet}
                                                        <br>Top-level servlet 
to use in Spring Boot.
                                                        <ul>
                                                                <li 
class='jac'>{@link oajr.springboot.BasicSpringRestServlet 
org.apache.juneau.rest.springboot.BasicSpringRestServlet}
-                                                                       
<br>Same as {@link oajr.BasicRestServlet} except for Spring Boot.
+                                                                       
<br>Same as {@link oajr.servlet.BasicRestServlet} except for Spring Boot.
                                                                        <ul>
                                                                                
<li class='jac'>{@link oajr.springboot.BasicSpringRestServletGroup 
org.apache.juneau.rest.springboot.BasicSpringRestServletGroup}
-                                                                               
        <br>Same as {@link oajr.BasicRestServletGroup} except for Spring Boot.
+                                                                               
        <br>Same as {@link oajr.servlet.BasicRestServletGroup} except for 
Spring Boot.
                                                                                
</li>
                                                                        </ul>
                                                                </li>
@@ -141,11 +138,11 @@
                of the default implementations that don't extend from {@link 
javax.servlet.http.HttpServlet}:
        </p>
        <ul class='javatree'>
-               <li class='jic'>{@link oajr.BasicRestOperations 
org.apache.juneau.BasicRestOperations}
+               <li class='jic'>{@link oajr.servlet.BasicRestOperations 
org.apache.juneau.BasicRestOperations}
                        <ul>
-                               <li class='jac'>{@link oajr.BasicRestObject 
org.apache.juneau.BasicRestObject}
+                               <li class='jac'>{@link 
oajr.servlet.BasicRestObject org.apache.juneau.BasicRestObject}
                                        <ul>
-                                               <li class='jac'>{@link 
oajr.BasicRestObjectGroup org.apache.juneau.BasicRestObjectGroup}
+                                               <li class='jac'>{@link 
oajr.servlet.BasicRestObjectGroup org.apache.juneau.BasicRestObjectGroup}
                                        </ul>
                                </li>
                        </ul>
@@ -161,11 +158,11 @@
                The following interfaces are also provided for defining REST 
endpoint classes:
        
        <ul class='javatree'>
-               <li class='jic'>{@link oajr.config.BasicUniversalRest} - 
Support for all languages.
-               <li class='jic'>{@link oajr.config.BasicJsonRest} - Support for 
JSON.
-               <li class='jic'>{@link oajr.config.BasicJsonHtmlRest} - Support 
for JSON and HTML.
-               <li class='jic'>{@link oajr.config.BasicSimpleJsonRest} - 
Support for simplified JSON.
-               <li class='jic'>{@link oajr.config.BasicOpenApiRest} - Support 
for OpenAPI. 
+               <li class='jic'>{@link oajr.config.BasicUniversalConfig} - 
Support for all languages.
+               <li class='jic'>{@link oajr.config.BasicJsonConfig} - Support 
for JSON.
+               <li class='jic'>{@link oajr.config.BasicJsonHtmlConfig} - 
Support for JSON and HTML.
+               <li class='jic'>{@link oajr.config.BasicSimpleJsonConfig} - 
Support for simplified JSON.
+               <li class='jic'>{@link oajr.config.BasicOpenApiConfig} - 
Support for OpenAPI. 
        </ul>
        <p>
                The interfaces have no methods to implement.  They simply 
aggregate common class-level
@@ -210,17 +207,17 @@
                Children can be nested arbitrary deep to create complex REST 
interfaces with a single top-level REST servlet.
        </p>
        <p>
-               Child REST objects typically extend from {@link 
oajr.BasicRestObject} to inherit basic functionality 
+               Child REST objects typically extend from {@link 
oajr.servlet.BasicRestObject} to inherit basic functionality 
                defined on that class, but as shown above it's not a 
requirement.
                Child REST objects can also be preconfigured with basic 
functionality by implementing one of the 
                following interfaces as well:
        </p>
        <ul class='javatreec'>
-               <li class='jic'>{@link oajr.config.BasicUniversalRest}
-               <li class='jic'>{@link oajr.config.BasicJsonRest}
-               <li class='jic'>{@link oajr.config.BasicJsonHtmlRest}
-               <li class='jic'>{@link oajr.config.BasicSimpleJsonRest}
-               <li class='jic'>{@link oajr.config.BasicOpenApiRest}
+               <li class='jic'>{@link oajr.config.BasicUniversalConfig}
+               <li class='jic'>{@link oajr.config.BasicJsonConfig}
+               <li class='jic'>{@link oajr.config.BasicJsonHtmlConfig}
+               <li class='jic'>{@link oajr.config.BasicSimpleJsonConfig}
+               <li class='jic'>{@link oajr.config.BasicOpenApiConfig}
        </ul>
        
        <h5 class='topic'>Path Variables</h5>
diff --git 
a/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.BasicRestServlet.html
 
b/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.BasicRestServlet.html
index 4c6064a..eae8d76 100644
--- 
a/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.BasicRestServlet.html
+++ 
b/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.BasicRestServlet.html
@@ -13,11 +13,11 @@
  
***************************************************************************************************************************/
  -->
 
-{title:'BasicRestServlet/BasicRestObject', updated:'8.1.0,9.0.0'} 
+{title:'BasicRestServlet/BasicRestObject', updated:'8.1.0,9.0.0', 
flags:'todo'} 
 
 <div class='topic'>
        <p>
-               The {@link oajr.BasicRestServlet} class is a subclass of {@link 
oajr.RestServlet}
+               The {@link oajr.servlet.BasicRestServlet} class is a subclass 
of {@link oajr.servlet.RestServlet}
                preconfigured with the following:
        </p>
        <ul class='spaced-list'>
@@ -251,10 +251,10 @@
                (As a general rule, all annotations throughout Juneau have 
programmatic equivalents.)
        </p>
        <ul>
-               <li class='note'>{@link oajr.BasicRestServletJena} is the 
equivalent class that includes support for RDF languages.
+               <li class='note'>{@del oajr.BasicRestServletJena} is the 
equivalent class that includes support for RDF languages.
        </ul>
        <p>
-               The {@link oajr.BasicRestObject} class is identical to the 
{@link oajr.BasicRestServlet} class except that
+               The {@link oajr.servlet.BasicRestObject} class is identical to 
the {@link oajr.servlet.BasicRestServlet} class except that
                it does not extend from <c>HttpServlet</c>.
                It defines the exact same set of serializers, parsers, etc., 
but it cannot be deployed as a top-level
                servlet.  It can however be used for child resources registered 
via the {@link oajr.annotation.Rest#children() @Rest(children)} 
@@ -266,7 +266,7 @@
                from this class will prevent that behavior.
        </p>
        <p>
-               The code for this class is virtually identical to {@link 
oajr.BasicRestServlet} but lacks a parent class:
+               The code for this class is virtually identical to {@link 
oajr.servlet.BasicRestServlet} but lacks a parent class:
        </p>
        
        <h5 class='figure'>BasicRestServlet.java</h5>
diff --git 
a/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses/02.jrs.BasicRestServletGroup.html
 
b/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses/02.jrs.BasicRestServletGroup.html
index 911ed35..2e34627 100644
--- 
a/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses/02.jrs.BasicRestServletGroup.html
+++ 
b/juneau-doc/docs/Topics/06.juneau-rest-server/02.jrs.AnnotatedClasses/02.jrs.BasicRestServletGroup.html
@@ -13,11 +13,11 @@
  
***************************************************************************************************************************/
  -->
 
-{title:'BasicRestServletGroup/BasicRestObjectGroup', updated:'8.1.0,9.0.0'}
+{title:'BasicRestServletGroup/BasicRestObjectGroup', updated:'8.1.0,9.0.0', 
flags:'todo'}
 
 <div class='topic'>
        <p>
-               The {@link oajr.BasicRestServletGroup} class provides a default 
"router" page for 
+               The {@link oajr.servlet.BasicRestServletGroup} class provides a 
default "router" page for 
                child resources when a parent resource is nothing more than a 
grouping of child resources.
        </p>            
        <p>
@@ -53,8 +53,8 @@
        </p>
        <img class='bordered w800' src='doc-files/jrs.RouterPages.1.png'/>
        <p> 
-               The {@link oajr.BasicRestServletGroup} class is nothing more 
than a subclass of 
-               {@link oajr.BasicRestServlet} with a <l>getChildren()</l> 
method mapped to the servlet 
+               The {@link oajr.servlet.BasicRestServletGroup} class is nothing 
more than a subclass of 
+               {@link oajr.servlet.BasicRestServlet} with a 
<l>getChildren()</l> method mapped to the servlet 
                root path.
                The method returns a POJO with is just a linked-list of beans 
with name/description properties.
        </p>    
@@ -70,7 +70,7 @@
                |       }               
        </p>
        <ul>
-               <li class='note'>{@link oajr.BasicRestServletJenaGroup} is the 
equivalent class that includes support for RDF languages.
-               <li class='note'>{@link oajr.BasicRestObjectGroup} is the 
equivalent class that doesn't extend from <c>Servlet</c>.
+               <li class='note'>{@del oajr.BasicRestServletJenaGroup} is the 
equivalent class that includes support for RDF languages.
+               <li class='note'>{@link oajr.servlet.BasicRestObjectGroup} is 
the equivalent class that doesn't extend from <c>Servlet</c>.
        </ul>
 </div>
\ No newline at end of file
diff --git 
a/juneau-doc/docs/Topics/06.juneau-rest-server/05.jrs.Marshalling.html 
b/juneau-doc/docs/Topics/06.juneau-rest-server/05.jrs.Marshalling.html
index 2e534dd..e9a93fe 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/05.jrs.Marshalling.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/05.jrs.Marshalling.html
@@ -67,19 +67,19 @@
        <ul class='javatree'>
                <li>Classes:
                        <ul class='javatreec'>
-                               <li class='jc'>{@link oajr.BasicRestServlet}
-                               <li class='jc'>{@link 
oajr.BasicRestServletGroup}
-                               <li class='jc'>{@link oajr.BasicRestObject}
-                               <li class='jc'>{@link oajr.BasicRestObjectGroup}
+                               <li class='jc'>{@link 
oajr.servlet.BasicRestServlet}
+                               <li class='jc'>{@link 
oajr.servlet.BasicRestServletGroup}
+                               <li class='jc'>{@link 
oajr.servlet.BasicRestObject}
+                               <li class='jc'>{@link 
oajr.servlet.BasicRestObjectGroup}
                        </ul>
                </li>
                <li>Interfaces:
                        <ul class='javatreec'>
-                               <li class='jic'>{@link 
oajr.config.BasicUniversalRest}
-                               <li class='jic'>{@link 
oajr.config.BasicJsonRest}
-                               <li class='jic'>{@link 
oajr.config.BasicJsonHtmlRest}
-                               <li class='jic'>{@link 
oajr.config.BasicSimpleJsonRest}
-                               <li class='jic'>{@link 
oajr.config.BasicOpenApiRest}
+                               <li class='jic'>{@link 
oajr.config.BasicUniversalConfig}
+                               <li class='jic'>{@link 
oajr.config.BasicJsonConfig}
+                               <li class='jic'>{@link 
oajr.config.BasicJsonHtmlConfig}
+                               <li class='jic'>{@link 
oajr.config.BasicSimpleJsonConfig}
+                               <li class='jic'>{@link 
oajr.config.BasicOpenApiConfig}
                        </ul>
                </li>
        </ul>
@@ -170,6 +170,6 @@
        </ul>
        
        <ul class='seealso'>
-               <li class='jc'>{@link oajr.examples.PhotoResource} - An example 
of a REST resource that uses a custom serializer and parser.
+               <li class='jc'>{@link oaj.examples.rest.PhotosResource} - An 
example of a REST resource that uses a custom serializer and parser.
        </ul>
 </div>
\ No newline at end of file
diff --git 
a/juneau-doc/docs/Topics/06.juneau-rest-server/11.jrs.ConfigurationFiles.html 
b/juneau-doc/docs/Topics/06.juneau-rest-server/11.jrs.ConfigurationFiles.html
index 03aff8d..c5fcf9b 100644
--- 
a/juneau-doc/docs/Topics/06.juneau-rest-server/11.jrs.ConfigurationFiles.html
+++ 
b/juneau-doc/docs/Topics/06.juneau-rest-server/11.jrs.ConfigurationFiles.html
@@ -66,7 +66,7 @@
        </p>
        <p>
                The annotation itself can contain string variables.  
-               For example, the Microservice API {@link oajr.BasicRestServlet} 
class defines the 
+               For example, the Microservice API {@link 
oajr.servlet.BasicRestServlet} class defines the 
                location of the config file as a system property 
<l>"juneau.configFile"</l>:
        </p>
        <p class='bcode w800'>
diff --git 
a/juneau-doc/docs/Topics/06.juneau-rest-server/13.jrs.StaticFiles.html 
b/juneau-doc/docs/Topics/06.juneau-rest-server/13.jrs.StaticFiles.html
index 581f94a..13ed411 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/13.jrs.StaticFiles.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/13.jrs.StaticFiles.html
@@ -17,7 +17,7 @@
 
 <div class='topic'>
        <p>
-               The {@link oajr.BasicRestServlet} and {@link 
oajr.BasicRestObject} classes come with built-in support
+               The {@link oajr.servlet.BasicRestServlet} and {@link 
oajr.servlet.BasicRestObject} classes come with built-in support
                for serving up static files through the following REST 
operation:
        </p>
        <p class='bcode w800'>
diff --git 
a/juneau-doc/docs/Topics/06.juneau-rest-server/15.jrs.Swagger/01.jrs.BasicRestServletSwagger.html
 
b/juneau-doc/docs/Topics/06.juneau-rest-server/15.jrs.Swagger/01.jrs.BasicRestServletSwagger.html
index 6b8732a..281c0f7 100644
--- 
a/juneau-doc/docs/Topics/06.juneau-rest-server/15.jrs.Swagger/01.jrs.BasicRestServletSwagger.html
+++ 
b/juneau-doc/docs/Topics/06.juneau-rest-server/15.jrs.Swagger/01.jrs.BasicRestServletSwagger.html
@@ -17,7 +17,7 @@
 
 <div class='topic'>
        <p>
-               Any subclass of {@link oajr.BasicRestServlet} and {@link 
oajr.BasicRestObject} gets an auto-generated Swagger UI when performing an 
<c>OPTIONS</c>
+               Any subclass of {@link oajr.servlet.BasicRestServlet} and 
{@link oajr.servlet.BasicRestObject} gets an auto-generated Swagger UI when 
performing an <c>OPTIONS</c>
                request with <c>Accept:text/html</c> due to the following 
method:
        </p>
        <p class='bcode w800'>
@@ -52,7 +52,7 @@
        </p>
        <p>
                The underlying mechanics are simple.  
-               The {@link oajr.BasicRestServlet#getSwagger(RestRequest)} 
method returns a {@link oaj.dto.swagger.Swagger} bean
+               The {@link 
oajr.servlet.BasicRestServlet#getSwagger(RestRequest)} method returns a {@link 
oaj.dto.swagger.Swagger} bean
                consisting of information gathered from annotations and other 
sources.
                Then that bean is swapped for a {@link 
oaj.dto.swagger.ui.SwaggerUI} bean when rendered as HTML.
        </p>
diff --git 
a/juneau-doc/docs/Topics/06.juneau-rest-server/16.jrs.ExecutionStatistics.html 
b/juneau-doc/docs/Topics/06.juneau-rest-server/16.jrs.ExecutionStatistics.html
index b0b019e..701187a 100644
--- 
a/juneau-doc/docs/Topics/06.juneau-rest-server/16.jrs.ExecutionStatistics.html
+++ 
b/juneau-doc/docs/Topics/06.juneau-rest-server/16.jrs.ExecutionStatistics.html
@@ -21,7 +21,7 @@
                and <ja>@RestHook</ja> annotated methods on the class.
        </p>
        <p>
-               If you extend from {@link oajr.BasicRestServlet} or {@link 
oajr.BasicRestObject}, then
+               If you extend from {@link oajr.servlet.BasicRestServlet} or 
{@link oajr.servlet.BasicRestObject}, then
                the statics are made available through the REST interface via 
the following method:
        </p>
        <p class='bcode w800'>
diff --git 
a/juneau-doc/docs/Topics/06.juneau-rest-server/17.jrs.HtmlDocAnnotation/05.jrs.HtmlStylesheets.html
 
b/juneau-doc/docs/Topics/06.juneau-rest-server/17.jrs.HtmlDocAnnotation/05.jrs.HtmlStylesheets.html
index 8e539b3..7900d7a 100644
--- 
a/juneau-doc/docs/Topics/06.juneau-rest-server/17.jrs.HtmlDocAnnotation/05.jrs.HtmlStylesheets.html
+++ 
b/juneau-doc/docs/Topics/06.juneau-rest-server/17.jrs.HtmlDocAnnotation/05.jrs.HtmlStylesheets.html
@@ -43,7 +43,7 @@
        <img class='bordered w800' src='doc-files/jrs.Stylesheets.3.png'>
        <p>
                The stylesheet URL is controlled by the {@link 
oaj.html.annotation.HtmlDocConfig#stylesheet() @HtmlDocConfig(stylesheet)} 
annotation.
-               The {@link oajr.BasicRestServlet} class defines the stylesheet 
served up as a static file:
+               The {@link oajr.servlet.BasicRestServlet} class defines the 
stylesheet served up as a static file:
        <p class='bcode w800'>
                |       <ja>@Rest</ja>(
                |               staticFiles={<js>"styles:styles"</js>}
diff --git 
a/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs/01.jrsj.BaseProvider.html 
b/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs/01.jrsj.BaseProvider.html
index 2da133e..25f3406 100644
--- 
a/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs/01.jrsj.BaseProvider.html
+++ 
b/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs/01.jrsj.BaseProvider.html
@@ -22,7 +22,7 @@
        </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.RestServlet} class directly.
+               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:
@@ -71,7 +71,7 @@
                        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.BasicRestServlet} class.
+                       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>, 
diff --git 
a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html 
b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html
index ff177cb..f65946a 100644
--- 
a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html
+++ 
b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html
@@ -20,13 +20,13 @@
                The Juneau integration component for Spring Boot consists of 
the following classes:
        </p>
        <ul class='javatree'>
-               <li class='ja'>{@link oajr.springboot.annotation.JuneauRestRoot}
+               <li class='ja'>{@del oajr.springboot.annotation.JuneauRestRoot}
                <li class='jc'>{@del oajr.springboot.JuneauRestInitializer}
                <li class='jc'>{@del oajr.springboot.SpringRestResourceResolver}
        </ul>
        <p>
                A typical Spring Boot application can use the {@del 
oajr.springboot.JuneauRestInitializer} to find
-               and register Juneau REST servlets via the {@link 
oajr.springboot.annotation.JuneauRestRoot} annotation.
+               and register Juneau REST servlets via the {@del 
oajr.springboot.annotation.JuneauRestRoot} annotation.
        </p>
        <h5 class='figure'>Example:</h5>
        <p class='bcode w800'>
diff --git 
a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/02.jrss.ChildResources.html
 
b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/02.jrss.ChildResources.html
index b208d06..2bbed33 100644
--- 
a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/02.jrss.ChildResources.html
+++ 
b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/02.jrss.ChildResources.html
@@ -43,7 +43,7 @@
        </p>
        <p>
                The root resource class must extend from <c>HttpServlet</c> so 
that it can be registered as a normal
-               servlet using the Spring Boot architecture.  The {@link 
oajr.BasicRestServletGroup} class is our router class
+               servlet using the Spring Boot architecture.  The {@link 
oajr.servlet.BasicRestServletGroup} class is our router class
                that extends from <c>HttpServlet</c>:
        </p>
        <p class='bcode w800'>
diff --git 
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/03.jmj.ResourceClasses.html
 
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/03.jmj.ResourceClasses.html
index 60256f2..ab683a8 100644
--- 
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/03.jmj.ResourceClasses.html
+++ 
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/03.jmj.ResourceClasses.html
@@ -59,7 +59,7 @@
                <li>
                        The <l>children</l> annotation make up the list of 
child resources.
                        <br>These child resources can be anything that extends 
from <l>Servlet</l>, although usually
-                       they will be subclasses of {@link 
oajr.BasicRestServlet} or other resource groups.
+                       they will be subclasses of {@link 
oajr.servlet.BasicRestServlet} or other resource groups.
        </ul>
        <p>
                If you click the <l>helloWorld</l> link in your application, 
you'll get a simple hello world message:
diff --git 
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.jmj.Config.html 
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.jmj.Config.html
index 4a69697..3067ffa 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.jmj.Config.html
+++ b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.jmj.Config.html
@@ -25,7 +25,7 @@
        <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
-               classes that extend from {@link oajr.BasicRestServlet} use 
several <c>$C</c> variables to externalize values:
+               classes that extend from {@link oajr.servlet.BasicRestServlet} 
use several <c>$C</c> variables to externalize values:
        </p>
        <p class='bcode w800'>
                |       <ja>@Rest</ja>(
diff --git 
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.jmj.UiCustomization.html
 
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.jmj.UiCustomization.html
index 0331a79..d43ad16 100644
--- 
a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.jmj.UiCustomization.html
+++ 
b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.jmj.UiCustomization.html
@@ -58,7 +58,7 @@
                |               <cv>&lt;/a&gt;</cv>
        </p>
        <p>
-               The {@del oajr.BasicRestConfig} interface (which defines the 
default settings for {@link oajr.BasicRestServlet} 
+               The {@del oajr.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='bcode w800'>
diff --git 
a/juneau-doc/docs/Topics/15.my-springboot-microservice/01.msm.Installing.html 
b/juneau-doc/docs/Topics/15.my-springboot-microservice/01.msm.Installing.html
index c767243..995aa75 100644
--- 
a/juneau-doc/docs/Topics/15.my-springboot-microservice/01.msm.Installing.html
+++ 
b/juneau-doc/docs/Topics/15.my-springboot-microservice/01.msm.Installing.html
@@ -43,7 +43,7 @@
                        <br>This class creates and starts our microservice.
                        <br>Note that we're using the existing Spring Boot 
application logic for the microservice and we're retrieving
                        our root resource as a spring bean.
-                       <br>Only the top-level resource needs to be annotated 
with {@link oaj.rest.springboot.annotation.JuneauRestRoot @JuneauRestRoot}
+                       <br>Only the top-level resource needs to be annotated 
with {@del oaj.rest.springboot.annotation.JuneauRestRoot @JuneauRestRoot}
                        <br><br>
                        <p class='bcode w800'>
                <ja>@SpringBootApplication</ja>
diff --git 
a/juneau-doc/docs/Topics/17.juneau-examples-rest/01.jer.RootResources.html 
b/juneau-doc/docs/Topics/17.juneau-examples-rest/01.jer.RootResources.html
index c255956..b84f09b 100644
--- a/juneau-doc/docs/Topics/17.juneau-examples-rest/01.jer.RootResources.html
+++ b/juneau-doc/docs/Topics/17.juneau-examples-rest/01.jer.RootResources.html
@@ -25,21 +25,16 @@
        </p>
        <ul class='javatree'>
                <li class='jac'>
-                       {@link oajr.RestServlet} - Contains all the REST 
servlet logic.
+                       {@link oajr.servlet.RestServlet} - Contains all the 
REST servlet logic.
                        <ul>
                                <li class='jac'>
-                                       {@link oajr.BasicRestServlet} - Defines 
default serializers and parsers, and OPTIONs page logic.
+                                       {@link oajr.servlet.BasicRestServlet} - 
Defines default serializers and parsers, and OPTIONs page logic.
                                        <ul>
                                                <li class='jac'>
-                                                       {@link 
oajr.BasicRestServletGroup} - Specialized subclass for grouping other resources.
+                                                       {@link 
oajr.servlet.BasicRestServletGroup} - Specialized subclass for grouping other 
resources.
                                                        <ul>
-                                                               <li class='jac'>
-                                                                       {@link 
oaj.rest.BasicRestServletJenaGroup} - Group resource with added RDF support.
-                                                                       <ul>
-                                                                               
<li class='jc'>
-                                                                               
        <c>RootResources</c>
-                                                                       </ul>
-                                                               </li>
+                                                               <li class='jc'>
+                                                                       
<c>RootResources</c>
                                                        </ul>
                                                </li>
                                        </ul>
@@ -130,7 +125,7 @@
        <p>
                Child resources must be annotated with the {@link 
oajr.annotation.Rest#path() @Rest(path)} annotation to 
                identify the subpath of the child.
-               Children CAN extend from {@link oajr.BasicRestServlet} but it 
is not a requirement.
+               Children CAN extend from {@link oajr.servlet.BasicRestServlet} 
but it is not a requirement.
        </p>
        <p>
                Note that these router pages can be arbitrarily nested deep.  
diff --git 
a/juneau-doc/docs/Topics/17.juneau-examples-rest/02.jer.HelloWorldResource.html 
b/juneau-doc/docs/Topics/17.juneau-examples-rest/02.jer.HelloWorldResource.html
index 3fa08e6..90b62ca 100644
--- 
a/juneau-doc/docs/Topics/17.juneau-examples-rest/02.jer.HelloWorldResource.html
+++ 
b/juneau-doc/docs/Topics/17.juneau-examples-rest/02.jer.HelloWorldResource.html
@@ -48,10 +48,10 @@
                |       }
        </p>
        <p>
-               Notice that in this case we're not extending from {@link 
oajr.RestServlet}.  
+               Notice that in this case we're not extending from {@link 
oajr.servlet.RestServlet}.  
                We are however implementing {@del oajr.BasicRestConfig} which 
is a no-op
                interface that defines a default <ja>@Rest</ja> annotation with 
all the serializers, parsers, 
-               and configuration defined on the {@link oajr.BasicRestServlet} 
class.
+               and configuration defined on the {@link 
oajr.servlet.BasicRestServlet} class.
        </p>
        <p>
                The only difference between implementing <l>BasicRestConfig</l> 
and extending from <l>BasicRestServlet</l>
diff --git 
a/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/01.jers.Installing.html
 
b/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/01.jers.Installing.html
index 18888d8..7e65d20 100644
--- 
a/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/01.jers.Installing.html
+++ 
b/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/01.jers.Installing.html
@@ -43,7 +43,7 @@
                        <br>This class creates and starts our microservice.
                        <br>Note that we're using the existing Spring Boot 
application logic for the microservice and we're retrieving
                        our root resource as a spring bean.
-                       <br>Only the top-level resource needs to be annotated 
with {@link oaj.rest.springboot.annotation.JuneauRestRoot @JuneauRestRoot}
+                       <br>Only the top-level resource needs to be annotated 
with {@del oaj.rest.springboot.annotation.JuneauRestRoot @JuneauRestRoot}
                        <br><br>
                        <p class='bcode w800'>
                <ja>@SpringBootApplication</ja>

Reply via email to